diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 1998-03-17 09:53:34 +0100 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 1998-03-17 09:53:34 +0100 |
| commit | dccb52c3a040eb61328bf7bb9aae9a90b59e1120 (patch) | |
| tree | e52d38db1dae1bac944be650b181019208410326 | |
| parent | 77add406027ae5afda409a2e77b35852c5fae4f9 (diff) | |
release: 0.1.54
171 files changed, 7556 insertions, 1751 deletions
diff --git a/.dstreamrc b/.dstreamrc index d016c2b727..da36d7d722 100644 --- a/.dstreamrc +++ b/.dstreamrc @@ -57,7 +57,7 @@ Paper_score 1 Paper_def 1 Performer 1 Performer_group_performer 1 -Request 1 +Request 0 Request_iterator 1 Rest_collision 1 Rest_collision_engraver 1 diff --git a/DEDICATION b/DEDICATION index e6b3bf73bd..895b59cc0c 100644 --- a/DEDICATION +++ b/DEDICATION @@ -21,7 +21,7 @@ Eva, Roos, Judith, Tim, and, of course, Wendy! Of course, our other friends in the `Eindhovens Jongeren Ensemble' -(http://www.stack.nl/~hanwen/eje.html) cannot go unmentioned either. +(http://www.cs.ruu.nl/~hanwen/eje.html) cannot go unmentioned either. --- * --- diff --git a/Documentation/Makefile.am b/Documentation/Makefile.am index 9942fb2d00..2d04c0c7d2 100644 --- a/Documentation/Makefile.am +++ b/Documentation/Makefile.am @@ -38,4 +38,4 @@ clean-local: include $(top_srcdir)/Documentation/Rules.make $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/Documentation/index.pod b/Documentation/index.pod index 2115ce220a..3470425b5b 100644 --- a/Documentation/index.pod +++ b/Documentation/index.pod @@ -61,7 +61,7 @@ top_of_NEWS =item * <a href=ANNOUNCE-0.1.txt > -The announce of 0.1 +The announcement of 0.1 </a > @@ -258,7 +258,7 @@ B<download> LilyPond and other interesting links =item * <a href=sconstat/stats.html > -Stats on this page. +Stats on this page. [temporarily out of order] </a > diff --git a/Documentation/introduction.doc b/Documentation/introduction.doc index 05fdfff716..1af131b13f 100644 --- a/Documentation/introduction.doc +++ b/Documentation/introduction.doc @@ -11,6 +11,10 @@ % mudela-book --outdir=out/ --outname=introduction.mudtex introduction.doc % latex '\nonstopmode \input out/introduction.mudtex' +% Hoi Tim, hier staan wat 'enge' commando's (die dingen met een '\' +% zoals \documentclass en \def\mudela...). +% Daar moet je je niets van aantrekken, ga gewoon naar Introduction +% en begin te tiepen. \documentclass{article} \usepackage{a4wide} diff --git a/Makefile.am b/Makefile.am index 09f1bcbe9b..fbae3ff7cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ # title top level makefile for LilyPond # file Makefile.am.wild -SUBDIRS = bin flower flowertest lib lily mf mi2mu debian\ +SUBDIRS = bin flower flowertest lib lily mf mi2mu test debian\ Documentation init input tex make mutopia SCHRIFTEN = configure configure.in install-sh aclocal.m4 @@ -40,4 +40,4 @@ wild-check: make-in-build: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/Makefile.am.wild b/Makefile.am.wild index f3651acb95..97c5d507e1 100644 --- a/Makefile.am.wild +++ b/Makefile.am.wild @@ -1,7 +1,7 @@ # title top level makefile for LilyPond # file Makefile.am.wild -SUBDIRS = bin flower flowertest lib lily mf mi2mu debian\ +SUBDIRS = bin flower flowertest lib lily mf mi2mu test debian\ Documentation init input tex make mutopia SCHRIFTEN = configure configure.in install-sh aclocal.m4 diff --git a/Makefile.in b/Makefile.in index e2c94dab9d..f3d78349d7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -99,7 +99,7 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -SUBDIRS = bin flower flowertest lib lily mf mi2mu debian\ +SUBDIRS = bin flower flowertest lib lily mf mi2mu test debian\ Documentation init input tex make mutopia SCHRIFTEN = configure configure.in install-sh aclocal.m4 @@ -1,3 +1,24 @@ +pl 54 + - bf dynamic_grav + - bf accidentals with key change + - bfs with command-items in non-breakable columns. + - typos (thanks LM) + +pl 53.jcn1 + - two new BUGs + - preludes-* with trills + - nicer trills + - fixed ugly slur extend bug + - first try at symphonic work: (start of) Coriolan + - fixes: los-toros + - test/ with some stupid tests + - bf, again midi-output + - --no-timestamps options for lily/mi2mu (to enable make check targets) + - removed doubles in lilypython + - smarter prev_version for make-patch + +*********** + pl 53 - bf: c4 \< c4 \< - bfs of spacing stuff @@ -8,6 +8,8 @@ grep for TODO and ugh/ugr 0.2: + * add full coriolan to website. + * collisions for local_key. * robustify Beam in case of no stems @@ -20,8 +22,6 @@ grep for TODO and ugh/ugr - configure.in - clean-fonts.sh - * fix MIDI - * mudela-convert. * nicen examples: @@ -66,10 +66,6 @@ grep for TODO and ugh/ugr * stem len adjustable - * mindist for spanners - - - STUFF @@ -99,7 +95,6 @@ STUFF - staff title * page handling: - - papersizes - PS output - optimal pagebreaking. @@ -109,8 +104,6 @@ STUFF 3RD PARTY BUGS: - * gdb on RedHat 5 - * xdvi: PS in magnifying glass. * Fix profiling. gprof bugreport? @@ -206,8 +199,6 @@ languages: make ofi2 TeX, MusiXTex, Display PostScript, PostScript, Ascii... interpreters. (difficult) - - poor man's ascii output possible? - - MusiXTeX output possible? (would have to be done before break calc.) - NIFF ? - Common Music Notation - PostScript output (esp. Beams, Slurs, etc) @@ -222,7 +213,6 @@ languages: * TeX spanners , use texbeam.cc as an example (smallish) - Glissando - trill - - bracket * Rewrite Stem, Beam and Rhythmic_grouping (hairy) - [c8. c32 c32] @@ -262,18 +252,11 @@ languages: * breaking: - caching breakpoints - saving them - - allowing users to set them. - penalties - specify number of lines * Rhythmic staff. - * Baroque superstaff - -SEVERELY LACKING: - - * SPEED! - * multibar rests * markers @@ -1,6 +1,6 @@ MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=53 +PATCH_LEVEL=54 MY_PATCH_LEVEL= # now used as shell script in configure too diff --git a/aclocal.m4 b/aclocal.m4 index de8271571a..3997befc4e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,14 @@ -dnl aclocal.m4 generated automatically by aclocal 1.2 +dnl aclocal.m4 generated automatically by aclocal 1.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. AC_DEFUN(AC_JUNK_ARGS, [ @@ -109,8 +119,8 @@ fi ifelse([$3],, AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) -AM_SANITY_CHECK -AC_ARG_PROGRAM +AC_REQUIRE([AM_SANITY_CHECK]) +AC_REQUIRE([AC_ARG_PROGRAM]) dnl FIXME This is truly gross. missing_dir=`cd $ac_aux_dir && pwd` AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) @@ -118,7 +128,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_PROG_MAKE_SET]) +AC_REQUIRE([AC_PROG_MAKE_SET])]) # serial 1 @@ -145,10 +155,21 @@ echo timestamp > conftestfile # directory). if ( set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "$@" = "X"; then + if test "[$]*" = "X"; then # -L didn't work. set X `ls -t $srcdir/configure conftestfile` fi + if test "[$]*" != "X $srcdir/configure conftestfile" \ + && test "[$]*" != "X conftestfile $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + test "[$]2" = conftestfile ) then diff --git a/bin/Makefile.am b/bin/Makefile.am index e571846fc1..60fb6d97ea 100644..100755 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -11,4 +11,4 @@ EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFT clean-local: -rm -f flower.pyc $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/bin/conflily.in b/bin/conflily.in index 3b42fc3ebc..2eab5a059e 100755 --- a/bin/conflily.in +++ b/bin/conflily.in @@ -22,9 +22,6 @@ current=`basename \`pwd\`` echo ln -s $lelie/$current $lelie/current ln -s $lelie/$current $lelie/current -ln -sf $lelie/current/lily/lilypond bin/lilypond -ln -sf $lelie/current/mi2mu/mi2mu bin/mi2mu - if [ "x$LILYINCLUDE" = "x" ]; then echo you should make add the following to your login script echo "export LILYINCLUDE=$lelie/current/init:$lelie/current/mutopia:$lelie/current/input:$lelie/current/mutopia/J.S.Bach:" @@ -32,7 +29,9 @@ if [ "x$LILYINCLUDE" = "x" ]; then echo "export MFINPUTS=$MFINPUTS:$lelie/current/mf" fi -mkdir -f ../build +mkdir -p ../build (cd ../build; +ln -sf $lelie/build/lily/lilypond bin/lilypond +ln -sf $lelie/build/mi2mu/mi2mu bin/mi2mu ../current/configure --prefix=/usr --enable-debugging --enable-printing --enable-checking) diff --git a/bin/make-website.in b/bin/make-website.in index 7820d45ff8..e574780344 100755 --- a/bin/make-website.in +++ b/bin/make-website.in @@ -49,7 +49,7 @@ fullname = "unknown" footstr = "" lilyversion= '' -include_path=[ 'input', 'mutopia' , 'mutopia/J.S.Bach', +include_path=[ 'input', 'mutopia' , 'mutopia/J.S.Bach', 'mutopia/Coriolan', 'mutopia/J.S.Bach/out' ] def set_vars(): @@ -102,13 +102,15 @@ examples=["twinkle-pop", "font16", "font20", #"scales", - "rhythm", + "rhythm", + "coriolan", "multi"] mutopia_examples = [ "wtk1-fugue2", "standje", "preludes-1", "preludes-2", + "wtk1-prelude1", "gallina", "scsii-menuetto"] @@ -214,7 +216,7 @@ def copy_files(): # my_system ("ln -s depth/out ./docxx" ) my_system([ "cp %s/TODO ./TODO.txt" % depth, - "cp %s/ANNOUNCE-0.1 ./ANNOUNCE.txt" % depth, + "cp %s/ANNOUNCE-0.1 ./ANNOUNCE-0.1.txt" % depth, "cp %s/NEWS ./NEWS.txt" % depth, "cp %s/DEDICATION ./DEDICATION.txt" % depth]); my_system([ "make -C .. gifs"]); diff --git a/bin/mf-deps.in b/bin/mf-deps.in index 3483cfc9e9..b259b59748 100755 --- a/bin/mf-deps.in +++ b/bin/mf-deps.in @@ -1,4 +1,5 @@ #!@PYTHON@ +# -*- python -*- # # mf-deps.py -- dependencies for metafont @@ -17,6 +18,23 @@ """ +import sys +import os + +lilypath ='' +try: + lilypath = os.environ['LILYPOND_SOURCEDIR'] + '/' +except KeyError: + try: + lilypath = os.environ['top_srcdir'] + '/' + except KeyError: + print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/' + + sys.exit(1) + +lilypath = lilypath + '/bin/' +sys.path.append(lilypath) + from regex import * ; from regsub import * ; import sys; diff --git a/bin/mf-to-table.in b/bin/mf-to-table.in index 58c96c384b..08016d8128 100755 --- a/bin/mf-to-table.in +++ b/bin/mf-to-table.in @@ -15,6 +15,22 @@ import regsub import os import sys import time + + +lilypath ='' +try: + lilypath = os.environ['LILYPOND_SOURCEDIR'] + '/' +except KeyError: + try: + lilypath = os.environ['top_srcdir'] + '/' + except KeyError: + print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/' + + sys.exit(1) + +lilypath = lilypath + '/bin/' +sys.path.append(lilypath) + from flower import * begin_autometric_re = regex.compile('@{') diff --git a/bin/wild-perl b/bin/wild-perl index ede94c23fc..5262425834 100755 --- a/bin/wild-perl +++ b/bin/wild-perl @@ -45,5 +45,5 @@ while (<>) { print "\$(srcdir)/Makefile.am: \$(srcdir)/Makefile.am.wild\n" . # "\t\$(PERL) $my_topsrcdir/bin/wild-perl --top-srcdir=\"\$(real_topsrcdir)\" < \$< > \$@"; - "\t\$(PERL) $my_topsrcdir/bin/wild-perl < \$< > \$@"; + "\t\$(PERL) $my_topsrcdir/bin/wild-perl < \$< > \$@\n"; @@ -634,24 +634,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -PACKAGE=lilypond - -VERSION=$FULL_VERSION - -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } -fi -cat >> confdefs.h <<EOF -#define PACKAGE "$PACKAGE" -EOF - -cat >> confdefs.h <<EOF -#define VERSION "$VERSION" -EOF - echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:655: checking whether build environment is sane" >&5 +echo "configure:639: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -662,10 +646,21 @@ echo timestamp > conftestfile # directory). if ( set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "" = "X"; then + if test "$*" = "X"; then # -L didn't work. set X `ls -t $srcdir/configure conftestfile` fi + if test "$*" != "X $srcdir/configure conftestfile" \ + && test "$*" != "X conftestfile $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + { 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 @@ -696,9 +691,54 @@ 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 <<EOF +#define PACKAGE "$PACKAGE" +EOF + +cat >> confdefs.h <<EOF +#define VERSION "$VERSION" +EOF + + + missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:702: checking for working aclocal" >&5 +echo "configure:742: 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. @@ -711,7 +751,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:715: checking for working autoconf" >&5 +echo "configure:755: 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. @@ -724,7 +764,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:728: checking for working automake" >&5 +echo "configure:768: 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. @@ -737,7 +777,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:741: checking for working autoheader" >&5 +echo "configure:781: 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. @@ -750,7 +790,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:754: checking for working makeinfo" >&5 +echo "configure:794: 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. @@ -762,32 +802,6 @@ 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 @@ -861,7 +875,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:865: checking host system type" >&5 +echo "configure:879: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -884,7 +898,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:888: checking for $ac_word" >&5 +echo "configure:902: 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 @@ -913,7 +927,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:917: checking for $ac_word" >&5 +echo "configure:931: 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 @@ -942,7 +956,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:946: checking for $ac_word" >&5 +echo "configure:960: 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 @@ -990,7 +1004,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:994: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1008: 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. @@ -1000,11 +1014,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 <<EOF -#line 1004 "configure" +#line 1018 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1022: \"$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 @@ -1024,12 +1038,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:1028: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1033: checking whether we are using GNU C" >&5 +echo "configure:1047: 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 @@ -1038,7 +1052,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +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 ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1053,7 +1067,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:1057: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1071: 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 @@ -1093,7 +1107,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:1097: checking for ld used by GCC" >&5 +echo "configure:1111: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1111,10 +1125,10 @@ echo "configure:1097: 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:1115: checking for GNU ld" >&5 +echo "configure:1129: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1118: checking for non-GNU ld" >&5 +echo "configure:1132: 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 @@ -1150,7 +1164,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:1154: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1168: 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 @@ -1166,7 +1180,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:1170: checking for BSD-compatible nm" >&5 +echo "configure:1184: 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 @@ -1203,7 +1217,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1207: checking whether ln -s works" >&5 +echo "configure:1221: 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 @@ -1239,8 +1253,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 1243 "configure"' > conftest.$ac_ext - if { (eval echo configure:1244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1257 "configure"' > conftest.$ac_ext + if { (eval echo configure:1258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1276,7 +1290,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1280: checking for $ac_word" >&5 +echo "configure:1294: 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 @@ -1310,7 +1324,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:1314: checking for $ac_word" >&5 +echo "configure:1328: 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 @@ -1343,7 +1357,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1347: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1361: 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 @@ -1351,7 +1365,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 1355 "configure" +#line 1369 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1362,7 +1376,7 @@ int main() { yywrap() ; return 0; } EOF -if { (eval echo configure:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1380: \"$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 @@ -1386,7 +1400,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1390: checking how to run the C preprocessor" >&5 +echo "configure:1404: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1401,13 +1415,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1405 "configure" +#line 1419 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1418,13 +1432,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1422 "configure" +#line 1436 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1447,7 +1461,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:1451: checking lex output file root" >&5 +echo "configure:1465: 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 @@ -1468,7 +1482,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:1472: checking whether yytext is a pointer" >&5 +echo "configure:1486: 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 @@ -1480,14 +1494,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <<EOF -#line 1484 "configure" +#line 1498 "configure" #include "confdefs.h" `cat $LEX_OUTPUT_ROOT.c` int main() { ; return 0; } EOF -if { (eval echo configure:1491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -1653,7 +1667,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1657: checking for $ac_word" >&5 +echo "configure:1671: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1684,7 +1698,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1688: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1702: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1694,11 +1708,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 1698 "configure" +#line 1712 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1718,12 +1732,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1722: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1736: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1727: checking whether we are using GNU C++" >&5 +echo "configure:1741: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1732,7 +1746,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1747,7 +1761,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1751: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1765: 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 @@ -1786,7 +1800,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1790: checking for a BSD compatible install" >&5 +echo "configure:1804: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1840,7 +1854,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1844: checking for $ac_word" >&5 +echo "configure:1858: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1874,7 +1888,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1878: checking for $ac_word" >&5 +echo "configure:1892: 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 @@ -1966,7 +1980,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1970: checking for $ac_word" >&5 +echo "configure:1984: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2000,7 +2014,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2004: checking for $ac_word" >&5 +echo "configure:2018: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2034,7 +2048,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2038: checking for $ac_word" >&5 +echo "configure:2052: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2066,7 +2080,7 @@ test -n "$MAKE" || MAKE="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2070: checking for $ac_word" >&5 +echo "configure:2084: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2098,7 +2112,7 @@ fi # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2102: checking for $ac_word" >&5 +echo "configure:2116: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2132,7 +2146,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2136: checking for $ac_word" >&5 +echo "configure:2150: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_POD2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2166,7 +2180,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2170: checking for $ac_word" >&5 +echo "configure:2184: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_POD2MAN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2202,7 +2216,7 @@ if test "x$TEXPREFIX" = xauto ; then echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6 -echo "configure:2206: checking TeX/MF root dir directory" >&5 +echo "configure:2220: checking TeX/MF root dir directory" >&5 find_root_prefix="$prefix" @@ -2243,7 +2257,7 @@ if test "x$MFDIR" = xauto; then echo $ac_n "checking MF input directory""... $ac_c" 1>&6 -echo "configure:2247: checking MF input directory" >&5 +echo "configure:2261: checking MF input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name source -print |sort|head -1|sed 's#^\./##')` @@ -2268,7 +2282,7 @@ if test "x$TEXDIR" = xauto ; then echo $ac_n "checking TeX input directory""... $ac_c" 1>&6 -echo "configure:2272: checking TeX input directory" >&5 +echo "configure:2286: checking TeX input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')` @@ -2384,7 +2398,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2388: checking how to run the C++ preprocessor" >&5 +echo "configure:2402: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2397,12 +2411,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext <<EOF -#line 2401 "configure" +#line 2415 "configure" #include "confdefs.h" #include <stdlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2422,17 +2436,17 @@ echo "$ac_t""$CXXCPP" 1>&6 ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:2426: checking for FlexLexer.h" >&5 +echo "configure:2440: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2431 "configure" +#line 2445 "configure" #include "confdefs.h" #include <FlexLexer.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2570,7 +2584,8 @@ trap 'rm -fr `echo "bin/Makefile flower/Makefile flower/include/Makefile lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile mi2mu/include/Makefile debian/Makefile Documentation/Makefile init/Makefile input/Makefile tex/Makefile make/Makefile - mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile + mutopia/Makefile mutopia/J.S.Bach/Makefile mutopia/Coriolan/Makefile + test/Makefile Makefile bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples @@ -2705,7 +2720,8 @@ CONFIG_FILES=\${CONFIG_FILES-"bin/Makefile flower/Makefile flower/include/Makefi lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile mi2mu/include/Makefile debian/Makefile Documentation/Makefile init/Makefile input/Makefile tex/Makefile make/Makefile - mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile + mutopia/Makefile mutopia/J.S.Bach/Makefile mutopia/Coriolan/Makefile + test/Makefile Makefile bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples diff --git a/configure.in b/configure.in index 5a1c64b911..b6a41c2f66 100644 --- a/configure.in +++ b/configure.in @@ -256,7 +256,8 @@ AC_OUTPUT(bin/Makefile flower/Makefile flower/include/Makefile lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile mi2mu/include/Makefile debian/Makefile Documentation/Makefile init/Makefile input/Makefile tex/Makefile make/Makefile - mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile + mutopia/Makefile mutopia/J.S.Bach/Makefile mutopia/Coriolan/Makefile + test/Makefile Makefile bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples diff --git a/debian/Makefile.am b/debian/Makefile.am index 8942bdb91e..2055f2b3fd 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -5,4 +5,4 @@ EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \ postinst postinst.old.sh postrm preinst rules watch $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/flower/GNUmakefile b/flower/GNUmakefile index d347f6ba4f..0119865800 100644 --- a/flower/GNUmakefile +++ b/flower/GNUmakefile @@ -49,6 +49,6 @@ ifneq ($(libflower_la_SOURCES),$(CURRENT_libflower_la_SOURCES)) @echo \"$(CURRENT_libflower_la_SOURCES)\" @echo libflower_la_SOURCES changed: rerunning make-wild. @-rm -f Makefile.am - $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am + $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am endif diff --git a/flower/Makefile.am b/flower/Makefile.am index 99167e4bc6..952a5e89c2 100644 --- a/flower/Makefile.am +++ b/flower/Makefile.am @@ -34,4 +34,4 @@ wild-check: make-in-build: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/flower/Makefile.in b/flower/Makefile.in index 29b3f2f617..5e7e42db60 100644 --- a/flower/Makefile.in +++ b/flower/Makefile.in @@ -313,6 +313,110 @@ distdir: $(DISTFILES) (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done +choleski.lo choleski.o: choleski.cc include/choleski.hh \ + include/matrix.hh include/matrix-storage.hh include/varray.hh \ + include/real.hh include/virtual-methods.hh include/vector.hh +cpu-timer.lo cpu-timer.o: cpu-timer.cc include/cpu-timer.hh \ + include/real.hh +data-file.lo data-file.o: data-file.cc include/international.hh \ + include/data-file.hh include/text-stream.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh include/compare.hh \ + include/varray.hh +diagonal-storage.lo diagonal-storage.o: diagonal-storage.cc \ + include/diagonal-storage.hh include/full-storage.hh \ + include/varray.hh include/matrix-storage.hh include/real.hh \ + include/virtual-methods.hh +dictionary.lo dictionary.o: dictionary.cc +directed-graph.lo directed-graph.o: directed-graph.cc \ + include/directed-graph.hh include/parray.hh include/varray.hh +dstream.lo dstream.o: dstream.cc include/assoc.hh include/varray.hh \ + include/dstream.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/scalar.hh \ + include/text-db.hh include/data-file.hh include/text-stream.hh \ + include/string-convert.hh include/assoc-iter.hh +flower-debug.lo flower-debug.o: flower-debug.cc include/flower-debug.hh \ + include/dstream.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh +flower-version.lo flower-version.o: flower-version.cc config.hh +full-storage.lo full-storage.o: full-storage.cc include/full-storage.hh \ + include/varray.hh include/matrix-storage.hh include/real.hh \ + include/virtual-methods.hh include/full-storage.icc +interval.lo interval.o: interval.cc include/interval.hh \ + include/fproto.hh include/real.hh include/compare.hh \ + include/interval.tcc include/string.hh \ + include/arithmetic-operator.hh include/string-handle.hh \ + include/international.hh include/flower-debug.hh \ + include/dstream.hh +lgetopt.lo lgetopt.o: lgetopt.cc include/lgetopt.hh \ + include/international.hh +libc-extension.lo libc-extension.o: libc-extension.cc \ + include/libc-extension.hh include/fproto.hh include/real.hh \ + config.hh +matrix-debug.lo matrix-debug.o: matrix-debug.cc include/flower-debug.hh \ + include/dstream.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/matrix.hh \ + include/matrix-storage.hh include/varray.hh \ + include/virtual-methods.hh include/vector.hh +matrix-storage.lo matrix-storage.o: matrix-storage.cc \ + include/full-storage.hh include/varray.hh \ + include/matrix-storage.hh include/real.hh \ + include/virtual-methods.hh include/diagonal-storage.hh +matrix.lo matrix.o: matrix.cc include/matrix.hh \ + include/matrix-storage.hh include/varray.hh include/real.hh \ + include/virtual-methods.hh include/vector.hh \ + include/full-storage.hh include/diagonal-storage.hh +nscalar.lo nscalar.o: nscalar.cc +path.lo path.o: path.cc include/path.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/varray.hh \ + include/flower-debug.hh include/dstream.hh +rational.lo rational.o: rational.cc include/rational.hh \ + include/compare.hh include/arithmetic-operator.hh \ + include/fproto.hh include/real.hh include/string.hh \ + include/string-handle.hh include/international.hh \ + include/string-convert.hh include/libc-extension.hh config.hh +scalar.lo scalar.o: scalar.cc include/scalar.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/rational.hh +string-convert.lo string-convert.o: string-convert.cc \ + include/libc-extension.hh include/fproto.hh include/real.hh \ + config.hh include/string.hh include/arithmetic-operator.hh \ + include/string-handle.hh include/international.hh \ + include/compare.hh include/string-convert.hh \ + include/rational.hh +string.lo string.o: string.cc include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh \ + include/libc-extension.hh config.hh include/string-convert.hh +stringutil.lo stringutil.o: stringutil.cc include/string-handle.hh \ + include/fproto.hh include/real.hh include/string-data.hh \ + include/string.hh include/arithmetic-operator.hh \ + include/international.hh include/compare.hh \ + include/string-data.icc include/string-handle.icc \ + include/string.icc +text-db.lo text-db.o: text-db.cc include/text-db.hh include/data-file.hh \ + include/text-stream.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/varray.hh +text-stream.lo text-stream.o: text-stream.cc include/text-stream.hh \ + include/string.hh include/arithmetic-operator.hh \ + include/fproto.hh include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/varray.hh +unionfind.lo unionfind.o: unionfind.cc include/unionfind.hh \ + include/varray.hh +vector.lo vector.o: vector.cc include/vector.hh include/real.hh \ + include/varray.hh info: info-recursive dvi: dvi-recursive diff --git a/flower/flower-version.cc b/flower/flower-version.cc index deb0b19c7c..344474cd1b 100644 --- a/flower/flower-version.cc +++ b/flower/flower-version.cc @@ -3,17 +3,11 @@ #include "config.hh" // static char *s = "FlowerLib " MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL MY_PATCH_LEVEL " #%d"; -static char *s = "FlowerLib " FLOWER_VERSION " #%d"; +static char *s = "FlowerLib " FLOWER_VERSION ; -static const int build= -//#include ".build" -0 -; char const * flower_version_sz() { - static char v[1024]; - sprintf (v, s, build); - return v; + return s; } diff --git a/flower/include/Makefile.am b/flower/include/Makefile.am index 4602b2a2c5..e223c15d7e 100644 --- a/flower/include/Makefile.am +++ b/flower/include/Makefile.am @@ -14,4 +14,4 @@ all: Makefile $(HEADERS) wild-check wild-check: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/flowertest/GNUmakefile b/flowertest/GNUmakefile index 7026cec1e8..c588cc6fbc 100644 --- a/flowertest/GNUmakefile +++ b/flowertest/GNUmakefile @@ -1,4 +1,4 @@ -# flower/test/GNUmakefile +# flowertest/GNUmakefile # # This file helps maintainers to keep their Makefile.am automatically # up to date using GNU make features. diff --git a/flowertest/Makefile.am b/flowertest/Makefile.am index 6f8250cf71..240a54cfe4 100644 --- a/flowertest/Makefile.am +++ b/flowertest/Makefile.am @@ -7,13 +7,13 @@ bin_PROGRAMS = test TESTS = $(top_srcdir)/flowertest/check.sh -test_SOURCES = +test_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc test_LDADD = $(top_builddir)/flower/libflower.la @LEXLIB@ EXTRA_DIST = result Makefile.am.wild GNUmakefile check.sh -noinst_HEADERS = +noinst_HEADERS = flower-test.hh INCLUDES = -I$(top_srcdir)/flower/include @@ -24,4 +24,4 @@ all-am: Makefile $(PROGRAMS) wild-check wild-check: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/flowertest/Makefile.in b/flowertest/Makefile.in index 8f697b181c..366c29f8a2 100644 --- a/flowertest/Makefile.in +++ b/flowertest/Makefile.in @@ -106,13 +106,13 @@ bin_PROGRAMS = test TESTS = $(top_srcdir)/flowertest/check.sh -test_SOURCES = +test_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc test_LDADD = $(top_builddir)/flower/libflower.la @LEXLIB@ EXTRA_DIST = result Makefile.am.wild GNUmakefile check.sh -noinst_HEADERS = +noinst_HEADERS = flower-test.hh INCLUDES = -I$(top_srcdir)/flower/include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -123,9 +123,12 @@ PROGRAMS = $(bin_PROGRAMS) DEFS = @DEFS@ -I. -I$(srcdir) -I../flower LIBS = @LIBS@ -test_OBJECTS = +test_OBJECTS = main.o mat-test.o pqtest.o rattest.o stringtest.o test_DEPENDENCIES = $(top_builddir)/flower/libflower.la test_LDFLAGS = +CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) +CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ HEADERS = $(noinst_HEADERS) DIST_COMMON = Makefile.am Makefile.in @@ -140,7 +143,7 @@ OBJECTS = $(test_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .S .c .lo .o .s +.SUFFIXES: .S .c .cc .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flowertest/Makefile @@ -214,7 +217,11 @@ maintainer-clean-libtool: test: $(test_OBJECTS) $(test_DEPENDENCIES) @rm -f test - $(LINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS) + $(CXXLINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS) +.cc.o: + $(CXXCOMPILE) -c $< +.cc.lo: + $(LTCXXCOMPILE) -c $< tags: TAGS @@ -252,6 +259,32 @@ 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 \ + ../flower/include/matrix-storage.hh ../flower/include/varray.hh \ + ../flower/include/real.hh ../flower/include/virtual-methods.hh \ + ../flower/include/vector.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + flower-test.hh ../flower/include/choleski.hh +pqtest.o: pqtest.cc flower-test.hh ../flower/include/pqueue.hh \ + ../flower/include/varray.hh +rattest.o: rattest.cc ../flower/include/rational.hh \ + ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + flower-test.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh +stringtest.o: stringtest.cc ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/varray.hh ../flower/include/string-convert.hh \ + flower-test.hh + check-TESTS: $(TESTS) @failed=0; all=0; \ srcdir=$(srcdir); export srcdir; \ diff --git a/flowertest/flower-test.hh b/flowertest/flower-test.hh new file mode 100644 index 0000000000..b5bde0f420 --- /dev/null +++ b/flowertest/flower-test.hh @@ -0,0 +1,46 @@ +/* + flower-test.hh -- declare + + source file of the Flower Library + + (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl> +*/ + + +#ifndef FLOWER_TEST_HH +#define FLOWER_TEST_HH +#include <iostream.h> + +#define ADD_TEST(f) \ +struct f ## Init {\ + f ## Init () { reg_test(f); }\ +} f ## init\ + +typedef void (*fptr)(void); + +void reg_test (fptr f); + +#endif // FLOWER_TEST_HH +/* + flower-test.hh -- declare + + source file of the Flower Library + + (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl> +*/ + + +#ifndef FLOWER_TEST_HH +#define FLOWER_TEST_HH +#include <iostream.h> + +#define ADD_TEST(f) \ +struct f ## Init {\ + f ## Init () { reg_test(f); }\ +} f ## init\ + +typedef void (*fptr)(void); + +void reg_test (fptr f); + +#endif // FLOWER_TEST_HH diff --git a/flowertest/main.cc b/flowertest/main.cc new file mode 100644 index 0000000000..26aaf3cff9 --- /dev/null +++ b/flowertest/main.cc @@ -0,0 +1,21 @@ +#include "flower-test.hh" +#include "varray.hh" + +Array< fptr > *test_arr_p; + +void reg_test (fptr f) +{ + if (!test_arr_p) + test_arr_p = new Array<fptr>; + test_arr_p->push (f); +} + +int +main () +{ + if (test_arr_p) + { + for (int i=0; i < test_arr_p->size (); i++) + (*test_arr_p)[i] (); + } +} diff --git a/flowertest/mat-test.cc b/flowertest/mat-test.cc new file mode 100644 index 0000000000..1ad7af49ce --- /dev/null +++ b/flowertest/mat-test.cc @@ -0,0 +1,64 @@ +/* + mat-test.cc -- test Matrix + + source file of the Flower Library + + (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl> +*/ + +#include <iostream.h> +#include "matrix.hh" +#include "string.hh" +#include "flower-test.hh" +#include "choleski.hh" + +void +matrix() +{ + int N=10; + Matrix m(N,N), q(N,N); + Vector v(N); + + for (int i=0; i < N; i++) { + v(i) =i; + for (int j=0; j < N; j++) { + m(i,j) = i+j; + q(i,j) = (abs(i-j) > 3) ?0 :i-j; + } + } + + cout << "v: " << String(v); + cout << "m: " << String(m ); + cout << "q: " << String(q); + cout << "m*q; " << String(m*q); + cout << "m*m: " << String(m*m); + m.OK(); + cout << "m: " << String(m); + cout << "q.band " << q.band_i() << endl; + q.try_set_band(); + cout << "q(B): " << q; + q.OK(); + Matrix sum(q+q); + cout << "q + q " << sum; + q.OK(); + cout << "q*q: " << q*q; + q.OK(); + + Matrix hilbert(N,N), h2(hilbert); + for (int i=0; i < N; i++) { + for (int j=0; j < N; j++) { + hilbert(i,j) = 1/Real(i+j+1); + h2 (i,j) = (abs(i-j) > 3) ?0 : hilbert(i,j); + } + } + h2.try_set_band(); + Choleski_decomposition ch(h2); + cout << "red Hilbert " << h2; + cout << "choleski " << ch.L; + Matrix T =ch.L.transposed(); + cout << "L^T " << T; + cout << "L * L^T" << ch.L * T; + cout << "H2^{-1} * H2" << h2 * ch.inverse(); +} + +ADD_TEST(matrix); diff --git a/flowertest/pqtest.cc b/flowertest/pqtest.cc new file mode 100644 index 0000000000..ea28bcb0fa --- /dev/null +++ b/flowertest/pqtest.cc @@ -0,0 +1,26 @@ +#include "flower-test.hh" +#include "pqueue.hh" +#include <stdlib.h> + +int compare (int i, int j) +{ + return i-j; +} + +void +pqtest () +{ + PQueue<int> pq; + + for (int i=0; i < 10; i++) { + int r = rand ()/10000; + pq.insert (r); + cout << "adding: " << r<< endl; + } + while (pq.size ()) { + cout << "getting : "<< flush; + cout << pq.get () << "\n"; + } +} + +ADD_TEST (pqtest); diff --git a/flowertest/rattest.cc b/flowertest/rattest.cc new file mode 100644 index 0000000000..64cc51e5f4 --- /dev/null +++ b/flowertest/rattest.cc @@ -0,0 +1,39 @@ +#include <iostream.h> +#include "rational.hh" +#include "flower-test.hh" +#include "string.hh" + + +#define EXP_PRINT(a) #a << ": " << (a) << "\n" + +void +rattest () +{ + Rational r (1,4); + Rational q(1,2); + Rational s(6,4); + Rational i; + i.set_infinite (1); + + cout << r << " " << s << " " << q << "\n"; + cout << r + q << " " << (s * q + s) << " " << (q / r) << "\n"; + cout << i; + cout << "inf * r" << i * r << "inf * inf " << i * i << "inf + r" << i + r; + cout << EXP_PRINT(-i); + cout << EXP_PRINT(i >? -i) << EXP_PRINT(i >? r); + cout << EXP_PRINT(i <? r) ; + Rational one(1); + cout << EXP_PRINT(one/Rational (4)); + cout << EXP_PRINT(one + one/Rational (4)); + Rational nul (0,1); + Rational kwart (1,4); + nul += kwart; + cout << EXP_PRINT(nul); + nul -= Rational (2) * kwart; + cout << EXP_PRINT(nul); + + cout << EXP_PRINT(Rational (1,128) + Rational (1919,128)); + +} + +ADD_TEST (rattest); diff --git a/flowertest/stringtest.cc b/flowertest/stringtest.cc new file mode 100644 index 0000000000..4597ff3b85 --- /dev/null +++ b/flowertest/stringtest.cc @@ -0,0 +1,144 @@ +/* + stupid test program to verify stringlib + stringtest.cc + */ +#include "string.hh" +#include "varray.hh" +#include "string-convert.hh" +#include "flower-test.hh" + +void +ctors () +{ + cout << "constructors"<<endl; + { + String str ("hai"); + cout << str << endl; + } + { + String fromi (10); + cout << fromi<< endl; + } + {String fromf (1.32e-2, "%g"); + cout << fromf<< endl; + } + { + String def; + cout << def << endl; + } + { + String fromc ('c'); + cout << fromc<< endl; + } +} +void +cmp () +{ + + String path = ""; + String sep ('/'); + String right(path.right_str (1)); + cout << "cmp ('', '/'): " << String::compare_i (sep,right) << endl; + + Array<String> a; + a.push ("abcd"); + a.push ("zxy"); + a.push ("abc"); + a.push (""); + a.push ("a"); + a.sort (String::compare_i); + cout << "compares: "<<endl; + for (int i=0; i < a.size (); i++) + cout << a[i] << endl; +} + + +void +searching () +{ + String hay = "foobarbazblub"; + + char c = 'b'; + String cstr =c; + String set = "bar"; + cout << "hay = \"" << hay << "\" len="<< hay.length_i ()<<endl; + cout << "index_i ('"<< c<<"') " << c << "= " << hay.index_i (c) <<endl; + cout << "last_index_i ('"<< c<<"') " << c << "= " << hay.index_last_i (c) <<endl; + // cout << "last index of cstr " << c << ": " << hay.index_last_i (cstr) <<endl; + // cout << "index_last_i (\""<<set<<"\"): " << hay.index_last_i (set) <<endl; + cout << "index_i (\""<<set<<"\"): " << hay.index_i (set) <<endl; + cout << "index_any (\"" << set << "\"): " << cstr << ": " << hay.index_any_i (cstr) <<endl; + + + +} + + +void +kutenpeer () +{ + String str ("hai"); + for (int i=-1; i < str.length_i ()+2; i++) { + cout<<" left_str (" << i<<"): " << str.left_str (i) << endl; + cout<<" right_str ("<<i<<"): " << str.right_str (i) << endl; + } + str = "blonde haren"; + cout << str<<endl; + cout << "mid (2,6)="<<str.cut (2,6)<<endl; + cout << "nomid (2,6)="<<str.nomid_str (2,6)<<endl; +} + +bool +test_empty_b (String str) +{ + cout << "`" << str << "' is "; + + if (str == String ("")) { + cout << "empty" << endl; + return true; + } + + cout << "not empty" << endl; + return false; +} + +void +stringtest () +{ + ctors (); + cmp (); + searching (); + kutenpeer (); + String str ("hai"); + cout << str << endl; + cout << "left" << endl; + str += " daar"; + cout << str << endl; + + // str = String ("Hallo") + " daaR" + '!'; // no go on doze-s gcc2.7.2? + str = String ("Hallo") + " daaR" + "!"; + cout << str << endl; + + cout << "up: " << str.upper_str () << " down: " << str.lower_str ()<<endl; + + if (test_empty_b (str)) + cout << "failed"; + + String fn = ""; + if (!test_empty_b (fn)) + cout << "failed"; + + + fn = ""; + fn += ""; + delete fn.copy_byte_p (); + delete str.copy_byte_p (); + + cout << String_convert::bin2hex_str (String ( (char)0xff)) << endl; + cout << "-1:" << String_convert::i2hex_str (-1, 2, '0'); + cout << endl; + +} + + +ADD_TEST (stringtest); diff --git a/init/Makefile.am b/init/Makefile.am index 9d3d081e66..1ee3ca1779 100644 --- a/init/Makefile.am +++ b/init/Makefile.am @@ -1,10 +1,10 @@ # Generated automatically by wild-perl 0.1 # init/Makefile.am.wild -INIFILES = deutsch.ly dynamic.ly engraver.ly feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly +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 EXTRA_DIST = Makefile.am.wild $(INIFILES) -CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly +CLEANFILES = 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 TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES)) @@ -20,4 +20,4 @@ uninstall-local: for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done -rmdir $(datadir)/lilypond/init $(datadir)/lilypond/ $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/init/Makefile.in b/init/Makefile.in index 655dd49168..aed89c6c9d 100644 --- a/init/Makefile.in +++ b/init/Makefile.in @@ -100,10 +100,10 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -INIFILES = deutsch.ly dynamic.ly engraver.ly feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly +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 EXTRA_DIST = Makefile.am.wild $(INIFILES) -CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly +CLEANFILES = 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 TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES)) diff --git a/init/feta11.ly b/init/feta11.ly deleted file mode 100644 index 0e45818ff0..0000000000 --- a/init/feta11.ly +++ /dev/null @@ -1,88 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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.38\pt 0.72\pt -1.51\pt 1.51\pt - "prall" "\\prall" -2.42\pt 2.42\pt -1.51\pt 1.51\pt - "mordent" "\\mordent" -2.42\pt 2.42\pt -1.51\pt 1.51\pt - "prallprall" "\\prallprall" -3.47\pt 3.47\pt -1.51\pt 1.51\pt - "prallmordent" "\\prallmordent" -3.47\pt 3.47\pt -1.51\pt 1.51\pt - "upprall" "\\upprall" -3.47\pt 3.47\pt -1.51\pt 1.51\pt - "downprall" "\\downprall" -3.47\pt 3.47\pt -1.51\pt 1.51\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 deleted file mode 100644 index a4a20f78b7..0000000000 --- a/init/feta13.ly +++ /dev/null @@ -1,88 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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" -1.62\pt 0.85\pt -1.79\pt 1.79\pt - "prall" "\\prall" -2.86\pt 2.86\pt -1.79\pt 1.79\pt - "mordent" "\\mordent" -2.86\pt 2.86\pt -1.79\pt 1.79\pt - "prallprall" "\\prallprall" -4.10\pt 4.10\pt -1.79\pt 1.79\pt - "prallmordent" "\\prallmordent" -4.10\pt 4.10\pt -1.79\pt 1.79\pt - "upprall" "\\upprall" -4.10\pt 4.10\pt -1.79\pt 1.79\pt - "downprall" "\\downprall" -4.10\pt 4.10\pt -1.79\pt 1.79\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 deleted file mode 100644 index bca45d1958..0000000000 --- a/init/feta16.ly +++ /dev/null @@ -1,88 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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.00\pt 1.05\pt -2.20\pt 2.20\pt - "prall" "\\prall" -3.52\pt 3.52\pt -2.20\pt 2.20\pt - "mordent" "\\mordent" -3.52\pt 3.52\pt -2.20\pt 2.20\pt - "prallprall" "\\prallprall" -5.05\pt 5.05\pt -2.20\pt 2.20\pt - "prallmordent" "\\prallmordent" -5.05\pt 5.05\pt -2.20\pt 2.20\pt - "upprall" "\\upprall" -5.05\pt 5.05\pt -2.20\pt 2.20\pt - "downprall" "\\downprall" -5.05\pt 5.05\pt -2.20\pt 2.20\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 deleted file mode 100644 index cb34017790..0000000000 --- a/init/feta19.ly +++ /dev/null @@ -1,88 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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" -2.38\pt 1.24\pt -2.61\pt 2.61\pt - "prall" "\\prall" -4.18\pt 4.18\pt -2.61\pt 2.61\pt - "mordent" "\\mordent" -4.18\pt 4.18\pt -2.61\pt 2.61\pt - "prallprall" "\\prallprall" -5.99\pt 5.99\pt -2.61\pt 2.61\pt - "prallmordent" "\\prallmordent" -5.99\pt 5.99\pt -2.61\pt 2.61\pt - "upprall" "\\upprall" -5.99\pt 5.99\pt -2.61\pt 2.61\pt - "downprall" "\\downprall" -5.99\pt 5.99\pt -2.61\pt 2.61\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 deleted file mode 100644 index 573788dd59..0000000000 --- a/init/feta20.ly +++ /dev/null @@ -1,88 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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" -2.50\pt 1.31\pt -2.75\pt 2.75\pt - "prall" "\\prall" -4.40\pt 4.40\pt -2.75\pt 2.75\pt - "mordent" "\\mordent" -4.40\pt 4.40\pt -2.75\pt 2.75\pt - "prallprall" "\\prallprall" -6.31\pt 6.31\pt -2.75\pt 2.75\pt - "prallmordent" "\\prallmordent" -6.31\pt 6.31\pt -2.75\pt 2.75\pt - "upprall" "\\upprall" -6.31\pt 6.31\pt -2.75\pt 2.75\pt - "downprall" "\\downprall" -6.31\pt 6.31\pt -2.75\pt 2.75\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 deleted file mode 100644 index 2375eb3f50..0000000000 --- a/init/feta23.ly +++ /dev/null @@ -1,88 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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" -2.81\pt 1.47\pt -3.09\pt 3.09\pt - "prall" "\\prall" -4.95\pt 4.95\pt -3.09\pt 3.09\pt - "mordent" "\\mordent" -4.95\pt 4.95\pt -3.09\pt 3.09\pt - "prallprall" "\\prallprall" -7.09\pt 7.09\pt -3.09\pt 3.09\pt - "prallmordent" "\\prallmordent" -7.09\pt 7.09\pt -3.09\pt 3.09\pt - "upprall" "\\upprall" -7.09\pt 7.09\pt -3.09\pt 3.09\pt - "downprall" "\\downprall" -7.09\pt 7.09\pt -3.09\pt 3.09\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 deleted file mode 100644 index 77841219dc..0000000000 --- a/init/feta26.ly +++ /dev/null @@ -1,88 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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" -3.25\pt 1.70\pt -3.58\pt 3.58\pt - "prall" "\\prall" -5.72\pt 5.72\pt -3.58\pt 3.58\pt - "mordent" "\\mordent" -5.72\pt 5.72\pt -3.58\pt 3.58\pt - "prallprall" "\\prallprall" -8.20\pt 8.20\pt -3.58\pt 3.58\pt - "prallmordent" "\\prallmordent" -8.20\pt 8.20\pt -3.58\pt 3.58\pt - "upprall" "\\upprall" -8.20\pt 8.20\pt -3.58\pt 3.58\pt - "downprall" "\\downprall" -8.20\pt 8.20\pt -3.58\pt 3.58\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/table11.ly b/init/table11.ly index ba026be641..e2ed204085 100644 --- a/init/table11.ly +++ b/init/table11.ly @@ -11,10 +11,12 @@ table_eleven = \symboltables { % index TeXstring, xmin xmax ymin ymax "style" = \table { - "roman" "\settext{%}" 0.0\pt 7.5\pt 0.0\pt 10.0\pt - "italic" "\setitalic{%}" 0.0\pt 0.0\pt 0.0\pt 10.0\pt + "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 + "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 } "dynamics" = \table { diff --git a/init/table13.ly b/init/table13.ly index 1969e3974c..757778437f 100644 --- a/init/table13.ly +++ b/init/table13.ly @@ -11,10 +11,12 @@ table_thirteen = \symboltables { % index TeXstring, xmin xmax ymin ymax "style" = \table { - "roman" "\settext{%}" 0.0\pt 7.5\pt 0.0\pt 10.0\pt - "italic" "\setitalic{%}" 0.0\pt 0.0\pt 0.0\pt 10.0\pt + "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 + "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 } "dynamics" = \table { diff --git a/init/table16.ly b/init/table16.ly index d9680a0f19..83f0e3c9bb 100644 --- a/init/table16.ly +++ b/init/table16.ly @@ -12,11 +12,11 @@ table_sixteen= "style" = \table { "bold" "\setbold{%}" 0.0\pt 7.50\pt 0.0\pt 8.0\pt -% "roman" "\settext{%}" 0.0\pt 7.50\pt 0.0\pt 8.0\pt - "roman" "\settext{%}" 0.0\pt 9.50\pt 0.0\pt 8.0\pt - "italic" "\setitalic{%}" 0.0\pt 0.0\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 + "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 } "dynamics" = \table { "mf" "\dynmf" diff --git a/init/table20.ly b/init/table20.ly index 73f4326504..597cbe0ef3 100644 --- a/init/table20.ly +++ b/init/table20.ly @@ -13,10 +13,11 @@ table_twenty = "style" = \table { "bold" "\setbold{%}" 0.0\pt 7.50\pt 0.0\pt 8.0\pt - "roman" "\settext{%}" 0.0\pt 7.5\pt 0.0\pt 10.0\pt - "italic" "\setitalic{%}" 0.0\pt 0.0\pt 0.0\pt 10.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 + "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 } "dynamics" = \table { diff --git a/init/table26.ly b/init/table26.ly index 047015cc43..ace2e1026e 100644 --- a/init/table26.ly +++ b/init/table26.ly @@ -11,10 +11,12 @@ table_twentysix = \symboltables { % index TeXstring, xmin xmax ymin ymax "style" = \table { - "roman" "\settext{%}" 0.0\pt 7.5\pt 0.0\pt 10.0\pt - "italic" "\setitalic{%}" 0.0\pt 0.0\pt 0.0\pt 10.0\pt + "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 + "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 } "dynamics" = \table { diff --git a/input/Makefile.am b/input/Makefile.am index e684494a8a..3bdf8d9dc1 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -11,4 +11,4 @@ OUTFILES = $(M4FILES:%.m4=%) default: all $(OUTFILES) $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/input/font-body.ly b/input/font-body.ly index f4314227c2..5ed8e12545 100644 --- a/input/font-body.ly +++ b/input/font-body.ly @@ -13,8 +13,8 @@ FontBody= \melodic{ a\ppp-\upbow a\pp-\downbow a\p^\turn a\mp^\fermata | a\mf_\fermata a\f-\stopped a\ff-\open a\fff^\trill| a\fp a4.\sf a4.\sfz | % a\fz a\rf - [c8 c] [a' a'] - [c a'] [a' c] | + [c8-\prall c-\mordent] [a'-\prallmordent a'-\prallprall] + [c-\upprall a'-\downprall] [a' c] | [c \< d e f] [as' ges' f' e'] [cis' dis' c' des'] [cisis' disis' \! ceses' deses'] | \clef "bass"; diff --git a/input/sleur.ly b/input/sleur.ly index a0c895286c..0f53a82adc 100644 --- a/input/sleur.ly +++ b/input/sleur.ly @@ -27,10 +27,11 @@ complex = \melodic{ } beum = \melodic{ + \octave c'; [c8 c] c4 c4 c4 | } -extend = { +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 | @@ -41,19 +42,32 @@ extend = { \[4/5c8( c ''c c c\]1/1 c c c )c | } +extendbug = \melodic{ + \octave c'; + c4( c' c' )c + \stemup c'4( \stemdown e e \stemboth )c' + [c'8( b g a] [c' d' e' c'] [c' d' e' )c'] + c( c' c' )c + e( g' g' )e +} + \score{ \melodic{ \shortlong \dirs \complex \beum + \octave c'; \stemup; - \octave c''; \extend + \octave c''; \stemdown; - \octave c'; \extend + \stemboth; + \extendbug + } + \paper{ +% castingalgorithm = \Wordwrap; } - \paper{ } } diff --git a/lib/Makefile.am b/lib/Makefile.am index 6bb5a17465..cc5cbdf376 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS = include lib_LTLIBRARIES = liblily.la -liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc includable-lexer.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc +liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc INCLUDES = -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include MODULE_CXXFLAGS += -D_REENTRANT @@ -22,4 +22,4 @@ EXTRA_DIST = Makefile.am.wild GNUmakefile distclean-local: -rm -rf .deps $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/lib/Makefile.in b/lib/Makefile.in index a68b3669b9..38f347f9ae 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -111,7 +111,7 @@ SUBDIRS = include lib_LTLIBRARIES = liblily.la -liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc includable-lexer.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc +liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc INCLUDES = -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include @@ -127,9 +127,9 @@ LIBS = @LIBS@ liblily_la_LDFLAGS = liblily_la_LIBADD = liblily_la_OBJECTS = binary-source-file.lo duration-convert.lo \ -duration.lo includable-lexer.lo input.lo mapped-file-storage.lo \ -moment.lo plet.lo simple-file-storage.lo source-file.lo source.lo \ -template.lo warn.lo windhoos-suck-suck-suck-thank-you-cygnus.lo +duration.lo input.lo mapped-file-storage.lo moment.lo plet.lo \ +simple-file-storage.lo source-file.lo source.lo template.lo warn.lo \ +windhoos-suck-suck-suck-thank-you-cygnus.lo CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ @@ -308,6 +308,124 @@ distdir: $(DISTFILES) (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done +binary-source-file.lo binary-source-file.o: binary-source-file.cc \ + include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/source-file.hh \ + include/binary-source-file.hh \ + ../flower/include/string-convert.hh +duration-convert.lo duration-convert.o: duration-convert.cc \ + include/duration-convert.hh include/duration.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh include/plet.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/varray.hh \ + include/warn.hh +duration.lo duration.o: duration.cc include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/source-file.hh \ + include/source.hh include/moment.hh \ + ../flower/include/rational.hh include/duration.hh \ + include/plet.hh include/duration-convert.hh \ + ../flower/include/varray.hh +input.lo input.o: input.cc include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/input.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/source.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/source-file.hh +mapped-file-storage.lo mapped-file-storage.o: mapped-file-storage.cc +moment.lo moment.o: moment.cc ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/moment.hh ../flower/include/rational.hh +plet.lo plet.o: plet.cc include/plet.hh include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh +simple-file-storage.lo simple-file-storage.o: simple-file-storage.cc \ + include/simple-file-storage.hh include/file-storage.hh \ + include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/warn.hh +source-file.lo source-file.o: source-file.cc ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/proto.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/warn.hh \ + include/windhoos-suck-suck-suck-thank-you-cygnus.hh \ + include/source-file.hh include/simple-file-storage.hh \ + include/file-storage.hh +source.lo source.o: source.cc include/binary-source-file.hh \ + include/source-file.hh include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/source.hh ../flower/include/path.hh \ + ../flower/include/varray.hh +template.lo template.o: template.cc include/source-file.hh \ + include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/plist.tcc ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/pcursor.tcc \ + ../flower/include/cursor.tcc ../flower/include/list.tcc +warn.lo warn.o: warn.cc include/warn.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh +windhoos-suck-suck-suck-thank-you-cygnus.lo windhoos-suck-suck-suck-thank-you-cygnus.o: \ + windhoos-suck-suck-suck-thank-you-cygnus.cc info: info-recursive dvi: dvi-recursive diff --git a/lib/include/Makefile.am b/lib/include/Makefile.am index 1b8c110a78..89cb06f55d 100644 --- a/lib/include/Makefile.am +++ b/lib/include/Makefile.am @@ -1,7 +1,7 @@ # Generated automatically by wild-perl 0.1 # lib/include/Makefile -noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh includable-lexer.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh +noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh EXTRA_DIST = Makefile.am.wild GNUmakefile @@ -14,4 +14,4 @@ all: Makefile $(HEADERS) wild-check wild-check: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/lib/include/Makefile.in b/lib/include/Makefile.in index 1b35682d67..aa411ca030 100644 --- a/lib/include/Makefile.in +++ b/lib/include/Makefile.in @@ -100,7 +100,7 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh includable-lexer.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh +noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh EXTRA_DIST = Makefile.am.wild GNUmakefile mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/lily/Makefile.am b/lily/Makefile.am index ceab122e88..9090377055 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 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 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 @@ -58,4 +58,4 @@ wild-check: # dummy target for non-GNU makes; is overridden in GNUmakefile make-in-build: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/lily/Makefile.in b/lily/Makefile.in index 42387989af..61f8faa088 100644 --- a/lily/Makefile.in +++ b/lily/Makefile.in @@ -113,7 +113,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 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 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 @@ -152,38 +152,39 @@ 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 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 +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@ @@ -382,6 +383,1421 @@ distdir: $(DISTFILES) (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done +abbrev.o: abbrev.cc include/abbrev.hh include/item.hh include/boxes.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/beam.hh include/directional-spanner.hh \ + include/spanner.hh include/rod.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/lookup.hh include/atom.hh \ + ../flower/include/scalar.hh include/stem.hh include/molecule.hh \ + include/dimen.hh +abbreviation-beam-engraver.o: abbreviation-beam-engraver.cc \ + ../lib/include/duration-convert.hh ../lib/include/duration.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/varray.hh \ + include/time-description.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/abbreviation-beam-engraver.hh \ + include/engraver.hh include/request.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/drul-array.hh \ + include/stem.hh include/item.hh include/boxes.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/abbreviation-beam.hh include/beam.hh \ + include/directional-spanner.hh include/spanner.hh \ + include/rod.hh include/musical-request.hh include/misc.hh \ + include/grouping.hh +abbreviation-beam.o: abbreviation-beam.cc include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rod.hh include/dimen.hh \ + include/abbreviation-beam.hh include/beam.hh \ + include/directional-spanner.hh include/spanner.hh \ + include/misc.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/scalar.hh \ + include/grouping.hh include/minterval.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/atom.hh include/molecule.hh include/leastsquares.hh \ + include/stem.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/lookup.hh \ + include/stem-info.hh +atom.o: atom.cc include/atom.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/tex.hh \ + ../flower/include/scalar.hh include/dimen.hh \ + ../flower/include/varray.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +audio-column.o: audio-column.cc include/audio-column.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/lily-proto.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh include/audio-item.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/audio-element.hh \ + ../flower/include/virtual-methods.hh include/performance.hh \ + include/music-output.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +audio-element.o: audio-element.cc include/audio-element.hh \ + ../flower/include/virtual-methods.hh include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh +audio-item.o: audio-item.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/audio-item.hh \ + include/audio-element.hh ../flower/include/virtual-methods.hh \ + include/midi-item.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../lib/include/moment.hh \ + ../flower/include/rational.hh include/request.hh \ + ../lib/include/input.hh include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/audio-column.hh +audio-staff.o: audio-staff.cc include/audio-staff.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/lily-proto.hh include/audio-element.hh \ + ../flower/include/virtual-methods.hh include/audio-item.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/midi-item.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/midi-stream.hh include/midi-walker.hh \ + ../flower/include/pqueue.hh ../flower/include/varray.hh +axis-group-administration.o: axis-group-administration.cc \ + ../flower/include/interval.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/compare.hh \ + include/axis-group-administration.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + include/axes.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +axis-group-element.o: axis-group-element.cc \ + include/axis-group-element.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh +axis-group-item.o: axis-group-item.cc include/axis-group-item.hh \ + include/axis-group-element.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/item.hh \ + include/boxes.hh include/drul-array.hh include/direction.hh \ + include/p-col.hh include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rod.hh +axis-group-spanner.o: axis-group-spanner.cc \ + include/axis-group-spanner.hh include/spanner.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh \ + include/axis-group-element.hh \ + include/axis-group-administration.hh include/item.hh \ + include/boxes.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc +axis.o: axis.cc include/axes.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh +bar-column-grav.o: bar-column-grav.cc include/bar-column-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/bar-column.hh \ + include/script-column.hh \ + include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/axis-group-administration.hh include/item.hh \ + include/boxes.hh include/drul-array.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/script.hh include/staff-side.hh include/bar.hh +bar-column.o: bar-column.cc include/bar.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/bar-column.hh \ + include/script-column.hh \ + include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh +bar-grav.o: bar-grav.cc include/bar-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/bar.hh include/item.hh \ + include/boxes.hh include/offset.hh include/axes.hh \ + include/score-elem.hh ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/command-request.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/time-description.hh \ + include/engraver-group.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/translator-group.hh +bar-number-grav.o: bar-number-grav.cc include/bar-number-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/script.hh \ + include/staff-side.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/text-def.hh include/general-script-def.hh \ + include/command-request.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/bar.hh \ + include/time-description.hh +bar.o: bar.cc include/bar.hh include/item.hh include/boxes.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh include/atom.hh ../flower/include/scalar.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +beam-grav.o: beam-grav.cc ../lib/include/duration-convert.hh \ + ../lib/include/duration.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/varray.hh \ + include/time-description.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/beam-grav.hh \ + include/engraver.hh include/request.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/drul-array.hh \ + include/stem.hh include/item.hh include/boxes.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/beam.hh include/directional-spanner.hh \ + include/spanner.hh include/rod.hh include/musical-request.hh \ + include/grouping.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh +beam-swallow-trans.o: beam-swallow-trans.cc \ + include/type-swallow-trans.hh include/translator.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + include/musical-request.hh include/request.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh +beam.o: beam.cc include/p-col.hh include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rod.hh include/dimen.hh \ + include/beam.hh include/directional-spanner.hh \ + include/spanner.hh include/abbreviation-beam.hh include/misc.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/scalar.hh include/grouping.hh \ + include/minterval.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/atom.hh include/molecule.hh include/leastsquares.hh \ + include/stem.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/lookup.hh \ + include/stem-info.hh include/main.hh +bow.o: bow.cc include/bow.hh include/directional-spanner.hh \ + include/spanner.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music-output-def.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/molecule.hh include/boxes.hh \ + include/lookup.hh include/atom.hh ../flower/include/scalar.hh +boxes.o: boxes.cc include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/varray.hh +break-align-item.o: break-align-item.cc include/break-align-item.hh \ + include/horizontal-align-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh +break.o: break.cc include/score-column.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rod.hh include/break.hh \ + include/colhpos.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/line-spacer.hh \ + ../flower/include/vector.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/scoreline.hh include/spanner.hh include/p-score.hh \ + include/music-output.hh ../flower/include/cpu-timer.hh +change-iterator.o: change-iterator.cc include/change-iterator.hh \ + include/music-iterator.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/varray.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/virtual-methods.hh \ + include/translator-group.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/translator.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/parray.hh \ + ../lib/include/input.hh include/change-translator.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +change-translator.o: change-translator.cc include/change-translator.hh \ + include/music.hh ../flower/include/virtual-methods.hh \ + ../lib/include/input.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +chord-iterator.o: chord-iterator.cc include/translator-group.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/virtual-methods.hh include/translator.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/chord-iterator.hh \ + include/music-iterator.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-list.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh +clef-grav.o: clef-grav.cc include/bar.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/clef-grav.hh \ + ../flower/include/scalar.hh include/engraver.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + include/score-elem-info.hh include/staff-info.hh \ + include/translator.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/clef-item.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/command-request.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/time-description.hh +clef-item.o: clef-item.cc include/clef-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh include/atom.hh ../flower/include/scalar.hh \ + include/clef-grav.hh include/engraver.hh include/request.hh \ + ../lib/include/input.hh include/music.hh include/minterval.hh \ + include/score-elem-info.hh include/staff-info.hh \ + include/translator.hh +col-info.o: col-info.cc include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rod.hh include/col-info.hh \ + ../flower/include/pointer.hh ../flower/include/assoc.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +colhpos.o: colhpos.cc include/colhpos.hh ../flower/include/varray.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/warn.hh ../flower/include/vector.hh \ + include/line-spacer.hh ../flower/include/interval.hh +collision-grav.o: collision-grav.cc include/note-column.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/script-column.hh \ + include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/collision-grav.hh include/engraver.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/collision.hh +collision.o: collision.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/collision.hh \ + include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/item.hh \ + include/boxes.hh include/drul-array.hh include/direction.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/note-column.hh include/script-column.hh \ + include/note-head.hh include/rhythmic-head.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh +command-request.o: command-request.cc include/command-request.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + ../lib/include/proto.hh include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/lily-proto.hh \ + include/direction.hh ../flower/include/varray.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/musical-request.hh +crescendo.o: crescendo.cc include/molecule.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/direction.hh \ + include/dimen.hh include/crescendo.hh include/staff-side.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/spanner.hh \ + include/drul-array.hh include/rod.hh include/lookup.hh \ + include/atom.hh ../flower/include/scalar.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/score-column.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh +debug.o: debug.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh ../flower/include/flower-debug.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/main.hh +dimen.o: dimen.cc include/dimen.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/debug.hh ../flower/include/dstream.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh +directional-spanner.o: directional-spanner.cc \ + include/directional-spanner.hh include/spanner.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh +dot-column-grav.o: dot-column-grav.cc +dot-column.o: dot-column.cc include/dots.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/dot-column.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/rhythmic-head.hh +dots.o: dots.cc include/dots.hh include/item.hh include/boxes.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh include/atom.hh ../flower/include/scalar.hh +dynamic-grav.o: dynamic-grav.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/crescendo.hh \ + include/staff-side.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/spanner.hh include/drul-array.hh include/rod.hh \ + include/dynamic-grav.hh include/engraver.hh include/request.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../lib/include/input.hh include/music.hh include/minterval.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/musical-request.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/text-item.hh include/text-def.hh \ + include/general-script-def.hh include/item.hh include/boxes.hh \ + include/lookup.hh include/atom.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/score-column.hh \ + include/p-col.hh include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/staff-sym.hh include/note-column.hh \ + include/script-column.hh \ + include/horizontal-vertical-group-item.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh +engraver-group.o: engraver-group.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/engraver-group.hh \ + include/lily-proto.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh include/score-elem-info.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/engraver.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/translator-group.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/p-score.hh include/colhpos.hh include/music-output.hh \ + include/score-elem.hh ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh +engraver.o: engraver.cc include/music-list.hh include/music.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/minterval.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/musical-request.hh \ + include/request.hh include/direction.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/engraver.hh ../flower/include/varray.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/engraver-group.hh \ + include/translator-group.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +general-script-def.o: general-script-def.cc \ + include/general-script-def.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/input.hh \ + ../flower/include/virtual-methods.hh include/direction.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/warn.hh include/atom.hh include/boxes.hh \ + ../flower/include/interval.hh include/offset.hh include/axes.hh +global-translator.o: global-translator.cc include/global-translator.hh \ + include/translator-group.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/virtual-methods.hh include/translator.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/rational.hh ../flower/include/pqueue.hh +gourlay-breaking.o: gourlay-breaking.cc include/gourlay-breaking.hh \ + include/break.hh ../flower/include/varray.hh \ + ../flower/include/interval.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + include/colhpos.hh include/spring-spacer.hh \ + include/line-spacer.hh ../flower/include/vector.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/col-info.hh ../flower/include/pointer.hh \ + ../flower/include/assoc.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/warn.hh \ + include/p-col.hh include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/p-score.hh \ + include/music-output.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh +graphical-element.o: graphical-element.cc include/graphical-element.hh \ + include/offset.hh ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + ../flower/include/virtual-methods.hh \ + include/axis-group-element.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/directed-graph.hh \ + include/axis-group-administration.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +grouping.o: grouping.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/grouping.hh include/minterval.hh \ + ../flower/include/interval.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/varray.hh +head-grav.o: head-grav.cc include/note-head.hh include/rhythmic-head.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/head-grav.hh include/engraver.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/paper-def.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/musical-request.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/dots.hh +header.o: header.cc ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/dictionary-iter.hh \ + ../flower/include/assoc-iter.hh ../flower/include/assoc.hh \ + ../flower/include/varray.hh ../flower/include/dictionary.hh \ + include/header.hh +horizontal-align-item.o: horizontal-align-item.cc \ + include/horizontal-align-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +horizontal-group-elem.o: horizontal-group-elem.cc \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/item.hh \ + include/boxes.hh include/drul-array.hh include/direction.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +horizontal-group-item.o: horizontal-group-item.cc include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rod.hh +horizontal-vertical-group-elem.o: horizontal-vertical-group-elem.cc \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh \ + include/horizontal-group-elem.hh include/item.hh \ + include/boxes.hh include/drul-array.hh include/direction.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +horizontal-vertical-group-item.o: horizontal-vertical-group-item.cc \ + include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/item.hh \ + include/boxes.hh include/drul-array.hh include/direction.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/p-col.hh include/horizontal-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/rod.hh +idealspacing.o: idealspacing.cc include/idealspacing.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/p-col.hh include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rod.hh include/p-score.hh \ + include/colhpos.hh include/music-output.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +identifier.o: identifier.cc include/midi-def.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music-output-def.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + include/paper-def.hh ../flower/include/interval.hh \ + include/score.hh ../lib/include/input.hh \ + ../flower/include/parray.hh include/identifier.hh \ + include/my-lily-lexer.hh include/includable-lexer.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/symtable.hh include/atom.hh \ + include/boxes.hh include/offset.hh include/axes.hh \ + include/lookup.hh ../flower/include/scalar.hh \ + include/direction.hh include/script-def.hh \ + include/general-script-def.hh include/request.hh \ + include/music.hh include/minterval.hh include/translator.hh +includable-lexer.o: includable-lexer.cc include/includable-lexer.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/varray.hh ../lib/include/proto.hh \ + ../lib/include/source-file.hh ../lib/include/source.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc +ineq-constrained-qp.o: ineq-constrained-qp.cc \ + include/ineq-constrained-qp.hh ../flower/include/matrix.hh \ + ../flower/include/matrix-storage.hh ../flower/include/varray.hh \ + ../flower/include/real.hh ../flower/include/virtual-methods.hh \ + ../flower/include/vector.hh include/qlpsolve.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh ../flower/include/choleski.hh +item.o: item.cc include/p-score.hh include/colhpos.hh \ + ../flower/include/varray.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/parray.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/music-output.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/item.hh include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/direction.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/rod.hh include/spanner.hh +key-grav.o: key-grav.cc include/key-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/key.hh include/key-item.hh \ + include/item.hh include/boxes.hh include/offset.hh \ + include/axes.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/command-request.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/local-key-grav.hh \ + include/musical-request.hh include/local-key-item.hh \ + include/bar.hh include/time-description.hh +key-item.o: key-item.cc include/key-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/key.hh ../flower/include/scalar.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh include/atom.hh include/key-grav.hh \ + include/engraver.hh include/request.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + include/score-elem-info.hh include/staff-info.hh \ + include/translator.hh +key-performer.o: key-performer.cc include/key-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/performer.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/command-request.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/audio-item.hh include/audio-element.hh +key.o: key.cc include/key.hh ../flower/include/varray.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/debug.hh ../flower/include/dstream.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh +keyword.o: keyword.cc include/keyword.hh +leastsquares.o: leastsquares.cc include/leastsquares.hh \ + ../flower/include/varray.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh +lexer.o: lexer.cc ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/string-convert.hh include/my-lily-lexer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/varray.hh include/includable-lexer.hh \ + ../lib/include/duration.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/plet.hh \ + ../flower/include/interval.hh parser.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/parseconstruct.hh include/main.hh include/identifier.hh \ + ../lib/include/input.hh ../flower/include/virtual-methods.hh +lexerinit.o: lexerinit.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/my-lily-lexer.hh \ + include/lily-proto.hh ../flower/include/varray.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/includable-lexer.hh \ + ../lib/include/duration.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/plet.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/main.hh \ + ../lib/include/source-file.hh ../lib/include/source.hh +lily-version.o: lily-version.cc ../flower/config.hh +line-group-grav.o: line-group-grav.cc include/staff-sym.hh \ + include/spanner.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh \ + include/vertical-group-spanner.hh include/axis-group-spanner.hh \ + include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/vertical-group-elem.hh include/command-request.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/bar.hh include/item.hh include/boxes.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/line-group-grav.hh \ + include/engraver.hh include/score-elem-info.hh \ + ../flower/include/scalar.hh include/staff-info.hh \ + include/translator.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc +line-spacer.o: line-spacer.cc include/line-spacer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh ../flower/include/vector.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh +linear-programming.o: linear-programming.cc local-key-grav.o: local-key-grav.cc include/musical-request.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -416,6 +1832,125 @@ 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 \ + ../flower/include/real.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/local-key-item.hh include/item.hh include/boxes.hh \ + ../flower/include/interval.hh include/offset.hh include/axes.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/scalar.hh include/lookup.hh include/atom.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/musical-request.hh include/request.hh \ + ../lib/include/input.hh include/music.hh include/minterval.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/note-head.hh include/rhythmic-head.hh include/misc.hh \ + include/grouping.hh +lookup.o: lookup.cc include/lookup.hh include/atom.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/scalar.hh \ + include/direction.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/symtable.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + include/dimen.hh include/tex.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music-output-def.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/main.hh +lyric-grav.o: lyric-grav.cc include/lyric-engraver.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/musical-request.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/text-item.hh include/text-def.hh \ + include/general-script-def.hh include/item.hh include/boxes.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/staff-side.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/lookup.hh include/atom.hh +lyric-performer.o: lyric-performer.cc include/lyric-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/performer.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/text-def.hh \ + include/general-script-def.hh include/musical-request.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/audio-item.hh include/audio-element.hh +main.o: main.cc ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/lgetopt.hh include/misc.hh \ + include/lily-proto.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/grouping.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/varray.hh include/main.hh \ + ../flower/include/path.hh ../flower/config.hh \ + ../lib/include/source.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/my-lily-parser.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh ../lib/include/input.hh meter-grav.o: meter-grav.cc include/meter-grav.hh include/engraver.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -445,6 +1980,1692 @@ 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 \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/command-request.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/audio-item.hh include/audio-element.hh +meter.o: meter.cc ../flower/include/scalar.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/molecule.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/boxes.hh \ + ../flower/include/interval.hh include/offset.hh include/axes.hh \ + include/direction.hh include/meter.hh include/item.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh include/atom.hh +midi-def.o: midi-def.cc include/misc.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/grouping.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/varray.hh include/midi-def.hh \ + include/music-output-def.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/translator.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + include/performance.hh include/music-output.hh \ + ../flower/include/assoc-iter.hh include/score-performer.hh \ + include/performer-group-performer.hh include/performer.hh \ + include/request.hh include/music.hh include/direction.hh \ + include/score-elem-info.hh include/staff-info.hh \ + include/translator-group.hh include/global-translator.hh \ + ../flower/include/pqueue.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +midi-item.o: midi-item.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/lily-proto.hh \ + ../lib/include/warn.hh include/misc.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/scalar.hh \ + include/grouping.hh include/minterval.hh \ + ../flower/include/interval.hh ../flower/include/varray.hh \ + ../flower/include/string-convert.hh include/command-request.hh \ + include/request.hh ../flower/include/virtual-methods.hh \ + ../lib/include/input.hh include/music.hh include/direction.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/musical-request.hh include/midi-item.hh \ + include/midi-stream.hh include/audio-item.hh \ + include/audio-element.hh +midi-stream.o: midi-stream.cc ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/string-convert.hh include/main.hh \ + include/lily-proto.hh ../lib/include/proto.hh include/misc.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/scalar.hh include/grouping.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/varray.hh include/midi-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/virtual-methods.hh include/midi-stream.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +midi-walker.o: midi-walker.cc include/midi-walker.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/pqueue.hh ../flower/include/varray.hh \ + include/lily-proto.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh \ + include/audio-column.hh include/audio-item.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/audio-element.hh \ + ../flower/include/virtual-methods.hh include/audio-staff.hh \ + include/midi-item.hh include/midi-stream.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +misc.o: misc.cc include/item.hh include/boxes.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/misc.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/scalar.hh \ + include/grouping.hh include/minterval.hh +molecule.o: molecule.cc ../flower/include/interval.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/compare.hh include/dimen.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/molecule.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/boxes.hh include/offset.hh include/axes.hh \ + include/direction.hh include/atom.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/tex.hh ../flower/include/scalar.hh +music-iterator.o: music-iterator.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/music-list.hh include/music.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/music-iterator.hh ../flower/include/varray.hh \ + include/voice-iterator.hh include/property-iterator.hh \ + include/chord-iterator.hh include/request-iterator.hh \ + include/translator-group.hh include/translator.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/parray.hh \ + include/translation-property.hh include/change-iterator.hh \ + include/change-translator.hh +music-list.o: music-list.cc include/music.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/minterval.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/music-list.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc +music-output-def.o: music-output-def.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/music-output-def.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + include/global-translator.hh include/translator-group.hh \ + include/translator.hh ../flower/include/scalar.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + ../flower/include/rational.hh ../flower/include/pqueue.hh \ + ../flower/include/dictionary-iter.hh \ + ../flower/include/assoc-iter.hh +music.o: music.cc include/music.hh ../flower/include/virtual-methods.hh \ + ../lib/include/input.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/music-list.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +musical-request.o: musical-request.cc include/musical-request.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/misc.hh ../flower/include/scalar.hh include/grouping.hh \ + ../flower/include/varray.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/script-def.hh include/general-script-def.hh \ + include/text-def.hh include/music-list.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc +my-lily-lexer.o: my-lily-lexer.cc include/notename-table.hh \ + ../flower/include/pointer.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/varray.hh ../flower/include/interval.hh \ + include/identifier.hh ../lib/include/input.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/assoc-iter.hh parser.hh include/keyword.hh \ + include/my-lily-lexer.hh include/includable-lexer.hh \ + ../lib/include/duration.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/plet.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh ../lib/include/source-file.hh \ + include/parseconstruct.hh +my-lily-parser.o: my-lily-parser.cc include/my-lily-parser.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../lib/include/duration.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/varray.hh \ + ../lib/include/input.hh include/my-lily-lexer.hh \ + include/includable-lexer.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/main.hh include/music-list.hh include/music.hh \ + ../flower/include/virtual-methods.hh include/minterval.hh \ + ../flower/include/interval.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/musical-request.hh \ + include/request.hh include/direction.hh \ + include/command-request.hh parser.hh include/header.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh +note-column.o: note-column.cc include/dot-column.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh include/note-column.hh \ + include/script-column.hh \ + include/horizontal-vertical-group-item.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/script.hh \ + include/staff-side.hh include/note-head.hh \ + include/rhythmic-head.hh include/stem.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/molecule.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rest.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +note-head.o: note-head.cc include/misc.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/grouping.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/varray.hh include/dots.hh include/item.hh \ + include/boxes.hh include/offset.hh include/axes.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/direction.hh include/note-head.hh \ + include/rhythmic-head.hh include/dimen.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/paper-def.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh include/atom.hh include/molecule.hh \ + include/musical-request.hh include/request.hh \ + ../lib/include/input.hh include/music.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh +note-performer.o: note-performer.cc include/note-performer.hh \ + include/performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/musical-request.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/audio-item.hh include/audio-element.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +note.o: note.cc include/my-lily-lexer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/includable-lexer.hh ../lib/include/duration.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../lib/include/plet.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/musical-request.hh include/request.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/command-request.hh include/music-list.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/identifier.hh include/text-def.hh \ + include/general-script-def.hh include/parseconstruct.hh +notename-table.o: notename-table.cc include/notename-table.hh \ + ../flower/include/pointer.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/varray.hh ../flower/include/pointer.tcc \ + include/musical-request.hh include/request.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh +offset.o: offset.cc ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/offset.hh include/axes.hh +outputter.o: outputter.cc include/outputter.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/tex-stream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/molecule.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/boxes.hh \ + ../flower/include/interval.hh include/offset.hh include/axes.hh \ + include/direction.hh ../flower/include/varray.hh \ + include/dimen.hh include/tex.hh ../flower/include/scalar.hh +p-col.o: p-col.cc include/p-col.hh include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rod.hh include/p-score.hh \ + include/colhpos.hh include/music-output.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +p-score.o: p-score.cc include/main.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/super-elem.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/lookup.hh include/atom.hh include/boxes.hh \ + ../flower/include/scalar.hh include/direction.hh \ + include/spanner.hh include/drul-array.hh include/rod.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/scoreline.hh include/colhpos.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/p-score.hh include/music-output.hh \ + include/tex-stream.hh include/header.hh include/word-wrap.hh \ + include/break.hh include/gourlay-breaking.hh \ + include/outputter.hh ../flower/include/list.tcc \ + ../flower/include/cursor.tcc +paper-def.o: paper-def.cc ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + include/misc.hh include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/scalar.hh include/grouping.hh \ + include/minterval.hh ../flower/include/interval.hh \ + include/paper-def.hh include/music-output-def.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/lookup.hh include/atom.hh \ + include/boxes.hh include/offset.hh include/axes.hh \ + include/direction.hh include/dimen.hh \ + ../flower/include/assoc-iter.hh include/score-grav.hh \ + include/engraver-group.hh ../flower/include/parray.hh \ + include/score-elem-info.hh include/engraver.hh \ + include/request.hh ../lib/include/input.hh include/music.hh \ + include/staff-info.hh include/translator.hh \ + include/translator-group.hh include/global-translator.hh \ + ../flower/include/pqueue.hh include/p-score.hh \ + include/colhpos.hh include/music-output.hh include/main.hh +parser.o: parser.cc ../flower/include/scalar.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/translation-property.hh include/music.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + ../lib/include/proto.hh include/minterval.hh \ + ../flower/include/interval.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/lily-proto.hh \ + include/script-def.hh include/general-script-def.hh \ + include/direction.hh include/symtable.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/varray.hh include/atom.hh include/boxes.hh \ + include/offset.hh include/axes.hh include/lookup.hh \ + include/misc.hh include/grouping.hh include/my-lily-lexer.hh \ + include/includable-lexer.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/midi-def.hh include/main.hh \ + include/keyword.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/parseconstruct.hh include/dimen.hh \ + include/identifier.hh include/command-request.hh \ + include/request.hh include/musical-request.hh \ + include/my-lily-parser.hh include/text-def.hh \ + include/translator-group.hh include/translator.hh \ + ../flower/include/parray.hh include/score.hh \ + include/music-list.hh include/header.hh \ + ../lib/include/duration-convert.hh include/change-translator.hh +performance.o: performance.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh ../flower/include/string-convert.hh \ + include/main.hh include/midi-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + include/midi-item.hh include/midi-stream.hh \ + include/audio-column.hh include/audio-staff.hh \ + include/audio-element.hh include/performance.hh \ + include/music-output.hh include/score.hh \ + ../lib/include/input.hh ../flower/include/parray.hh +performer-group-performer.o: performer-group-performer.cc \ + include/performer-group-performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/performer.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/translator-group.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +performer.o: performer.cc include/performer-group-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/performer.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/translator-group.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +pitch-squash-grav.o: pitch-squash-grav.cc include/pitch-squash-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/note-head.hh \ + include/rhythmic-head.hh include/item.hh include/boxes.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh +plet-engraver.o: plet-engraver.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/musical-request.hh include/lily-proto.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/plet-engraver.hh include/engraver.hh \ + ../flower/include/varray.hh include/score-elem-info.hh \ + ../flower/include/scalar.hh include/staff-info.hh \ + include/translator.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/parray.hh \ + include/drul-array.hh include/plet-spanner.hh include/bow.hh \ + include/directional-spanner.hh include/spanner.hh \ + include/score-elem.hh ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/rod.hh include/text-def.hh \ + include/general-script-def.hh include/beam.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/score-column.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/stem.hh \ + include/molecule.hh +plet-spanner.o: plet-spanner.cc include/atom.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/lookup.hh ../flower/include/scalar.hh \ + include/direction.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/p-col.hh include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/drul-array.hh include/rod.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/plet-spanner.hh include/bow.hh \ + include/directional-spanner.hh include/spanner.hh \ + include/stem.hh include/text-def.hh \ + include/general-script-def.hh ../lib/include/input.hh +plet-swallow-engraver.o: plet-swallow-engraver.cc \ + include/musical-request.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/plet-swallow-engraver.hh include/swallow-grav.hh \ + include/engraver.hh ../flower/include/varray.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh +priority-halign-grav.o: priority-halign-grav.cc include/bar.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/break-align-item.hh \ + include/horizontal-align-item.hh \ + include/priority-halign-grav.hh include/engraver.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/score-priority-grav.hh +property-iterator.o: property-iterator.cc include/property-iterator.hh \ + include/music-iterator.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/varray.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/virtual-methods.hh \ + include/translation-property.hh include/music.hh \ + ../lib/include/input.hh include/minterval.hh \ + ../flower/include/interval.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/scalar.hh \ + include/translator-group.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh +ps-plet.o: ps-plet.cc include/main.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/misc.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/grouping.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/varray.hh include/lookup.hh include/atom.hh \ + include/boxes.hh include/offset.hh include/axes.hh \ + include/direction.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/dimen.hh include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/paper-def.hh \ + include/music-output-def.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/string-convert.hh +qlp.o: qlp.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/qlp.hh \ + include/ineq-constrained-qp.hh ../flower/include/matrix.hh \ + ../flower/include/matrix-storage.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/vector.hh +qlpsolve.o: qlpsolve.cc include/ineq-constrained-qp.hh \ + ../flower/include/matrix.hh ../flower/include/matrix-storage.hh \ + ../flower/include/varray.hh ../flower/include/real.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/vector.hh include/qlpsolve.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh ../flower/include/choleski.hh +request-iterator.o: request-iterator.cc include/translator-group.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/virtual-methods.hh include/translator.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/request-iterator.hh \ + include/music-iterator.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-list.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/request.hh \ + include/direction.hh +request.o: request.cc include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + ../lib/include/proto.hh include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/lily-proto.hh \ + include/direction.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +rest-collision-grav.o: rest-collision-grav.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/rest-collision.hh \ + include/item.hh include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/direction.hh include/rest-collision-grav.hh \ + include/engraver.hh include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/collision.hh include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/note-column.hh include/script-column.hh +rest-collision.o: rest-collision.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/rest-collision.hh \ + include/item.hh include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/direction.hh include/note-column.hh \ + include/script-column.hh \ + include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/stem.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/note-head.hh include/rhythmic-head.hh \ + include/collision.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh +rest-grav.o: rest-grav.cc include/rest-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/musical-request.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/dots.hh include/item.hh include/boxes.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/rest.hh include/rhythmic-head.hh +rest.o: rest.cc include/molecule.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/direction.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/varray.hh \ + include/music-output-def.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh include/atom.hh ../flower/include/scalar.hh \ + include/rest.hh include/rhythmic-head.hh include/item.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/dots.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/p-score.hh \ + include/colhpos.hh include/music-output.hh +rhythmic-column-grav.o: rhythmic-column-grav.cc \ + include/rhythmic-column-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/note-head.hh \ + include/rhythmic-head.hh include/item.hh include/boxes.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/stem.hh include/molecule.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/note-column.hh \ + include/script-column.hh \ + include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/script.hh include/staff-side.hh include/dot-column.hh \ + include/horizontal-group-item.hh +rhythmic-head.o: rhythmic-head.cc include/rhythmic-head.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/molecule.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/lookup.hh include/atom.hh \ + ../flower/include/scalar.hh include/rest.hh include/dots.hh \ + include/axis-group-element.hh \ + include/axis-group-administration.hh include/p-score.hh \ + include/colhpos.hh include/music-output.hh +rod.o: rod.cc include/rod.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/direction.hh \ + include/drul-array.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/single-malt-grouping-item.hh +score-bar.o: score-bar.cc include/score-bar.hh include/bar.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh +score-column.o: score-column.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rod.hh \ + include/score-column.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh +score-elem-info.o: score-elem-info.cc include/score-elem-info.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/varray.hh include/request.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh +score-elem.o: score-elem.cc include/outputter.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/p-score.hh include/colhpos.hh \ + ../flower/include/varray.hh ../flower/include/parray.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/music-output.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/interval.hh include/music-output-def.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh include/atom.hh include/boxes.hh \ + include/offset.hh include/axes.hh ../flower/include/scalar.hh \ + include/direction.hh include/molecule.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/tex.hh include/dimen.hh include/spanner.hh \ + include/drul-array.hh include/rod.hh include/scoreline.hh \ + include/item.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh +score-grav.o: score-grav.cc include/super-elem.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh include/scoreline.hh \ + include/colhpos.hh include/spanner.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/item.hh include/boxes.hh include/score-grav.hh \ + include/engraver-group.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/score-elem-info.hh \ + ../flower/include/scalar.hh include/engraver.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh include/staff-info.hh \ + include/translator.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/translator-group.hh \ + include/global-translator.hh ../flower/include/pqueue.hh \ + include/p-score.hh include/music-output.hh \ + include/musical-request.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/score-column.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/command-request.hh include/paper-def.hh \ + include/music-output-def.hh +score-performer.o: score-performer.cc include/score-performer.hh \ + include/performer-group-performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/performer.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/translator-group.hh include/global-translator.hh \ + ../flower/include/pqueue.hh include/midi-def.hh \ + include/music-output-def.hh include/audio-column.hh \ + include/audio-item.hh include/audio-element.hh \ + include/performance.hh include/music-output.hh \ + include/midi-stream.hh ../flower/include/string-convert.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/score.hh \ + ../lib/include/source-file.hh ../lib/include/source.hh \ + include/audio-staff.hh +score-priority-grav.o: score-priority-grav.cc \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh include/score-priority-grav.hh \ + include/engraver.hh include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/assoc-iter.hh include/break-align-item.hh \ + include/horizontal-align-item.hh +score.o: score.cc include/score.hh ../flower/include/varray.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/input.hh \ + ../flower/include/parray.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/music-output-def.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/music-output.hh ../lib/include/source.hh \ + ../lib/include/source-file.hh include/music-iterator.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/global-translator.hh \ + include/translator-group.hh include/translator.hh \ + ../flower/include/scalar.hh ../flower/include/pqueue.hh \ + include/header.hh ../flower/include/cpu-timer.hh \ + include/main.hh include/paper-def.hh +scoreline.o: scoreline.cc include/scoreline.hh include/colhpos.hh \ + ../flower/include/varray.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/spanner.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/dimen.hh \ + include/atom.hh include/boxes.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music-output-def.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/p-score.hh include/music-output.hh +scores.o: scores.cc include/main.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/score.hh \ + ../flower/include/varray.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/input.hh \ + ../flower/include/parray.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/interval.hh include/music-output-def.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/header.hh include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +script-column.o: script-column.cc include/script-column.hh \ + include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/item.hh \ + include/boxes.hh include/drul-array.hh include/direction.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/script.hh include/staff-side.hh \ + include/note-head.hh include/rhythmic-head.hh include/stem.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/molecule.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/general-script-def.hh \ + ../lib/include/input.hh +script-def.o: script-def.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/script-def.hh \ + include/general-script-def.hh ../lib/include/input.hh \ + ../flower/include/virtual-methods.hh include/direction.hh \ + include/atom.hh include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/varray.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh ../flower/include/scalar.hh +script-grav.o: script-grav.cc include/script-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/script.hh \ + include/staff-side.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/musical-request.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/stem.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/staff-sym.hh include/spanner.hh include/rod.hh \ + include/general-script-def.hh +script.o: script.cc include/script-def.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/general-script-def.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../lib/include/input.hh \ + ../flower/include/virtual-methods.hh include/direction.hh \ + include/musical-request.hh include/request.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/paper-def.hh \ + ../flower/include/varray.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/script.hh include/staff-side.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/stem.hh include/molecule.hh include/lookup.hh \ + include/atom.hh ../flower/include/scalar.hh +separating-group-spanner.o: separating-group-spanner.cc \ + include/separating-group-spanner.hh \ + include/vertical-group-spanner.hh include/axis-group-spanner.hh \ + include/spanner.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh \ + include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/vertical-group-elem.hh \ + include/single-malt-grouping-item.hh include/item.hh \ + include/boxes.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc +separating-line-group-grav.o: separating-line-group-grav.cc \ + include/separating-line-group-grav.hh \ + include/line-group-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/separating-group-spanner.hh \ + include/vertical-group-spanner.hh include/axis-group-spanner.hh \ + include/spanner.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/drul-array.hh include/rod.hh \ + include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/vertical-group-elem.hh \ + include/single-malt-grouping-item.hh include/item.hh \ + include/boxes.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc +single-malt-grouping-item.o: single-malt-grouping-item.cc \ + include/single-malt-grouping-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/rod.hh include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +slur-grav.o: slur-grav.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/musical-request.hh \ + include/lily-proto.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/slur-grav.hh include/engraver.hh \ + ../flower/include/varray.hh include/score-elem-info.hh \ + ../flower/include/scalar.hh include/staff-info.hh \ + include/translator.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/parray.hh \ + include/slur.hh include/directional-spanner.hh \ + include/spanner.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/drul-array.hh include/rod.hh include/bow.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/note-column.hh include/item.hh \ + include/boxes.hh include/script-column.hh \ + include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh +slur.o: slur.cc include/slur.hh include/directional-spanner.hh \ + include/spanner.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/bow.hh \ + ../flower/include/scalar.hh include/lookup.hh include/atom.hh \ + include/boxes.hh include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/note-column.hh include/item.hh include/script-column.hh \ + include/horizontal-vertical-group-item.hh \ + include/axis-group-item.hh include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/stem.hh include/molecule.hh include/p-col.hh \ + include/horizontal-group-item.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +span-bar-grav.o: span-bar-grav.cc include/span-bar.hh include/bar.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/span-bar-grav.hh \ + include/engraver.hh include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/vertical-align-spanner.hh include/spanner.hh \ + include/rod.hh include/vertical-align-elem.hh +span-bar.o: span-bar.cc include/dimen.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/span-bar.hh include/bar.hh include/item.hh \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/lookup.hh include/atom.hh \ + ../flower/include/scalar.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music-output-def.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/molecule.hh \ + include/vertical-align-elem.hh +span-score-bar-grav.o: span-score-bar-grav.cc include/span-score-bar.hh \ + include/span-bar.hh include/bar.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/score-bar.hh \ + include/span-score-bar-grav.hh include/span-bar-grav.hh \ + include/engraver.hh include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh +span-score-bar.o: span-score-bar.cc include/span-score-bar.hh \ + include/span-bar.hh include/bar.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/score-bar.hh include/atom.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh ../flower/include/scalar.hh +spanner.o: spanner.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/spanner.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/p-score.hh \ + include/colhpos.hh include/music-output.hh include/outputter.hh spring-spacer.o: spring-spacer.cc include/spring-spacer.hh \ include/line-spacer.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ @@ -479,6 +3700,957 @@ 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 \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/staff-info.hh \ + include/lily-proto.hh include/score-column.hh \ + ../flower/include/varray.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh include/rod.hh +staff-performer.o: staff-performer.cc include/staff-performer.hh \ + include/performer-group-performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/performer.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/translator-group.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/audio-column.hh include/audio-item.hh \ + include/audio-element.hh include/audio-staff.hh +staff-side.o: staff-side.cc ../flower/include/interval.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/compare.hh include/paper-def.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/varray.hh include/music-output-def.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/dimen.hh \ + include/staff-side.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/direction.hh include/staff-sym.hh include/spanner.hh \ + include/drul-array.hh include/rod.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +staff-sym-grav.o: staff-sym-grav.cc include/staff-sym-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/staff-sym.hh \ + include/spanner.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/drul-array.hh include/rod.hh include/score.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/p-col.hh include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh +staff-sym.o: staff-sym.cc include/staff-sym.hh include/spanner.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/lookup.hh \ + include/atom.hh include/boxes.hh ../flower/include/scalar.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/molecule.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/dimen.hh +stem-grav.o: stem-grav.cc include/stem-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/note-head.hh \ + include/rhythmic-head.hh include/item.hh include/boxes.hh \ + include/offset.hh include/axes.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/stem.hh include/molecule.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/musical-request.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + ../lib/include/duration-convert.hh include/misc.hh \ + include/grouping.hh include/abbrev.hh +stem-info.o: stem-info.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/dimen.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/misc.hh include/lily-proto.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/scalar.hh \ + include/grouping.hh include/minterval.hh \ + ../flower/include/interval.hh ../flower/include/varray.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/atom.hh include/boxes.hh \ + include/offset.hh include/axes.hh include/stem.hh \ + include/item.hh include/score-elem.hh \ + ../flower/include/parray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/direction.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/paper-def.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/lookup.hh include/stem-info.hh +stem.o: stem.cc include/stem.hh include/item.hh include/boxes.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/dimen.hh include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/note-head.hh \ + include/rhythmic-head.hh include/lookup.hh include/atom.hh \ + ../flower/include/scalar.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/rod.hh include/misc.hh include/grouping.hh \ + include/minterval.hh include/beam.hh \ + include/directional-spanner.hh include/spanner.hh \ + include/rest.hh +super-elem.o: super-elem.cc include/super-elem.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh include/scoreline.hh \ + include/colhpos.hh include/spanner.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/p-score.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/music-output.hh include/outputter.hh +swallow-grav.o: swallow-grav.cc include/swallow-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh +swallow-perf.o: swallow-perf.cc include/swallow-perf.hh \ + include/performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh +symtable.o: symtable.cc include/misc.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/grouping.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/varray.hh include/dimen.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/atom.hh include/boxes.hh include/offset.hh \ + include/axes.hh ../flower/include/assoc.hh \ + ../flower/include/assoc-iter.hh include/symtable.hh \ + ../flower/include/dictionary.hh +template1.o: template1.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/idealspacing.hh include/lily-proto.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/musical-request.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/spanner.hh ../flower/include/pcursor.tcc \ + ../flower/include/plist.tcc +template2.o: template2.cc include/line-spacer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + ../flower/include/vector.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../flower/include/pcursor.tcc \ + ../flower/include/pcursor.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/plist.tcc +template3.o: template3.cc include/atom.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/direction.hh ../flower/include/pcursor.tcc \ + ../flower/include/plist.tcc +template4.o: template4.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/pcursor.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/spanner.hh \ + include/lily-proto.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/audio-column.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/audio-item.hh include/audio-element.hh \ + include/audio-staff.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/p-score.hh \ + include/colhpos.hh include/music-output.hh \ + ../flower/include/cursor.tcc ../flower/include/list.tcc \ + ../flower/include/pcursor.tcc ../flower/include/plist.tcc +template5.o: template5.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/interval.tcc ../flower/include/interval.hh \ + ../flower/include/flower-debug.hh ../flower/include/dstream.hh +template6.o: template6.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/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/iterate.hh ../flower/include/plist.icc \ + include/translator.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/lily-proto.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + ../flower/include/parray.hh ../lib/include/input.hh +template7.o: template7.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/pcursor.tcc \ + ../flower/include/plist.tcc include/music-list.hh \ + include/music.hh ../flower/include/virtual-methods.hh \ + ../lib/include/input.hh include/minterval.hh \ + ../flower/include/interval.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/music-iterator.hh \ + ../flower/include/varray.hh +template8.o: template8.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/audio-item.hh \ + include/lily-proto.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/audio-element.hh \ + ../flower/include/virtual-methods.hh include/audio-column.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/midi-item.hh ../flower/include/pcursor.tcc \ + ../flower/include/plist.tcc +tex-beam.o: tex-beam.cc include/atom.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/direction.hh include/tex.hh ../flower/include/scalar.hh \ + include/symtable.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + include/dimen.hh include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/lookup.hh include/misc.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/grouping.hh include/minterval.hh include/paper-def.hh \ + include/music-output-def.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/string-convert.hh include/main.hh +tex-slur.o: tex-slur.cc include/main.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/misc.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/grouping.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/varray.hh include/lookup.hh include/atom.hh \ + include/boxes.hh include/offset.hh include/axes.hh \ + include/direction.hh include/molecule.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/dimen.hh include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/paper-def.hh \ + include/music-output-def.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/string-convert.hh +tex-stream.o: tex-stream.cc include/tex.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh ../flower/include/scalar.hh \ + include/main.hh include/lily-proto.hh ../lib/include/proto.hh \ + include/tex-stream.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +tex.o: tex.cc include/dimen.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/tex.hh include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh ../flower/include/scalar.hh \ + include/atom.hh include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/varray.hh +text-def.o: text-def.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../lib/include/warn.hh include/lookup.hh include/atom.hh \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh ../flower/include/scalar.hh \ + include/direction.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/varray.hh include/music-output-def.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/molecule.hh \ + include/text-def.hh include/general-script-def.hh \ + ../lib/include/input.hh include/dimen.hh +text-item.o: text-item.cc include/musical-request.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/paper-def.hh ../flower/include/varray.hh \ + include/music-output-def.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/text-item.hh \ + include/text-def.hh include/general-script-def.hh \ + include/item.hh include/boxes.hh include/offset.hh \ + include/axes.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/staff-side.hh include/stem.hh include/molecule.hh \ + include/lookup.hh include/atom.hh ../flower/include/scalar.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +text-spanner.o: text-spanner.cc include/molecule.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/boxes.hh \ + ../flower/include/interval.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/direction.hh \ + include/text-spanner.hh include/directional-spanner.hh \ + include/spanner.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/drul-array.hh \ + include/rod.hh include/text-def.hh \ + include/general-script-def.hh ../lib/include/input.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/atom.hh +tie-grav.o: tie-grav.cc include/tie-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/tie.hh include/bow.hh \ + include/directional-spanner.hh include/spanner.hh \ + include/score-elem.hh ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/drul-array.hh include/rod.hh include/note-head.hh \ + include/rhythmic-head.hh include/item.hh include/boxes.hh \ + include/musical-request.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/music-list.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc +tie.o: tie.cc include/paper-def.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/varray.hh ../flower/include/interval.hh \ + include/music-output-def.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/tie.hh include/bow.hh \ + include/directional-spanner.hh include/spanner.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/drul-array.hh include/direction.hh include/rod.hh \ + include/note-head.hh include/rhythmic-head.hh include/item.hh \ + include/boxes.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +time-description.o: time-description.cc include/time-description.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/varray.hh include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/warn.hh +timing-grav.o: timing-grav.cc include/score-grav.hh \ + include/engraver-group.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/engraver.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/translator-group.hh include/global-translator.hh \ + ../flower/include/pqueue.hh include/timing-grav.hh \ + include/timing-translator.hh include/time-description.hh \ + include/grouping.hh include/command-request.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh +timing-translator.o: timing-translator.cc include/timing-translator.hh \ + include/translator.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + include/time-description.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/grouping.hh \ + include/minterval.hh ../flower/include/interval.hh \ + include/command-request.hh include/request.hh include/music.hh \ + include/direction.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/translator-group.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/global-translator.hh ../flower/include/pqueue.hh +translation-property.o: translation-property.cc \ + include/translation-property.hh include/music.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/minterval.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/scalar.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +translator-ctors.o: translator-ctors.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/translator.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/lily-proto.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +translator-group.o: translator-group.cc include/music-output-def.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + include/translator-group.hh include/translator.hh \ + ../flower/include/scalar.hh ../flower/include/parray.hh \ + ../lib/include/input.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + ../flower/include/rational.hh +translator.o: translator.cc include/translator.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/translator-group.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary-iter.hh \ + ../flower/include/assoc-iter.hh ../flower/include/rational.hh +type-swallow-trans.o: type-swallow-trans.cc \ + include/type-swallow-trans.hh include/translator.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + include/musical-request.hh include/request.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh +version.o: version.cc include/main.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh +vertical-align-elem.o: vertical-align-elem.cc \ + include/vertical-align-elem.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh +vertical-align-grav.o: vertical-align-grav.cc include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/rod.hh \ + include/vertical-align-grav.hh include/engraver.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/vertical-align-spanner.hh include/spanner.hh \ + include/vertical-align-elem.hh include/vertical-group-elem.hh +vertical-align-spanner.o: vertical-align-spanner.cc \ + include/vertical-align-spanner.hh include/spanner.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh \ + include/vertical-align-elem.hh +vertical-group-elem.o: vertical-group-elem.cc \ + include/vertical-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/item.hh \ + include/boxes.hh include/drul-array.hh include/direction.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh +vertical-group-spanner.o: vertical-group-spanner.cc \ + include/vertical-group-spanner.hh include/axis-group-spanner.hh \ + include/spanner.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh \ + include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/vertical-group-elem.hh include/item.hh include/boxes.hh \ + include/p-col.hh include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc +voice-iterator.o: voice-iterator.cc include/translator-group.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/virtual-methods.hh include/translator.hh \ + ../flower/include/scalar.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh ../flower/include/varray.hh \ + ../flower/include/parray.hh ../lib/include/input.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/voice-iterator.hh \ + include/music-iterator.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-list.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh +warn.o: warn.cc ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/lily-proto.hh \ + ../lib/include/warn.hh include/my-lily-lexer.hh \ + ../flower/include/varray.hh include/includable-lexer.hh \ + ../lib/include/duration.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/plet.hh \ + include/time-description.hh ../lib/include/source-file.hh \ + ../lib/include/source.hh include/main.hh \ + ../lib/include/input.hh +word-wrap.o: word-wrap.cc include/word-wrap.hh include/break.hh \ + ../flower/include/varray.hh ../flower/include/interval.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/compare.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/colhpos.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/arithmetic-operator.hh \ + include/music-output-def.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh \ + ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/p-score.hh \ + ../flower/include/parray.hh include/music-output.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh include/rod.hh include/spring-spacer.hh \ + include/line-spacer.hh ../flower/include/vector.hh \ + include/col-info.hh ../flower/include/pointer.hh info: info-recursive dvi: dvi-recursive diff --git a/lily/axis-group-item.cc b/lily/axis-group-item.cc index 8419f85ad5..5362516f02 100644 --- a/lily/axis-group-item.cc +++ b/lily/axis-group-item.cc @@ -24,7 +24,7 @@ Axis_group_item::OK() const void Axis_group_item::do_breakable_col_processing() { - if (!breakable_b_) + if (!breakable_b_ || !column_l ()->breakable_b_) // ugh should merge with Item code return; OK(); diff --git a/lily/dynamic-grav.cc b/lily/dynamic-grav.cc index 3952390042..44580b64ba 100644 --- a/lily/dynamic-grav.cc +++ b/lily/dynamic-grav.cc @@ -44,7 +44,13 @@ Dynamic_engraver::do_try_request (Request * r) if (cresc_p_ && d->span_dynamic () && d->span_dynamic ()->spantype == Span_req::START) return false; - + if (d->absdynamic ()) + { + for (int i=0; i < dynamic_req_l_arr_.size (); i++) + if (d->equal_b (dynamic_req_l_arr_[i])) + return true; + } + dynamic_req_l_arr_.push (m->dynamic()); return true; } @@ -161,9 +167,12 @@ Dynamic_engraver::acknowledge_element (Score_elem_info i) { if (i.elem_l_->is_type_b (Note_column::static_name ())) { - if (dynamic_p_) dynamic_p_->add_support (i.elem_l_); + if (dynamic_p_) + dynamic_p_->add_support (i.elem_l_); + if (to_end_cresc_p_) to_end_cresc_p_->add_support (i.elem_l_); + if (cresc_p_) cresc_p_->add_support (i.elem_l_); } diff --git a/lily/graphical-element.cc b/lily/graphical-element.cc index b5c1046846..79c298928b 100644 --- a/lily/graphical-element.cc +++ b/lily/graphical-element.cc @@ -10,6 +10,12 @@ #include "axis-group-element.hh" #include "debug.hh" +bool +Graphical_element::empty_b () const +{ + return empty_b_; +} + Graphical_element::Graphical_element () { init (); diff --git a/lib/includable-lexer.cc b/lily/includable-lexer.cc index 3728476203..3728476203 100644 --- a/lib/includable-lexer.cc +++ b/lily/includable-lexer.cc diff --git a/lily/include/Makefile.am b/lily/include/Makefile.am index 2bf88e7bca..d63384fc77 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 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 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 @@ -14,4 +14,4 @@ all: Makefile $(HEADERS) wild-check wild-check: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/lily/include/Makefile.in b/lily/include/Makefile.in index 6468eb1628..aa34b176c9 100644 --- a/lily/include/Makefile.in +++ b/lily/include/Makefile.in @@ -100,7 +100,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 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 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 diff --git a/lily/include/graphical-element.hh b/lily/include/graphical-element.hh index f5057a0c63..aff7de6793 100644 --- a/lily/include/graphical-element.hh +++ b/lily/include/graphical-element.hh @@ -29,6 +29,8 @@ class Graphical_element public: void set_empty (bool); + bool empty_b () const; + DECLARE_MY_RUNTIME_TYPEINFO; /** This is needed, because #output# may still be diff --git a/lib/include/includable-lexer.hh b/lily/include/includable-lexer.hh index f9dce9696d..f9dce9696d 100644 --- a/lib/include/includable-lexer.hh +++ b/lily/include/includable-lexer.hh diff --git a/lily/include/key.hh b/lily/include/key.hh index 4a68fa8148..da03799193 100644 --- a/lily/include/key.hh +++ b/lily/include/key.hh @@ -14,26 +14,29 @@ class Octave_key { public: - Array<int> accidental_i_arr_; - - Octave_key(); - void set (int i, int acc); - int acc (int i) const { return accidental_i_arr_[i]; } + Array<int> accidental_i_arr_; + void clear (); + Octave_key(); + void set (int i, int acc); + int acc (int i) const { return accidental_i_arr_[i]; } + void print () const; }; /// administration of accidentals class Key { - /** for each octave a key. Has to be private since octave 0 isn't member 0. - */ - Array<Octave_key> octaves; + /** for each octave a key. Has to be private since octave 0 isn't member 0. + */ + Array<Octave_key> octaves; public: - bool multi_octave_b_; - - Octave_key&oct (int); - void set (int name, int acc); - void set (int oct, int name, int acc); - Key(); + bool multi_octave_b_; + + void clear (); + Octave_key&oct (int); + void set (int name, int acc); + void set (int oct, int name, int acc); + Key(); + void print () const; }; #endif // KEY_HH diff --git a/lily/include/main.hh b/lily/include/main.hh index 5ca8f5ad8c..c966f37591 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -21,6 +21,7 @@ String get_version_number_str(); void call_constructors (); extern Sources* source_global_l; extern bool no_paper_global_b; +extern bool no_timestamps_global_b; extern int exit_status_i_; extern bool experimental_features_global_b; extern bool postscript_global_b; diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index ff5303d5f6..cd822d1ac2 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -245,6 +245,7 @@ public: class Absolute_dynamic_req : public Dynamic_req { public: Loudness loudness_; + virtual bool do_equal_b (Request*) const; String loudness_str () const; Absolute_dynamic_req(); REQUESTMETHODS(Absolute_dynamic_req, absdynamic); diff --git a/lily/include/staff-side.hh b/lily/include/staff-side.hh index 1720722284..226c70411c 100644 --- a/lily/include/staff-side.hh +++ b/lily/include/staff-side.hh @@ -27,9 +27,6 @@ public: Direction dir_; Interval sym_int_; - /// follow the support inside the staff? - bool inside_staff_b_; - Real y_; diff --git a/lily/item.cc b/lily/item.cc index 11d4568635..8b2297ce5c 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -77,6 +77,9 @@ Item::do_breakable_col_processing() if (!breakable_b_) return; + if (!column_l ()->breakable_b_) + return; + copy_breakable_items(); handle_prebroken_dependencies(); @@ -85,7 +88,6 @@ Item::do_breakable_col_processing() */ add_dependency (broken_to_drul_[LEFT]); add_dependency (broken_to_drul_[RIGHT]); - } Item* diff --git a/lily/key-grav.cc b/lily/key-grav.cc index 42359ae77a..60c2f2dbce 100644 --- a/lily/key-grav.cc +++ b/lily/key-grav.cc @@ -29,16 +29,16 @@ Key_engraver::create_key() { if (!kit_p_) { - int c0_i=0; + int c0_i=0; - Staff_info inf = get_staff_info(); - if (inf.c0_position_i_l_) - c0_i = *get_staff_info().c0_position_i_l_; + Staff_info inf = get_staff_info(); + if (inf.c0_position_i_l_) + c0_i = *get_staff_info().c0_position_i_l_; - kit_p_ = new Key_item (c0_i); - kit_p_->break_priority_i_ = -1; // ugh - announce_element (Score_elem_info (kit_p_,keyreq_l_)); - kit_p_->read (*this); + kit_p_ = new Key_item (c0_i); + kit_p_->break_priority_i_ = -1; // ugh + announce_element (Score_elem_info (kit_p_,keyreq_l_)); + kit_p_->read (*this); } } @@ -47,10 +47,10 @@ Key_engraver::do_try_request (Request * req_l) { Command_req* creq_l= req_l->command(); if (!creq_l|| !creq_l->keychange()) - return false; + return false; if (keyreq_l_) - return false; // TODO + return false; // TODO keyreq_l_ = creq_l->keychange(); read_req (keyreq_l_); return true; @@ -62,13 +62,13 @@ Key_engraver::acknowledge_element (Score_elem_info info) Command_req * r_l = info.req_l_->command() ; if (r_l && r_l->clefchange()) { - create_key(); + create_key(); } else if (info.elem_l_->is_type_b (Bar::static_name ())) { - if (!keyreq_l_) - default_key_b_ = true; - create_key(); + if (!keyreq_l_) + default_key_b_ = true; + create_key(); } } @@ -78,11 +78,11 @@ Key_engraver::do_process_requests() { if (key_.multi_octave_b_) { - assert (false); // TODO . + assert (false); // TODO . } else if (keyreq_l_) { - create_key(); + create_key(); } } @@ -91,9 +91,9 @@ Key_engraver::do_pre_move_processing() { if (kit_p_) { - kit_p_->default_b_ = default_key_b_; - typeset_element (kit_p_); - kit_p_ = 0; + kit_p_->default_b_ = default_key_b_; + typeset_element (kit_p_); + kit_p_ = 0; } } @@ -102,19 +102,21 @@ Key_engraver::do_pre_move_processing() void Key_engraver::read_req (Key_change_req * r) { + key_.clear (); key_.multi_octave_b_ = r->multi_octave_b_; accidental_idx_arr_.clear(); + for (int i = 0; i < r->melodic_p_arr_.size(); i ++) { - Melodic_req * m_l =r->melodic_p_arr_[i]; - int n_i =m_l->notename_i_; - int a_i = m_l->accidental_i_; - int o_i = m_l->octave_i_; - if (r->multi_octave_b_) - key_.set (o_i, n_i, a_i); - else - key_.set (n_i, a_i); - accidental_idx_arr_.push (n_i); + Melodic_req * m_l =r->melodic_p_arr_[i]; + int n_i =m_l->notename_i_; + int a_i = m_l->accidental_i_; + int o_i = m_l->octave_i_; + if (r->multi_octave_b_) + key_.set (o_i, n_i, a_i); + else + key_.set (n_i, a_i); + accidental_idx_arr_.push (n_i); } } diff --git a/lily/key.cc b/lily/key.cc index 1a7892d4b1..56a6278cfa 100644 --- a/lily/key.cc +++ b/lily/key.cc @@ -10,15 +10,32 @@ */ #include "key.hh" +#include "debug.hh" const int OCTAVES=14; // ugh.. const int ZEROOCTAVE=7; + +void +Octave_key::print () const +{ + for (int i= 0; i < 7 ; i++) + DOUT << "note " << i << " acc: " << accidental_i_arr_[i] << "\n"; +} + + + Octave_key::Octave_key() { accidental_i_arr_.set_size (7); + clear (); +} + +void +Octave_key::clear () +{ for (int i= 0; i < 7 ; i++) - accidental_i_arr_[i] = 0; + accidental_i_arr_[i] = 0; } Key::Key() @@ -51,5 +68,21 @@ void Key::set (int n, int a) { for (int i= 0; i < OCTAVES ; i++) - octaves[i].set (n,a); + octaves[i].set (n,a); +} +void +Key::clear () +{ + for (int i= 0; i < OCTAVES ; i++) + octaves[i].clear (); +} +void +Key::print () const +{ + for (int i= 0; i < OCTAVES ; i++) + { + DOUT << "octave " << i - ZEROOCTAVE << " Octave_key { "; + octaves[i].print (); + DOUT << "}\n"; + } } diff --git a/lily/local-key-grav.cc b/lily/local-key-grav.cc index 432e4f20b0..f136737f90 100644 --- a/lily/local-key-grav.cc +++ b/lily/local-key-grav.cc @@ -33,7 +33,10 @@ Local_key_engraver::do_creation_processing () warning ("Out of tune! Can't find key engraver"); } else - key_C_ = &((Key_engraver*)result->engraver_l ())->key_; + { + key_C_ = &((Key_engraver*)result->engraver_l ())->key_; + local_key_ = *key_C_; + } } void diff --git a/lily/main.cc b/lily/main.cc index 66ae3e649c..dc66e42aa2 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -24,6 +24,7 @@ static bool version_ignore_b = false; Sources* source_global_l = 0; bool no_paper_global_b = false; +bool no_timestamps_global_b = false; bool experimental_features_global_b = false; bool postscript_global_b = true; @@ -41,6 +42,7 @@ Long_option_init theopts[] = { {1, "include", 'I'}, {0, "no-paper", 'M'}, {0, "no-postscript", 'P'}, + {0, "no-timestamps", 'T'}, {0, "ignore-version", 'V'}, {0,0,0} }; @@ -63,6 +65,7 @@ usage () " -M, --no-paper produce midi output only\n" " -V, --ignore-version ignore mudela version\n" " -P, --no-postscript don't use PostScript\n" + " -T, --no-timestamps don't timestamp the output\n" "\n" "GNU LilyPond was compiled with the following settings:\n") #ifdef NDEBUG @@ -217,6 +220,9 @@ main (int argc, char **argv) case 'M': no_paper_global_b = true; break; + case 'T': + no_timestamps_global_b = true; + break; default: assert (false); break; diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 36ba0668b9..05f0be08a1 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -56,9 +56,12 @@ Midi_chunk::str () const { String str = header_str_; String dat = data_str (); +#if 1 + String length_str = String_convert::i2hex_str (dat.length_i () +#else // huh, huh?? -// String length_str = String_convert::i2hex_str (dat.length_i () String length_str = String_convert::i2hex_str (data_str_.length_i () +#endif + footer_str_.length_i (), 8, '0'); length_str = String_convert::hex2bin_str (length_str); str += length_str; diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index efc244c5de..a9abaa677b 100644 --- a/lily/midi-stream.cc +++ b/lily/midi-stream.cc @@ -1,12 +1,11 @@ // -// midistream.cc +// midi-stream.cc // // source file of the GNU LilyPond music typesetter // // (c) 1997 Jan Nieuwenhuizen <jan@digicash.com> #include <fstream.h> -#include <time.h> #include "string.hh" #include "string-convert.hh" #include "main.hh" diff --git a/lily/musical-request.cc b/lily/musical-request.cc index c84b92ee0f..a4e1146844 100644 --- a/lily/musical-request.cc +++ b/lily/musical-request.cc @@ -438,6 +438,14 @@ Absolute_dynamic_req::do_print() const #endif } + +bool +Absolute_dynamic_req::do_equal_b (Request *r) const +{ + Absolute_dynamic_req *a = r->musical ()->dynamic ()->absdynamic (); + return loudness_ == a->loudness_; +} + String Dynamic_req::loudness_static_str (Loudness l) { diff --git a/lily/performance.cc b/lily/performance.cc index aaf926965f..8a6d3c7987 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -1,5 +1,5 @@ /* - audio-score.cc -- implement Performance + performance.cc -- implement Performance source file of the GNU LilyPond music typesetter @@ -49,18 +49,26 @@ Performance::output_header_track (Midi_stream& midi_stream_r) { Midi_track midi_track; - time_t t = time (0); - // perhaps multiple text events? - String str = String (_("Creator: ")) + get_version_str() + "\n"; + String str = String (_("Creator: ")); + if (no_timestamps_global_b) + str += "GNU LilyPond\n"; + else + str += get_version_str() + "\n"; Midi_text creator (Midi_text::TEXT, str); midi_track.add (Moment (0), &creator); - str = _("Automatically generated at "); - str += ctime (&t); - str = str.left_str (str.length_i() - 1); - str += "\n"; + str = _("Automatically generated"); + if (no_timestamps_global_b) + str += ".\n"; + else + { + str += _(", at "); + time_t t (time (0)); + str += ctime (&t); + str = str.left_str (str.length_i() - 1); + } Midi_text generate (Midi_text::TEXT, str); midi_track.add (Moment (0), &generate); diff --git a/lily/rod.cc b/lily/rod.cc index f624d01253..8face4fd45 100644 --- a/lily/rod.cc +++ b/lily/rod.cc @@ -15,7 +15,13 @@ Rod::Rod (Single_malt_grouping_item *l, Single_malt_grouping_item *r) { item_l_drul_[LEFT] =l; item_l_drul_[RIGHT]=r; - distance_f_ = l->my_width () [RIGHT] + r->my_width ()[LEFT]; + + Interval li (l->my_width ()); + Interval ri (r->my_width ()); + if (li.empty_b () || ri.empty_b ()) + distance_f_ = 0; + else + distance_f_ = li[RIGHT] + ri[LEFT]; } Rod::Rod () diff --git a/lily/score-priority-grav.cc b/lily/score-priority-grav.cc index 1358ec4232..9e2e2cc918 100644 --- a/lily/score-priority-grav.cc +++ b/lily/score-priority-grav.cc @@ -36,42 +36,40 @@ void Score_priority_engraver::acknowledge_element (Score_elem_info inf) { Item * item_l = inf.elem_l_->item (); - if (item_l && item_l->breakable_b_) + if (item_l && item_l->breakable_b_ && !item_l->empty_b ()) { /* Don't try to eat up our (probable) parent. - */ + */ if (inf.origin_grav_l_arr_.size () <= 1 && item_l->is_type_b (Break_align_item::static_name ())) return; - int p =item_l-> break_priority_i_; + int priority =item_l->break_priority_i_; Horizontal_group_item * hg =0; - if (!align_p_assoc_.elt_b(p)) - { - hg = new Horizontal_group_item; - announce_element (Score_elem_info (hg,0)); - align_p_assoc_[p] = hg; - hg->break_priority_i_ = p; - hg->breakable_b_ = true; - } + if (!align_p_assoc_.elt_b(priority)) + { + hg = new Horizontal_group_item; + announce_element (Score_elem_info (hg,0)); + align_p_assoc_[priority] = hg; + hg->break_priority_i_ = priority; + hg->breakable_b_ = true; + } else - hg = align_p_assoc_[p]; + hg = align_p_assoc_[priority]; Score_elem * unbound_elem = inf.elem_l_; - while (unbound_elem->axis_group_l_a_[X_AXIS]) { /* We might have added inf.elem_l_ earlier because we added one of its children. We don't want to add ourselves to ourself - */ + */ if (unbound_elem->axis_group_l_a_[X_AXIS] == hg) return; unbound_elem = unbound_elem->axis_group_l_a_[X_AXIS]; } - hg->add_element (unbound_elem); } diff --git a/lily/script-column.cc b/lily/script-column.cc index 6f9359aef7..47a508e2c2 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -11,7 +11,7 @@ #include "script.hh" #include "note-head.hh" #include "stem.hh" - +#include "general-script-def.hh" IMPLEMENT_IS_TYPE_B1(Script_column,Horizontal_vertical_group_item); @@ -53,7 +53,8 @@ Script_column::do_pre_processing() for (int i=0; i < script_l_arr_.size(); i++) { Script*s_l = script_l_arr_[i]; - placed_l_arr_a[idx (s_l->inside_staff_b_ , s_l->dir_) ].push (s_l); + placed_l_arr_a[idx (s_l->specs_l_->inside_b(), + s_l->dir_) ].push (s_l); } for (int j =0; j <4; j++) diff --git a/lily/script.cc b/lily/script.cc index f5333cea46..4e57c3ddf5 100644 --- a/lily/script.cc +++ b/lily/script.cc @@ -42,7 +42,6 @@ Script::set_stem (Stem*st_l) Script::Script() { specs_l_ = 0; - inside_staff_b_ = false; stem_l_ = 0; dir_ = CENTER; } diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 42ec3ee92c..3361dadc55 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -9,31 +9,36 @@ #include "separating-group-spanner.hh" #include "single-malt-grouping-item.hh" +#include "p-col.hh" Array<Rod> Separating_group_spanner::get_rods () const { Array<Rod> a; - + for (int i=0; i < spacing_unit_l_arr_.size () -1; i++) { a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1])); - bool lb =spacing_unit_l_arr_[i]->breakable_b_; + bool lb =spacing_unit_l_arr_[i]->column_l ()->breakable_b_; if (lb) { - a.push (Rod ((Single_malt_grouping_item*) spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT), + a.push (Rod ((Single_malt_grouping_item*) + spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT), spacing_unit_l_arr_[i+1])); } - bool rb=spacing_unit_l_arr_[i+1]->breakable_b_; + bool rb=spacing_unit_l_arr_[i+1]->column_l ()->breakable_b_; if (rb) { a.push (Rod (spacing_unit_l_arr_[i], - (Single_malt_grouping_item*) spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT))); + (Single_malt_grouping_item*) + spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT))); } if (lb && rb) { - a.push (Rod ((Single_malt_grouping_item*)spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT), - (Single_malt_grouping_item*) spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT))); + a.push (Rod ((Single_malt_grouping_item*) + spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT), + (Single_malt_grouping_item*) + spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT))); } } diff --git a/lily/single-malt-grouping-item.cc b/lily/single-malt-grouping-item.cc index a0b476988a..e9fe0a7398 100644 --- a/lily/single-malt-grouping-item.cc +++ b/lily/single-malt-grouping-item.cc @@ -36,7 +36,7 @@ Single_malt_grouping_item::my_width () const assert (pc == il->column_l ()); w.unite (il->width () + il->relative_coordinate (pc, X_AXIS)); } - + return w; // add this->offset_ ? this-> relative_coordinate ()? } diff --git a/lily/slur.cc b/lily/slur.cc index f8142f23ee..e1a8cf926b 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -143,33 +143,34 @@ Slur::height_f () const Real nh_f = interline_f / 2; Real h = 0; Real dx = width ().length (); - Real dy = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]; +// 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; + Real centre = (width ().min () + width ().max ()) / 2 + lx; Real ly = stem->dir_ == dir_ ? stem->stem_end_f () : stem->stem_begin_f () - + dir_ * nh_f / 2; + + dir_ * 0.5; + ly *= nh_f; for (int i = 0; i < encompass_arr_.size (); i++) { - Stem* stem = encompass_arr_[i]->stem_l_; - Real sx = abs (centre - stem->hpos_f ()); - Real sy = stem->dir_ == dir_ ? stem->stem_end_f () - : stem->stem_begin_f () + dir_ * nh_f / 2; - sy = dir_ * (sy - (ly + ((stem->hpos_f () - lx) / dx) * dy)); + 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) - h = h >? sy * (1 + 2 * sx / dx); + if (sy > 0.5 * nh_f) + h = h >? (sy * (1 + 2 * sx / dx))*(1 + abs (dy)/32); } - Real ratio = 1.0/3; // duh - /* - correct h for slur ratio - */ - Real staffheight = paper ()->get_var ("barsize"); - if (h) - h *= ((h * interline_f) / dx ) / ratio; + if ( h < nh_f ) + return 0; + h *= h/(dx*dx*dx); +// h *= 32; +// h *= h; + h *= 40000; return h; } diff --git a/lily/staff-side.cc b/lily/staff-side.cc index 35af4fff2d..b380e1feb8 100644 --- a/lily/staff-side.cc +++ b/lily/staff-side.cc @@ -19,7 +19,6 @@ Staff_side::Staff_side() y_=0; sym_int_ = Interval (0,0); dir_ = CENTER; - inside_staff_b_ = false; } @@ -68,12 +67,7 @@ Staff_side::get_position_f () const Real inter_f = paper()-> internote_f (); Interval v= support_height(); - if (inside_staff_b_) - // ugh: i don't know why, but this is needed for inside-staff - y = v[dir_] + 2 * dir_ * inter_f; // ugh - else - // get accents just above staff; (fermata etc.: ugh) - y = v[dir_] - 3 * dir_ * inter_f; + y = v[dir_] + 1 * dir_ * inter_f; // ugh return y; } diff --git a/lily/tex-stream.cc b/lily/tex-stream.cc index d861e6ecde..ed8ef91a53 100644 --- a/lily/tex-stream.cc +++ b/lily/tex-stream.cc @@ -30,11 +30,22 @@ Tex_stream::Tex_stream (String filename) void Tex_stream::header() { - *os << _("% Creator: ") << get_version_str() << "\n"; - *os << _("% Automatically generated, at "); - time_t t (time (0)); - *os << ctime (&t) << "%\n"; + *os << _("% Creator: "); + if (no_timestamps_global_b) + *os << "GNU LilyPond\n"; + else + *os << get_version_str() << "\n"; + *os << _("% Automatically generated"); + if (no_timestamps_global_b) + *os << ".\n"; + else + { + *os << _(", at "); + time_t t (time (0)); + *os << ctime (&t) << "%\n"; + } } + Tex_stream::~Tex_stream() { *os << flush; diff --git a/make/Makefile.am b/make/Makefile.am index 997ce5ec67..863e8dc713 100644 --- a/make/Makefile.am +++ b/make/Makefile.am @@ -34,4 +34,4 @@ lilypond.spec: lilypond.spec.in ../VERSION cat $< | $(SED_VERSION) | $(SED_DATE) > $@ $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index e446567a58..0b5ff9a877 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond Versie: -Inschrijf datum: 06APR98 +Inschrijf datum: 07APR98 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 2919fd6734..cc3ea8fb09 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond Version: -Entered-date: 06APR98 +Entered-date: 07APR98 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 cee785675f..ad5e26321d 100644 --- a/mf/Makefile.am +++ b/mf/Makefile.am @@ -23,6 +23,7 @@ texout = $(top_builddir)/tex LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly)) TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex)) +export top_srcdir all-local: $(LYTABLES) $(TEXTABLES) @@ -59,4 +60,4 @@ include $(srcdir)/Rules.make include $(MFDEPS) # $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/mf/Makefile.am.wild b/mf/Makefile.am.wild index aa7ff51dff..f2b25ae4f4 100644 --- a/mf/Makefile.am.wild +++ b/mf/Makefile.am.wild @@ -22,6 +22,7 @@ texout = $(top_builddir)/tex LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly)) TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex)) +export top_srcdir all-local: $(LYTABLES) $(TEXTABLES) diff --git a/mf/Makefile.in b/mf/Makefile.in index 7b488a8a46..1805d4e789 100644 --- a/mf/Makefile.in +++ b/mf/Makefile.in @@ -212,6 +212,8 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +export top_srcdir + all-local: $(LYTABLES) $(TEXTABLES) dist-hook: $(LYTABLES) $(TEXTABLES) diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf index 7d9ea0b295..2f0e762b4d 100644 --- a/mf/feta-slag.mf +++ b/mf/feta-slag.mf @@ -9,8 +9,7 @@ % this file is included by feta-scripts.mf -% tfat := 0.3; -tfat := 1/3; +tfat := 1/2; twidth# := 0.5interline#; theight# := 0.55interline#; % tthin# := stafflinethickness#; @@ -27,7 +26,8 @@ def draw_trillelement = pickup pencircle scaled tthin; lft x1 = -twidth; - x3 = -tfat*twidth; +% x3 = -1/3*twidth; + x3 = -0.3*twidth; top y3 = theight; z3 - z1 = whatever * (0.5twidth, theight); @@ -121,8 +121,10 @@ 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); - currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin); +% draw_slur(-2twidth#,-2theight#,-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_trill_four; draw_trill_three; fet_endchar; @@ -130,8 +132,9 @@ 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); - currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin); +% draw_slur(-2twidth#,2theight#,1); + draw_slur(0,2theight#,1); + currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin); draw_trill_three; fet_endchar; diff --git a/mi2mu/Makefile.am b/mi2mu/Makefile.am index b18b5e4f9f..594ebdfff8 100644 --- a/mi2mu/Makefile.am +++ b/mi2mu/Makefile.am @@ -33,4 +33,4 @@ all-am: Makefile $(PROGRAMS) wild-check wild-check: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/mi2mu/Makefile.in b/mi2mu/Makefile.in index d39f33acd1..053e0de379 100644 --- a/mi2mu/Makefile.in +++ b/mi2mu/Makefile.in @@ -315,6 +315,193 @@ distdir: $(DISTFILES) (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done +main.o: main.cc ../flower/include/string-convert.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/lgetopt.hh ../flower/include/path.hh \ + ../flower/include/varray.hh ../lib/include/duration-convert.hh \ + ../lib/include/duration.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/plet.hh \ + ../lib/include/source.hh ../lib/include/proto.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/mi2mu-global.hh include/midi-score-parser.hh \ + include/midi-parser.hh include/mi2mu-proto.hh \ + ../flower/include/parray.hh include/mudela-item.hh \ + include/mudela-score.hh +mi2mu-version.o: mi2mu-version.cc ../flower/config.hh +midi-parser.o: midi-parser.cc ../flower/include/string-convert.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/source-file.hh ../lib/include/proto.hh \ + include/mi2mu-global.hh include/midi-parser.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/mi2mu-proto.hh +midi-score-parser.o: midi-score-parser.cc ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../lib/include/source-file.hh ../lib/include/proto.hh \ + ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/source.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/mi2mu-global.hh include/midi-score-parser.hh \ + include/midi-parser.hh include/mi2mu-proto.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + include/midi-track-parser.hh include/mudela-item.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + include/mudela-score.hh +midi-track-parser.o: midi-track-parser.cc \ + ../flower/include/string-convert.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/mi2mu-global.hh ../lib/include/proto.hh \ + include/midi-track-parser.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../lib/include/moment.hh \ + ../flower/include/rational.hh include/mi2mu-proto.hh \ + include/midi-parser.hh include/mudela-column.hh \ + include/mudela-item.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/mudela-score.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + include/mudela-staff.hh +mudela-column.o: mudela-column.cc include/mudela-column.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/mi2mu-proto.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc +mudela-item.o: mudela-item.cc include/mi2mu-global.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/proto.hh ../flower/include/string-convert.hh \ + ../lib/include/duration-convert.hh ../lib/include/duration.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../lib/include/plet.hh ../flower/include/varray.hh \ + include/mudela-column.hh include/mi2mu-proto.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/mudela-item.hh include/mudela-stream.hh \ + include/mudela-score.hh ../flower/include/parray.hh +mudela-score.o: mudela-score.cc ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../lib/include/duration.hh ../lib/include/plet.hh \ + ../lib/include/duration-convert.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/varray.hh \ + include/mi2mu-global.hh ../lib/include/proto.hh \ + include/mudela-column.hh include/mi2mu-proto.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/mudela-item.hh include/mudela-score.hh \ + ../flower/include/parray.hh include/mudela-staff.hh \ + include/mudela-stream.hh ../flower/include/list.tcc \ + ../flower/include/cursor.tcc +mudela-staff.o: mudela-staff.cc ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../lib/include/duration-convert.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh ../flower/include/string.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/varray.hh \ + ../flower/include/string-convert.hh include/mi2mu-proto.hh \ + include/mi2mu-global.hh ../lib/include/proto.hh \ + include/mudela-column.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/mudela-item.hh \ + include/mudela-staff.hh include/mudela-stream.hh \ + include/mudela-voice.hh include/mudela-score.hh \ + ../flower/include/parray.hh +mudela-stream.o: mudela-stream.cc include/mi2mu-global.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/proto.hh include/mudela-item.hh \ + include/mi2mu-proto.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/mudela-stream.hh +mudela-voice.o: mudela-voice.cc ../flower/include/string-convert.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/mi2mu-global.hh ../lib/include/proto.hh \ + include/mudela-column.hh include/mi2mu-proto.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/mudela-item.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/mudela-staff.hh \ + include/mudela-stream.hh include/mudela-voice.hh +template9.o: template9.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/plist.hh \ + ../flower/include/plist.icc ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/list.tcc \ + ../flower/include/cursor.tcc include/mudela-item.hh \ + include/mi2mu-proto.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/mudela-column.hh \ + include/mudela-staff.hh include/mudela-voice.hh \ + include/mudela-score.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh ../flower/include/pcursor.tcc \ + ../flower/include/plist.tcc +version.o: version.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh info: info-recursive dvi: dvi-recursive diff --git a/mi2mu/include/Makefile.am b/mi2mu/include/Makefile.am index d68e0d2c49..e5a3775a65 100644 --- a/mi2mu/include/Makefile.am +++ b/mi2mu/include/Makefile.am @@ -14,4 +14,4 @@ all: Makefile $(HEADERS) wild-check wild-check: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/mi2mu/include/mi2mu-global.hh b/mi2mu/include/mi2mu-global.hh index cb577d0bdf..005870af7d 100644 --- a/mi2mu/include/mi2mu-global.hh +++ b/mi2mu/include/mi2mu-global.hh @@ -27,6 +27,7 @@ void warning (String message_str); //, char const* context_ch_C); void error (String message_str); //, char const* context_ch_C); String mi2mu_version_str(); +extern bool no_timestamps_b_g;; #endif // MI2MU_GLOBAL_HH diff --git a/mi2mu/main.cc b/mi2mu/main.cc index d12b3f3dcc..7f89342476 100644 --- a/mi2mu/main.cc +++ b/mi2mu/main.cc @@ -23,6 +23,8 @@ String filename_str_g; // ugh Mudela_score* mudela_score_l_g = 0; +bool no_timestamps_b_g = false; + Sources source; static File_path path; @@ -46,6 +48,7 @@ usage() " -o, --output=FILE set FILE as default output\n" " -p, --no-plets assume no plets\n" " -q, --quiet be quiet\n" + " -T, --no-timestamps don't timestamp the output\n" " -s, --smallest=N assume no shorter (reciprocal) durations than N\n" " -v, --verbose be verbose\n" " -w, --warranty show warranty and copyright\n" @@ -100,6 +103,7 @@ main (int argc_i, char* argv_sz_a[]) {0, "no-plets", 'p'}, {0, "quiet", 'q'}, {1, "smallest", 's'}, + {0, "no-timestamps", 'T'}, {0, "verbose", 'v'}, {0, "warranty", 'w'}, {0, "no-double-dots", 'x'}, @@ -148,6 +152,9 @@ main (int argc_i, char* argv_sz_a[]) case 'q': level_ver = QUIET_ver; break; + case 'T': + no_timestamps_b_g = true; + break; case 's': { int i = String_convert::dec2_i (getopt_long.optional_argument_ch_C_); diff --git a/mi2mu/mudela-stream.cc b/mi2mu/mudela-stream.cc index d54b9cea57..42ba6695c3 100644 --- a/mi2mu/mudela-stream.cc +++ b/mi2mu/mudela-stream.cc @@ -71,10 +71,20 @@ Mudela_stream::handle_pending_indent() void Mudela_stream::header() { - *os_p_ << _("% Creator: ") << mi2mu_version_str() << "\n"; - *os_p_ << _("% Automatically generated, at "); - time_t t (time (0)); - *os_p_ << ctime (&t); + *os_p_ << _("% Creator: "); + if (no_timestamps_b_g) + *os_p_ << "GNU LilyPond\n"; + else + *os_p_ << mi2mu_version_str() << "\n"; + *os_p_ << _("% Automatically generated"); + if (no_timestamps_b_g) + *os_p_ << ".\n"; + else + { + *os_p_ << _(", at "); + time_t t (time (0)); + *os_p_ << ctime (&t) << "%\n"; + } *os_p_ << _("% from input file: "); // *os_p_ << midi_parser_l_g->filename_str_; // ugh diff --git a/mutopia/Coriolan/Makefile.am b/mutopia/Coriolan/Makefile.am new file mode 100644 index 0000000000..933f83419b --- /dev/null +++ b/mutopia/Coriolan/Makefile.am @@ -0,0 +1,14 @@ +# Generated automatically by wild-perl 0.1 +# mutopia/Coriolan/Makefile.am.wild + +LYFILES = clarinetti-part.ly clarinetti.ly clarinetto-1.ly clarinetto-2.ly contrabasso.ly coriolan.ly corni-part.ly corni.ly corno-1.ly corno-2.ly fagotti-part.ly fagotti.ly fagotto-1.ly fagotto-2.ly flauti-part.ly flauti.ly flauto-1.ly flauto-2.ly global.ly oboe-1.ly oboe-2.ly oboi-part.ly oboi.ly timpani.ly trombe-part.ly trombe.ly trombo-1.ly trombo-2.ly viola.ly violino-1.ly violino-2.ly violoncello.ly +TEXFILES = +M4FILES = +EXTRA_DIST = Makefile.am.wild TODO music $(LYFILES) $(TEXFILES) $(M4FILES) + +OUTFILES = $(M4FILES:%.m4=%) + +default: all $(OUTFILES) + +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/mutopia/Coriolan/Makefile.am.wild b/mutopia/Coriolan/Makefile.am.wild new file mode 100644 index 0000000000..d761af4a6c --- /dev/null +++ b/mutopia/Coriolan/Makefile.am.wild @@ -0,0 +1,11 @@ +# mutopia/Coriolan/Makefile.am.wild + +LYFILES = $(wildcard *.ly) +TEXFILES = $(wildcard *.tex) +M4FILES = $(wildcard *.m4) +EXTRA_DIST = Makefile.am.wild TODO music $(LYFILES) $(TEXFILES) $(M4FILES) + +OUTFILES = $(M4FILES:%.m4=%) + +default: all $(OUTFILES) + diff --git a/mutopia/Coriolan/Makefile.in b/mutopia/Coriolan/Makefile.in new file mode 100644 index 0000000000..86470d93f7 --- /dev/null +++ b/mutopia/Coriolan/Makefile.in @@ -0,0 +1,205 @@ +# Makefile.in generated automatically by automake 1.2f from Makefile.am + +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1 +# mutopia/Coriolan/Makefile.am.wild + + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = ../.. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AGE = @AGE@ +AUTOGENERATE = @AUTOGENERATE@ +BISON = @BISON@ +CC = @CC@ +COMPILEINFO = @COMPILEINFO@ +CPPFLAGS = @CPPFLAGS@ +CURRENT = @CURRENT@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +DIR_DATADIR = @DIR_DATADIR@ +EXTRA_LIBES = @EXTRA_LIBES@ +FIND = @FIND@ +FLEX = @FLEX@ +ICFLAGS = @ICFLAGS@ +ILDFLAGS = @ILDFLAGS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBTOOL = @LIBTOOL@ +LN = @LN@ +LN_S = @LN_S@ +MAKE = @MAKE@ +MAKEINFO = @MAKEINFO@ +MFDIR = @MFDIR@ +NM = @NM@ +PACKAGE = @PACKAGE@ +PERL = @PERL@ +POD2HTML = @POD2HTML@ +POD2MAN = @POD2MAN@ +PYTHON = @PYTHON@ +RANLIB = @RANLIB@ +REVISION = @REVISION@ +TAR = @TAR@ +TEXDIR = @TEXDIR@ +TEXPREFIX = @TEXPREFIX@ +VERSION = @VERSION@ +YACC = @YACC@ +ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ + +LYFILES = clarinetti-part.ly clarinetti.ly clarinetto-1.ly clarinetto-2.ly contrabasso.ly coriolan.ly corni-part.ly corni.ly corno-1.ly corno-2.ly fagotti-part.ly fagotti.ly fagotto-1.ly fagotto-2.ly flauti-part.ly flauti.ly flauto-1.ly flauto-2.ly global.ly oboe-1.ly oboe-2.ly oboi-part.ly oboi.ly timpani.ly trombe-part.ly trombe.ly trombo-1.ly trombo-2.ly viola.ly violino-1.ly violino-2.ly violoncello.ly +TEXFILES = +M4FILES = +EXTRA_DIST = Makefile.am.wild TODO music $(LYFILES) $(TEXFILES) $(M4FILES) + +OUTFILES = $(M4FILES:%.m4=%) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../../flower/config.hh +CONFIG_CLEAN_FILES = +DIST_COMMON = Makefile.am Makefile.in TODO + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +GZIP = --best +default: all + +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mutopia/Coriolan/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +tags: TAGS +TAGS: + + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = mutopia/Coriolan + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ + done +info: +dvi: +check: all + $(MAKE) +installcheck: +install-exec: + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) + +install: install-exec install-data all + @: + +uninstall: + +all: Makefile + +install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install +installdirs: + + +mostlyclean-generic: + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-generic + +clean: clean-generic mostlyclean + +distclean: distclean-generic clean + -rm -f config.status + -rm -f libtool + +maintainer-clean: maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +.PHONY: default tags distdir info dvi installcheck install-exec \ +install-data install uninstall all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean + + +default: all $(OUTFILES) + +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/mutopia/Coriolan/TODO b/mutopia/Coriolan/TODO new file mode 100644 index 0000000000..183509da82 --- /dev/null +++ b/mutopia/Coriolan/TODO @@ -0,0 +1,10 @@ +coriolan/TODO + + * complete all parts + + * make a macro/framework/something for symphonies + + * staff-group bracket + + * chords/divisi; one stem/two stems... + diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly new file mode 100644 index 0000000000..dff3a502af --- /dev/null +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -0,0 +1,19 @@ +\header{ +filename = "clarinetti-part.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; +} + +\version "0.1.9"; + +\include "global.ly" +\include "clarinetti.ly" + +\score{ + \$clarinetti_staff + \paper{} +} + diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly new file mode 100644 index 0000000000..f1b600009b --- /dev/null +++ b/mutopia/Coriolan/clarinetti.ly @@ -0,0 +1,28 @@ +\header{ +filename = "clarinetti.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "clarinetto-1.ly" +\include "clarinetto-2.ly" + +$clarinetti_staff = \type Staff = clarinetti < + \property Staff.instrument = "clarinet" + \melodic< +% ugh, key doesn't transpose along +% \global + \meter 4/4; + \key bes; + \transpose d \$clarinetto1 + \transpose d \$clarinetto2 + > +> + diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly new file mode 100644 index 0000000000..29b6bce0f4 --- /dev/null +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -0,0 +1,23 @@ +\header{ +filename = "clarinetto-1.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +clarinetto1 = \melodic{ + \octave c'; + r1 | r1 | c'4-.\ff r r2 | r1 | + r1 | r1 | d'4-. r r2 | r1 | + r1 | r1 | es'4-. r r2 | r1 | + es'4-. r r2 | d'4-. r r2 | + r1 | r1 | r1 | r1 | + as2\p_"\ \ \ cresc." ( g | )fis2. g4-.\f | +} + diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly new file mode 100644 index 0000000000..f69468e831 --- /dev/null +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -0,0 +1,27 @@ +\header{ +filename = "clarinetto-2.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +clarinetto2 = \melodic{ + \octave c'; +% koor: clarinetto-part.ly +% lilypond: ../../current/lily/dynamic-grav.cc:58: void Dynamic_engraver::do_process_requests(): Assertion `!dynamic_p_' failed. +% Aborted (core dumped) +% r1 | r1 | as4-.\ff r r2 | r1 | + r1 | r1 | as4-. r r2 | r1 | + r1 | r1 | b4-. r r2 | r1 | + r1 | r1 | c'4-. r r2 | r1 | + c'4-. r r2 | b4-. r r2 | + r1 | r1 | r1 | r1 | + r1 | r2 r4 'b4-. | +} + diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly new file mode 100644 index 0000000000..f941bb55ac --- /dev/null +++ b/mutopia/Coriolan/contrabasso.ly @@ -0,0 +1,31 @@ +\header{ +filename = "contrabasso.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +contrabasso = \melodic{ + \octave c; + c1\ff ~ | c | 'f4-. r r2 | r1 | + c1\ff ~ | c | 'f4-. r r2 | r1 | + c1\ff ~ | c | 'fis4-. r r2 | r1 | + 'g4-. r r2 | 'g4-. r r2 | + c4\p r4 r2 | c4 r4 r2 | c4 r4 r2 | r1 | + c'4.-"cresc." c'8 bes4. bes8 | as4. as8 g4\f r4 | +} + +$contrabasso_staff = \type Staff = contrabasso < + \property Staff.instrument = "contrabass" + \clef "bass"; + \melodic< + \global; + \$contrabasso + > +> diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly new file mode 100644 index 0000000000..f55fe473bf --- /dev/null +++ b/mutopia/Coriolan/coriolan.ly @@ -0,0 +1,73 @@ +\header{ +filename = "coriolan.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "global.ly" + +\include "contrabasso.ly" +\include "clarinetti.ly" +\include "corni.ly" +\include "fagotti.ly" +\include "flauti.ly" +\include "oboi.ly" +\include "timpani.ly" +\include "trombe.ly" +\include "viola.ly" +\include "violino-1.ly" +\include "violino-2.ly" +\include "violoncello.ly" + +legno = \type Staff_group = legno_group < + \$flauti_staff + \$oboi_staff + \$clarinetti_staff + \$fagotti_staff +> + +koper = \type Staff_group = koper_group < + \$corni_staff + \$trombe_staff +> + +$timpani_g = \type Staff_group = timpani_group < + \$timpani_staff +> + +$violini = \type Grandstaff = violini_group < + \$violino1_staff + \$violino2_staff +> + +$bassi = \type Grandstaff = violine_group < + \$violoncello_staff + \$contrabasso_staff +> + +strijkers = \type Staff_group = strijkers_group < + \$violini + \$viola_staff + \$bassi +> + +\score{ + < + \$legno + \$koper + \$timpani_g + \$strijkers + > + \paper{} + \midi{ + \tempo 4 = 160; + } +} + diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly new file mode 100644 index 0000000000..088608e52a --- /dev/null +++ b/mutopia/Coriolan/corni-part.ly @@ -0,0 +1,21 @@ +\header{ +filename = "corni-part.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "global.ly" +\include "corni.ly" + +\score{ + \$corni_staff + \paper{} +} + diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly new file mode 100644 index 0000000000..e8867a1709 --- /dev/null +++ b/mutopia/Coriolan/corni.ly @@ -0,0 +1,27 @@ +\header{ +filename = "corni.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "corno-1.ly" +\include "corno-2.ly" + +$corni_staff = \type Staff = corni < + \property Staff.instrument = "french horn" + \melodic< +% ugh, key doesn't transpose along +% \global + \meter 4/4; + \transpose 'a \$corno1 + \transpose 'a \$corno2 + > +> + diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly new file mode 100644 index 0000000000..5193c002d9 --- /dev/null +++ b/mutopia/Coriolan/corno-1.ly @@ -0,0 +1,23 @@ +\header{ +filename = "corno-1.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +corno1 = \melodic{ + \octave c'; + r1 | r1 | as'4-.\ff r r2 | r1 | + r1 | r1 | as'4-. r r2 | r1 | + r1 | r1 | es'4-. r r2 | r1 | + g'4-. r r2 | g'4-. r r2 | + r1 | r1 | r1 | r1 | + r1 | r2 r4 g'4-.\f | +} + diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly new file mode 100644 index 0000000000..cbebbf49d5 --- /dev/null +++ b/mutopia/Coriolan/corno-2.ly @@ -0,0 +1,25 @@ +\header{ +filename = "corno-2.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +corno2 = \melodic{ + \octave c'; +% koor: corno-part.ly +% r1 | r1 | f'4-.\ff r r2 | r1 | + r1 | r1 | f'4-. r r2 | r1 | + r1 | r1 | f'4-. r r2 | r1 | + r1 | r1 | es'4-. r r2 | r1 | + g4-. r r2 | g4-. r r2 | + r1 | r1 | r1 | r1 | + r1 | r2 r4 g4-. | +} + diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly new file mode 100644 index 0000000000..b9b19b0ba0 --- /dev/null +++ b/mutopia/Coriolan/fagotti-part.ly @@ -0,0 +1,21 @@ +\header{ +filename = "fagotti-part.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "global.ly" +\include "fagotti.ly" + +\score{ + \$fagotti_staff + \paper{} +} + diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly new file mode 100644 index 0000000000..68a1ca0081 --- /dev/null +++ b/mutopia/Coriolan/fagotti.ly @@ -0,0 +1,26 @@ +\header{ +filename = "fagotti.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "fagotto-1.ly" +\include "fagotto-2.ly" + +$fagotti_staff = \type Staff = fagotti < + \property Staff.instrument = "bassoon" + \clef "bass"; + \melodic< + \global; + \$fagotto1 + \$fagotto2 + > +> + diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly new file mode 100644 index 0000000000..8cf7e432b1 --- /dev/null +++ b/mutopia/Coriolan/fagotto-1.ly @@ -0,0 +1,23 @@ +\header{ +filename = "fagotto-1.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +fagotto1 = \melodic{ + \octave c; + r1 | r1 | as4-.\ff r r2 | r1 | + r1 | r1 | as4-. r r2 | r1 | + r1 | r1 | a4-. r r2 | r1 | + c'4-. r r2 | b4-. r r2 | + r1 | r1 | r1 | r1 | + r1 | r2 r4 g4-.\f | +} + diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly new file mode 100644 index 0000000000..946ce94545 --- /dev/null +++ b/mutopia/Coriolan/fagotto-2.ly @@ -0,0 +1,25 @@ +\header{ +filename = "fagotto-2.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +fagotto2 = \melodic{ + \octave c; +% koor +% r1 | r1 | f4-.\ff r r2 | r1 | + r1 | r1 | f4-. r r2 | r1 | + r1 | r1 | f4-. r r2 | r1 | + r1 | r1 | fis4-. r r2 | r1 | + g4-. r r2 | g4-. r r2 | + r1 | r1 | r1 | r1 | + r1 | r2 r4 'g4-. | +} + diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly new file mode 100644 index 0000000000..5e9dfb00e8 --- /dev/null +++ b/mutopia/Coriolan/flauti-part.ly @@ -0,0 +1,21 @@ +\header{ +filename = "flauti-part.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "global.ly" +\include "flauti.ly" + +\score{ + \$flauti_staff + \paper{} +} + diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly new file mode 100644 index 0000000000..dc49d11fb5 --- /dev/null +++ b/mutopia/Coriolan/flauti.ly @@ -0,0 +1,25 @@ +\header{ +filename = "flauti.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "flauto-1.ly" +\include "flauto-2.ly" + +$flauti_staff = \type Staff = flauti < + \property Staff.instrument = "flute" + \melodic< + \global; + \$flauto1 + \$flauto2 + > +> + diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly new file mode 100644 index 0000000000..bb62b1bb1b --- /dev/null +++ b/mutopia/Coriolan/flauto-1.ly @@ -0,0 +1,23 @@ +\header{ +filename = "flauto-1.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +flauto1 = \melodic{ + \octave c''; + r1 | r1 | c'4-.\ff r r2 | r1 | + r1 | r1 | d'4-. r r2 | r1 | + r1 | r1 | es'4-. r r2 | r1 | + g'4-. r r2 | b4-. r r2 | + r1 | r1 | r1 | r1 | + r2 es'\p_"\ \ \ cresc." ( | )dis'2. es'4-.\f | +} + diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly new file mode 100644 index 0000000000..0a6f57b8c9 --- /dev/null +++ b/mutopia/Coriolan/flauto-2.ly @@ -0,0 +1,25 @@ +\header{ +filename = "flauto-2.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +flauto2 = \melodic{ + \octave c''; +% koor +% r1 | r1 | as4-.\ff r r2 | r1 | + r1 | r1 | as4-. r r2 | r1 | + r1 | r1 | b4-. r r2 | r1 | + r1 | r1 | c'4-. r r2 | r1 | + es'4-. r r2 | d4-. r r2 | + r1 | r1 | r1 | r1 | + r2 r2 | r2 r4 b4-. | +} + diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly new file mode 100644 index 0000000000..966f1f1aa4 --- /dev/null +++ b/mutopia/Coriolan/global.ly @@ -0,0 +1,18 @@ +\header{ +filename = "global.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +global = \melodic{ + \meter 4/4; + \key bes es as; +} + diff --git a/mutopia/Coriolan/music b/mutopia/Coriolan/music new file mode 100644 index 0000000000..240986b5c8 --- /dev/null +++ b/mutopia/Coriolan/music @@ -0,0 +1,18 @@ +flauto-1.ly +flauto-2.ly +oboe-1.ly +oboe-2.ly +clarinetto-1.ly +clarinetto-2.ly +fagotto-1.ly +fagotto-2.ly +corno-1.ly +corno-2.ly +trombo-1.ly +trombo-2.ly +timpani.ly +violino-1.ly +violino-2.ly +viola.ly +violoncello.ly +contrabasso.ly diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly new file mode 100644 index 0000000000..b68f11cbf3 --- /dev/null +++ b/mutopia/Coriolan/oboe-1.ly @@ -0,0 +1,23 @@ +\header{ +filename = "oboe-1.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +oboe1 = \melodic{ + \octave c''; + r1 | r1 | as4-.\ff r r2 | r1 | + r1 | r1 | as4-. r r2 | r1 | + r1 | r1 | a4-. r r2 | r1 | + g4-. r r2 | g4-. r r2 | + r1 | r1 | r1 | r1 | + as2\p_"\ \ \ cresc." ( g | )fis2. g4-.\f | +} + diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly new file mode 100644 index 0000000000..94cecf9b4d --- /dev/null +++ b/mutopia/Coriolan/oboe-2.ly @@ -0,0 +1,25 @@ +\header{ +filename = "oboe-2.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +oboe2 = \melodic{ + \octave c''; +% koor +% r1 | r1 | f4-.\ff r r2 | r1 | + r1 | r1 | f4-. r r2 | r1 | + r1 | r1 | f4-. r r2 | r1 | + r1 | r1 | es4-. r r2 | r1 | + es4-. r r2 | 'b4-. r r2 | + r1 | r1 | r1 | r1 | + r1 | r2 r4 'b4-. | +} + diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly new file mode 100644 index 0000000000..3d67ea5234 --- /dev/null +++ b/mutopia/Coriolan/oboi-part.ly @@ -0,0 +1,21 @@ +\header{ +filename = "oboi-part.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "global.ly" +\include "oboi.ly" + +\score{ + \$oboi_staff + \paper{} +} + diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly new file mode 100644 index 0000000000..cce1305de8 --- /dev/null +++ b/mutopia/Coriolan/oboi.ly @@ -0,0 +1,25 @@ +\header{ +filename = "oboi.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "oboe-1.ly" +\include "oboe-2.ly" + +$oboi_staff = \type Staff = oboi < + \property Staff.instrument = "oboe" + \melodic< + \global; + \$oboe1 + \$oboe2 + > +> + diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly new file mode 100644 index 0000000000..9ad4482ecf --- /dev/null +++ b/mutopia/Coriolan/timpani.ly @@ -0,0 +1,32 @@ +\header{ +filename = "timpani.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +timpani = \melodic{ + \octave c; + r1 | r1 | c4-.\ff r r2 | r1 | + r1 | r1 | c4-. r r2 | r1 | + r1 | r1 | c4-. r r2 | r1 | + 'g4-. r r2 | 'g4-. r r2 | + r1 | r1 | r1 | r1 | + r1 | r2 r4 'g4-. | +} + +$timpani_staff = \type Staff = timpani < + \property Staff.instrument = "timpani" + \clef "bass"; + \melodic< + \global; + \$timpani + > +> + diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly new file mode 100644 index 0000000000..b32d202d52 --- /dev/null +++ b/mutopia/Coriolan/trombe-part.ly @@ -0,0 +1,21 @@ +\header{ +filename = "trombe-part.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "global.ly" +\include "trombe.ly" + +\score{ + \$trombe_staff + \paper{} +} + diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly new file mode 100644 index 0000000000..2d70dd71a9 --- /dev/null +++ b/mutopia/Coriolan/trombe.ly @@ -0,0 +1,25 @@ +\header{ +filename = "trombe.ly"; +% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +\include "trombo-1.ly" +\include "trombo-2.ly" + +$trombe_staff = \type Staff = trombe < + \melodic< +% \global; + \meter 4/4; + \$trombo1 + \$trombo2 + > +> + diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly new file mode 100644 index 0000000000..49aefe57de --- /dev/null +++ b/mutopia/Coriolan/trombo-1.ly @@ -0,0 +1,23 @@ +\header{ +filename = "trombo-1.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +trombo1 = \melodic{ + \octave c'; + r1 | r1 | c'4-.\ff r r2 | r1 | + r1 | r1 | c'4-. r r2 | r1 | + r1 | r1 | c'4-. r r2 | r1 | + g4-. r r2 | g4-. r r2 | + r1 | r1 | r1 | r1 | + r1 | r2 r4 g4-.\f | +} + diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly new file mode 100644 index 0000000000..1ca561b103 --- /dev/null +++ b/mutopia/Coriolan/trombo-2.ly @@ -0,0 +1,25 @@ +\header{ +filename = "trombo-2.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +trombo2 = \melodic{ + \octave c'; +% koor +% r1 | r1 | c4-.\ff r r2 | r1 | + r1 | r1 | c4-. r r2 | r1 | + r1 | r1 | c4-. r r2 | r1 | + r1 | r1 | c4-. r r2 | r1 | + 'g4-. r r2 | 'g4-. r r2 | + r1 | r1 | r1 | r1 | + r1 | r2 r4 'g4-. | +} + diff --git a/mutopia/Coriolan/viola.ly b/mutopia/Coriolan/viola.ly new file mode 100644 index 0000000000..1fd005e649 --- /dev/null +++ b/mutopia/Coriolan/viola.ly @@ -0,0 +1,36 @@ +\header{ +filename = "viola.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +viola = \melodic{ + \octave c; + < { c'1\ff ~ | c' } { c ~ | c } > | f4-. r r2 | r1 | + % copied 3 bars from three back... + < { c'1 ~ | c' } { c ~ | c } > | f4-. r r2 | r1 | + < { c'1 ~ | c' } { c ~ | c } > | fis4-. r r2 | r1 | + < g4-. g'-. > r r2 | < g4-. g'-. > r r2 | + % copied from violino-1... + [c8-.\p es-.] [es()d] [d-. g-.] g4-"ten." | + [c8-. es-.] [es()d] [d-. g-.] g4-"ten." | + [c8-. es-.] [es()d] [d-. as-.] [as()g] | + [g8-. c'-.] [c'()b] [b-. f'-.] [f'()es'] | + es'4.-"cresc." es'8 d'4. d'8 | c'4. c'8 b4\f r4 | +} + +$viola_staff = \type Staff = viola < + \property Staff.instrument = "viola" + \clef "alto"; + \melodic< + \global; + \$viola + > +> diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly new file mode 100644 index 0000000000..b5290fea73 --- /dev/null +++ b/mutopia/Coriolan/violino-1.ly @@ -0,0 +1,34 @@ +\header{ +filename = "violino-1.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +violino1 = \melodic{ + \octave c'; + c1\ff ~ | c | <as'4-. c'-. f-.> r r2 | r1 | + c1 ~ | c | <d''4-. d'-. d-.> r r2 | r1 | + c1 ~ | c | <es''4-. es'-.> r r2 | r1 | + <g'4-. c'-. es-.> r r2 | <b4-. d-. 'g-.> r r2 | + [c8-.\p es-.] [es()d] [d-. g-.] g4-"ten." | + [c8-. es-.] [es()d] [d-. g-.] g4-"ten." | + [c8-. es-.] [es()d] [d-. as-.] [as()g] | + [g8-. c'-.] [c'()b] [b-. f'-.] [f'()es'] | + [es'8-.-"cresc." as'-.] as'4. g'8-. g'4 ~ | + [g'8 fis'] fis'4 ~ fis' g'-.\f | +} + +$violino1_staff = \type Staff = violino1 < + \property Staff.instrument = "violin" + \melodic< + \global; + \$violino1 + > +> diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly new file mode 100644 index 0000000000..260ea14181 --- /dev/null +++ b/mutopia/Coriolan/violino-2.ly @@ -0,0 +1,32 @@ +\header{ +filename = "violino-2.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +violino2 = \melodic{ + \octave c'; + c1\ff ~ | c | <as'4-. c'-. f-.> r r2 | r1 | + c1 ~ | c | <as'4-. b-. d-.> r r2 | r1 | + c1 ~ | c | <c''4-. es'-. fis-.> r r2 | r1 | + <c'4-. es-. 'g-.> r r2 | <b4-. d-. 'g-.> r r2 | + r1 | r1 | r1 | + r2 ['b8-.\p f-.] [f()es] | + [es8-. as-.] as4.-"cresc." g8-. g4 ~ | + [g8 fis-.] fis4 ~ fis g-.\f | +} + +$violino2_staff = \type Staff = violino2 < + \property Staff.instrument = "violin" + \melodic< + \global; + \$violino2 + > +> diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly new file mode 100644 index 0000000000..38aecb4055 --- /dev/null +++ b/mutopia/Coriolan/violoncello.ly @@ -0,0 +1,31 @@ +\header{ +filename = "violoncello.ly"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1792)"; +enteredby = "JCN"; +copyright = "public domain"; + + +} + +\version "0.1.9"; + +violoncello = \melodic{ + \octave c; + c1\ff ~ | c | 'f4-. r r2 | r1 | + c1\ff ~ | c | 'f4-. r r2 | r1 | + c1\ff ~ | c | 'fis4-. r r2 | r1 | + 'g4-. r r2 | 'g4-. r r2 | + c4\p r4 r2 | c4 r4 r2 | c4 r4 r2 | r1 | + c'4.-"cresc." c'8 bes4. bes8 | as4. as8 g4\f r4 | +} + +$violoncello_staff = \type Staff = violoncello < + \property Staff.instrument = "cello" + \clef "bass"; + \melodic< + \global; + \$violoncello + > +> diff --git a/mutopia/J.S.Bach/Makefile.am b/mutopia/J.S.Bach/Makefile.am index f87f282ea2..ae4b8fac30 100644 --- a/mutopia/J.S.Bach/Makefile.am +++ b/mutopia/J.S.Bach/Makefile.am @@ -10,5 +10,11 @@ OUTFILES = $(M4FILES:%.m4=%) default: all $(OUTFILES) +# ugh +M4 = m4 + +%.ly: $(srcdir)/%.ly.m4 + $(M4) $< > $@ + $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/mutopia/J.S.Bach/Makefile.am.wild b/mutopia/J.S.Bach/Makefile.am.wild index 3b57ddb74c..630d2c35be 100644 --- a/mutopia/J.S.Bach/Makefile.am.wild +++ b/mutopia/J.S.Bach/Makefile.am.wild @@ -9,3 +9,9 @@ OUTFILES = $(M4FILES:%.m4=%) default: all $(OUTFILES) +# ugh +M4 = m4 + +%.ly: $(srcdir)/%.ly.m4 + $(M4) $< > $@ + diff --git a/mutopia/J.S.Bach/Makefile.in b/mutopia/J.S.Bach/Makefile.in index cca106e880..ef9808fd89 100644 --- a/mutopia/J.S.Bach/Makefile.in +++ b/mutopia/J.S.Bach/Makefile.in @@ -106,6 +106,9 @@ M4FILES = preludes-3.ly.m4 wtk1-prelude2.ly.m4 EXTRA_DIST = Makefile.am.wild $(LYFILES) $(TEXFILES) $(M4FILES) OUTFILES = $(M4FILES:%.m4=%) + +# ugh +M4 = m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../flower/config.hh CONFIG_CLEAN_FILES = @@ -197,6 +200,9 @@ mostlyclean distclean maintainer-clean default: all $(OUTFILES) +%.ly: $(srcdir)/%.ly.m4 + $(M4) $< > $@ + $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/mutopia/J.S.Bach/preludes-1.ly b/mutopia/J.S.Bach/preludes-1.ly index 2c87868ab7..651e0c8bb7 100644 --- a/mutopia/J.S.Bach/preludes-1.ly +++ b/mutopia/J.S.Bach/preludes-1.ly @@ -65,22 +65,19 @@ one = \melodic{ two = \melodic{ \octave c; \textstyle "roman"; - c4-5 e-3 [g32-1 fis-2 g8.-1] 'g4 | - d-5 f-3 [a32-1 gis a8.] 'a4 | - % ugh grouping32: 4..4 - e-5 e'-1 a-4 [a32-3 b c' b] [c' b a b] | - c'4 e-4 fis [a32-1 gis fis gis] [a gis fis gis] | - a4 c-4 d [d32 e f e] [f e d e] | - % ugh tril sign - % f4-1 e d-3\tr c | - f4-1 e d-3 c | - % g( )'g g\pr-"(#)"( )'g | - g ~ 'g g-"(\\textsharp)" ~ 'g | - % g\pr-"(\\textsharp)" ~ 'g g\pr-"(\\textsharp)" ~ 'g | - g-"(\\textsharp)" ~ 'g g-"(\\textsharp)" ~ 'g | + 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 'g g-\mordent 'g | % ugh, f should be at upper staff - g r r16 ['g-5( 'b-4 d] )f-1 s s s | - s [g-5( b-4 d'-2] )f'-1 s s s s \clef violin; [g'-4 b'-2 d''-1] + g-\mordent r r16 ['g-5( 'b-4 d] )f-1 s s s | +% s [g-5( b-4 d'-2] )f'-1 s s s s \clef violin; [g'-4 b'-2 d''-1] + % huh, can't violin anymore (see BUGS) + s [g-5( b-4 d'-2] )f'-1 s s s s [g'-4 b'-2 d''-1] s s s s \clef bass; | < { \voiceone; g1 ~ g ~ g ~ g ~ g ~ g ~ g } diff --git a/mutopia/J.S.Bach/preludes-2.ly b/mutopia/J.S.Bach/preludes-2.ly index 39ba3fff8b..48dcb7d083 100644 --- a/mutopia/J.S.Bach/preludes-2.ly +++ b/mutopia/J.S.Bach/preludes-2.ly @@ -70,8 +70,8 @@ one = \melodic{ two = \melodic{ \octave c; < - { \voiceone; c1 ~ c ~ c } - { \voicetwo; 'c1 ~ 'c ~ 'c } + { \voiceone; c1 ~ | c ~ | c } + { \voicetwo; 'c1 ~ | 'c ~ | 'c } > \onevoice; | r8 [c-5( e-3 g-1] [e-3 c-5 c' e-4] | @@ -79,13 +79,10 @@ two = \melodic{ )g2-3 r4 g-2( | [)a8 'a-5( c-4 e-2] [c-4 'a-5 g e-3] | )fis2 r4 d-4 | - % [g32-1( fis-2 g8.-1] ) 'g4 g( )'g\mr | - - % my edition has mordents on every g here - [g32-1( fis-2 g8.-1] ) 'g4 g ~ 'g | - % 'g( )g\mr 'g( )g\mr | - g ~ 'g g ~ 'g | - g ~ 'g g ~ 'g | + g-\mordent-"(\\textsharp)" 'g4 g-\mordent 'g | + % mordents in brackets... + g-\mordent 'g g-\mordent 'g | + g-\mordent 'g g-\mordent 'g | [g8 'g-5( 'b-4 d-2] ['b-4 'g-5 f!-1 d-3] | [)e-2 c-4 e-2 g-1] [e-3 c-5 c' e-4] | \textstyle "finger"; diff --git a/mutopia/J.S.Bach/preludes-4.ly b/mutopia/J.S.Bach/preludes-4.ly index 7060b2ea94..3e4887586a 100644 --- a/mutopia/J.S.Bach/preludes-4.ly +++ b/mutopia/J.S.Bach/preludes-4.ly @@ -45,7 +45,7 @@ one = \melodic{ \stemboth [''fis16-1\p ''a-2 'd-5\< 'c-4] [''b-1 'd-2 'g-5 'fis-4] ['d-1 'b-5 'a 'g] ['fis-2 'e-1 'd-4 \!'c!-3] | - [''b-2 'd-1 'g 'a] ['fis32 'g 'fis16] ['e16-4 'd-3] + [''b-2 'd-1 'g 'a] ['fis8-\prall 'e16-4 'd-3] ['d8. 'e16~] ['e 'd8 'cis16] | \stemup r16 ['d-1\< 'fis 'd] ['g 'a 'b 'g-1] [c-3 'b c d] [c e d-4 \!c] | diff --git a/mutopia/J.S.Bach/preludes-5.ly b/mutopia/J.S.Bach/preludes-5.ly index 0291fe4077..d0446ef4ba 100644 --- a/mutopia/J.S.Bach/preludes-5.ly +++ b/mutopia/J.S.Bach/preludes-5.ly @@ -24,28 +24,25 @@ one = \melodic{ < { \voiceone; -% c'4\mr^"(\\textsharp)"\p r r | -% c'4\mr^"(\\textsharp)" r r - c'4^"(\\textsharp)"\p r r | - c'4^"(\\textsharp)" r r + c'4-\mordent-"(\\textsharp)"\p r r | + c'4-\mordent-"(\\textsharp)" r r } { \voicetwo; a4 r r | a4 r r } > | \onevoice; [a'8\mf( es'-3\> d' c' bes!-3 a] | [g fis-3 e!-2 d-1 c'-4 \!a] | - [)bes32(\p a bes16] [d'8-5 bes-3 g-1] )g'4 | -% r8 [d'-5( c' bes a\pr g] | - r8 [d'-5( c' bes a g] | + [)bes8-\mordent\p( d'8-5 bes-3 g-1] )g'4 | + r8 [d'-5( c' bes a-\prall g] | [)a-2 c'-4( a f] ) f'4 | -% r8 [c'-5 bes a g\tr f] | - r8 [c'-5 bes a g f] | + r8 [c'-5 bes a g-\prall f] | [g-2 bes-4 a g f-1 e-2] | [f-3 d-1 f-2 a-3 d'-5 g-2] | < { \voiceone; - [cis'32-4 bes cis'16 e'8-5-"poco cresc." cis'-3 a e' cis'] + % ... textnatural + [cis'8-\prall e'8-5-"poco cresc." cis'-3 a e' cis'] } { \voicetwo; a4 } > @@ -99,10 +96,9 @@ two = \melodic{ \octave c; [d32( cis )d8.] r4 r | 'd4 r r | -% d\mr r r | - d r r | + d-\mordent r r | 'd4 r r | -% d\mr r r | + d-\mordent r r | d r r | 'd4 r r | [d8-2 'a-5 d-2 f-1 d-4 f-2] | @@ -113,11 +109,9 @@ two = \melodic{ [g!-5 es'-1 c'-1 g-5 es'-1 c'-1 ] | fis4-5 r r d-4( ) fis d-5 | -% g\mr-"(\\textsharp)" r r f!8 | - g-"(\\textsharp)" r r8 f! | - [e32 f e8.] r4 r | -% f\pr r r8 e | - f r r8 e | + g4-\mordent-"(\\textsharp)" r r f!8 | + e4-\prall r r | + f4-\mordent r r8 e | d4 r8 [f-1 e d] | [e-2 d-3 cis-4 e-1 d-2 cis-3] | d4-2( )c! 'bes-4 | diff --git a/mutopia/Makefile.am b/mutopia/Makefile.am index 1ea267e280..6271bc118a 100644 --- a/mutopia/Makefile.am +++ b/mutopia/Makefile.am @@ -1,7 +1,7 @@ # Generated automatically by wild-perl 0.1 # mutopia/Makefile.am.wild -SUBDIRS = J.S.Bach +SUBDIRS = J.S.Bach Coriolan LYFILES = gallina.ly los-toros-oboe.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly TEXFILES = gallina.tex los-toros-oboe-20.tex standchen-16.tex standchen-20.tex @@ -12,4 +12,4 @@ OUTFILES = $(M4FILES:%.m4=%) default: all $(OUTFILES) $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/mutopia/Makefile.am.wild b/mutopia/Makefile.am.wild index bde501ae8d..01a7a8ce12 100644 --- a/mutopia/Makefile.am.wild +++ b/mutopia/Makefile.am.wild @@ -1,6 +1,6 @@ # mutopia/Makefile.am.wild -SUBDIRS = J.S.Bach +SUBDIRS = J.S.Bach Coriolan LYFILES = $(wildcard *.ly) TEXFILES = $(wildcard *.tex) diff --git a/mutopia/Makefile.in b/mutopia/Makefile.in index a8228714a0..c03acaf8c4 100644 --- a/mutopia/Makefile.in +++ b/mutopia/Makefile.in @@ -100,7 +100,7 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -SUBDIRS = J.S.Bach +SUBDIRS = J.S.Bach Coriolan LYFILES = gallina.ly los-toros-oboe.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly TEXFILES = gallina.tex los-toros-oboe-20.tex standchen-16.tex standchen-20.tex diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index d936c18b37..78586dc6a3 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -36,6 +36,11 @@ Tested Features: Note placement, multipart score, figured base, \breve note: the sharp signs hoovering over the bass part are no mistake, but part of the basso continuo --HWN +Note also: The original score was printed without any beams, +they were added in this edition to increase the readability. +If you want the original beam-less layout, redefine the +Voice engraver by uncommenting the lines in the paper +definition below. --MB %} \version "0.1.9"; @@ -44,65 +49,67 @@ vi1=\melodic{ \meter 4/4; \octave c''; - d8 d d d d4 A16 B c A | - B8 G G G16 A B8 G G G16 A | - B8 G G A16 B c4 B | - A8 D G2 Fis4 | + [d8 d d d] d4 [A16 B c A] | + [B8 G ][ G G16 A][ B8 G ][ G G16 A] | + [B8 G ][ G A16 B] c4 B | + [A8 D] G2 Fis4 | G2 r2 | r1 | - d8 d d d d4 A16 B c A | - B8 G G G16 A B8 G G G16 A | - B8 G G A16 B c8 e d c | - B G c2 B4 | + [d8 d d d] d4 [A16 B c A] | + [B8 G ][ G G16 A][ B8 G ][ G G16 A] | + [B8 G ][ G A16 B][ c8 e d c] | + [B G] c2 B4 | c2 r | r1 | - g8 g g g g4 d16 e f d | - e8 c c c16 d e8 c c c16 d | - e8 c c d16 e f4 e | - d8 G c2 B4 | - c8 G G G16 A B4 G | - r8 G G G16 A B4 G | - r8 E16 Fis G8 G Fis! G G Fis! | + [g8 g g g] g4 [d16 e f d] | + [e8 c ][ c c16 d][ e8 c ][ c c16 d] | + [e8 c ][ c d16 e] f4 e | + [d8 G] c2 B4 | + [c8 G ][ G G16 A] B4 G | + r8 G [G G16 A] B4 G | + r8 [E16 Fis ][ G8 G] [ Fis! G G Fis!] | G2 r | r1 | - r16 d c B A G Fis E D8 d d d16 c | - B8 d d d16 c B8 d d d16 e | + r16 [d c B ][ A G Fis E] [D8 d ][ d d16 c] | + [B8 d ][ d d16 c][ B8 d ][ d d16 e] | fis4 g2 fis!4 | - r16 g f e d c B A G8 g g g16 f | - e8 g g g16 f e8 g g g16 a | + r16 [g f e ][ d c B A][ G8 g ][ g g16 f] | + [e8 g ][ g g16 f][ e8 g ][ g g16 a] | b4 c'2 b4 | - c'8 g g g16 f e4 d | - r8 g g g16 f e4 d | - r8 d16 A B8 B16 c A2 | + [c'8 g ][ g g16 f] e4 d | + r8 g [g g16 f] e4 d | + r8 [d16 A ][ B8 B16 c] A2 | B1 | \meter 3/2; + \tempo 2=140; r4 d d d d d | e1. | r4 c c c c c | d1. | - r4 d8 c B4 c8 d G4 A8 B | + r4 [d8 c] B4 [c8 d] G4 [A8 B] | E1. | - r4 e8 d cis4 d8 e A4 B8 cis! | + r4 [e8 d] cis4 [d8 e] A4[ B8 cis!] | Fis1. | r4 d d d d d | - e e8 d c4 d8 e A4 B8 c | - Fis4 fis8 e d4 e8 fis! B4 c8 d | + e [e8 d] c4 [d8 e] A4 [B8 c] | + Fis4 [fis8 e] d4 [e8 fis!] B4 [c8 d] | G4 g g g g g | - a4 c'8 b a4 b8 c' f4 g8 a | + a4 [c'8 b] a4 [b8 c'] f4 [g8 a] | d4 g g g g g | - a d8 c B4 c8 d A2 | + a [d8 c] B4 [c8 d] A2 | \meter 4/4; + \tempo 4=80; B1 | - d8 d d d d4 A16 B c A | - B8 G G G16 A B8 G G G16 A | - B8 G c2 B4 | + [d8 d d d] d4 [A16 B ][ c A] | + [B8 G ][ G G16 A] [B8 G ][ G G16 A] | + [B8 G] c2 B4 | c2 r | - g8 g g g g4 d16 e f d | - e8 G G G16 A B8 d d d16 e | + [g8 g g g] g4 [d16 e f d] | + [e8 G ][ G G16 A] [B8 d ][ d d16 e] | fis4 g2 fis!4 | - r16 g f e d c B A G8 g g g16 f | - e2 r8 d d d16 e | - fis a g fis e d c B A8 d d d16 e | + r16 [g f e ][ d c B A] [G8 g ][ g g16 f] | + e2 r8 d [d d16 e] | + [fis a g fis ][ e d c B] [A8 d ][ d d16 e] | fis4 g2 fis!4 | \cadenza 1; g\breve @@ -114,62 +121,62 @@ vi2=\melodic{ \octave c''; r1 | r | r | - d8 d d d d4 A16 B c A | - B8 G G G16 A B8 G G G16 A | - B8 G G A16 B c4 B | - A8 D G2 Fis4 | + [d8 d d d] d4 [A16 B c A] | + [B8 G ][ G G16 A] [B8 G ][ G G16 A] | + [B8 G ][ G A16 B] c4 B | + [A8 D] G2 Fis4 | G2 r2 | r1 | - g8 g g g g4 d16 e f d | - e8 c c c16 d e8 c c c16 d | - e8 c c d16 e f4 e | - d8 G c2 B4 | + [g8 g g g] g4 [d16 e f d] | + [e8 c ][ c c16 d] [e8 c ][ c c16 d] | + [e8 c ][ c d16 e] f4 e | + [d8 G] c2 B4 | c2 r | r1 | - g8 g g g g4 d16 e f d | - e2 r8 G G G16 A | - B4 G r8 G G A16 B + [g8 g g g] g4 [d16 e f d] | + e2 r8 G [G G16 A] | + B4 G r8 G [G A16 B] | c4 B A2 | - G r16 d c B A G Fis E | - D8 d d d16 c B8 d d d16 e | + G r16 [d c B ][ A G Fis E] | + [D8 d ][ d d16 c] [B8 d ][ d d16 e] | fis4 g g4. fis!8 | g2 r | - r16 d c B A G Fis E D8 d d d16 c | + r16 [d c B ][ A G Fis E] [D8 d ][ d d16 c] | B4 c2 B4 | c d G2 | - r16 g f e d c B A G8 g g g16 f | - e4 d r8 g g g16 f | - e4 d r8 c16 G B8 B16 c | + r16 [g f e ][ d c B A] [G8 g ][ g g16 f] | + e4 d r8 g [g g16 f] | + e4 d r8 [c16 G ][ B8 B16 c] | A4 G2 Fis4 | G1 | \meter 3/2; r1. | - r4 g8 f e4 f8 g c4 d8 e | + r4 [g8 f] e4 [f8 g] c4 [d8 e] | A1. | - r4 a8 g fis4 g8 a d4 e8 fis! | + r4 [a8 g] fis4 [g8 a] d4 [e8 fis!] | B1. | r4 g g g g g | a1. | r4 a a a a a | - b d8 c B4 c8 d G4 A8 B | - E4 g8 f e4 f8 g c4 d8 e | - A4 a8 g fis4 g8 a d4 e8 fis! | - B4 b8 a g4 a8 b e4 fis8 g | + b [d8 c] B4 [c8 d] G4 [A8 B] | + E4 [g8 f] e4 [f8 g] c4 [d8 e] | + A4 [a8 g] fis4 [g8 a] d4 [e8 fis!] | + B4 [b8 a] g4 [a8 b] e4 [fis8 g] | c4 A A A A A | - B d8 c B4 c8 d D4 E | + B [d8 c] B4 [c8 d] D4 E | Fis2 G Fis! | \meter 4/4; G1 | r1 | r1 | - g8 g g g g4 d16 e f d | - e8 c c c16 d e8 G G G16 A | - B8 G c2 B4 | + [g8 g g g] g4 [d16 e f d] | + [e8 c ][ c c16 d] [e8 G ][ G G16 A] | + [B8 G] c2 B4 | c2 r | - r16 d c B A G Fis E D8 d d d16 c | + r16 [d c B ][ A G Fis E] [D8 d ][ d d16 c] | B4 c2 B4 | - c8 G G G16 A B d c B A G Fis E | - D8 d d d16 e fis16 a g fis e d c B | - A d c B A G Fis E D4 d | + [c8 G ][ G G16 A] [B d c B ][ A G Fis E] | + [D8 d ][ d d16 e] [fis16 a g fis ][ e d c B] | + [A d c B ][ A G Fis E] D4 d | \cadenza 1; B\breve \bar "|."; @@ -198,7 +205,6 @@ bc=\melodic{ G1 | \meter 3/2; g1. | c | - % 30 f | d^"\\textsharp" | g | c | A | d^"\\textsharp" | @@ -229,13 +235,24 @@ bc=\melodic{ %linewidth=18.\cm; %\output "gallina.out"; gourlay_maxmeasures=7.; +%%%% Uncomment to get the original layout without beams. +%%%% Compare to the definition in init/engraver.ly. +% Voice = \translator { +% \type "Engraver_group_engraver"; +% \consists "Dynamic_engraver"; +% \consists "Rest_engraver"; +% \consists "Stem_engraver"; +% \consists "Plet_engraver"; +% % \consists "Beam_engraver"; +% \consists "Beam_req_swallow_translator"; +% \consists "Abbreviation_beam_engraver"; +% \consists "Script_engraver"; +% \consists "Rhythmic_column_engraver"; +% \consists "Slur_engraver"; +% \accepts "Thread"; +% } } \midi{ - \tempo 4=90; + \tempo 4=80; } } - - - - - diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly index 20f454567e..86774fc1ba 100644 --- a/mutopia/los-toros-oboe.ly +++ b/mutopia/los-toros-oboe.ly @@ -12,8 +12,8 @@ copyright = "public domain"; hoboonestart = \melodic{ % ugh: can't copy: allegro/primo tempo \octave c'; - \textstyle "roman"; - [es'16-.-"Allegro" es'-. es'-. es'-.] [es'8-. d'-.] | + \textstyle "large"; + [es'16-.^"Allegro" es'-. es'-. es'-.] [es'8-. d'-.] | \textstyle "italic"; } @@ -26,7 +26,7 @@ hobooneintro = \melodic{ [bes16( c' d' es'] [)d'8 c'-.] | [bes-. as->~] [as16( g f g] | [as bes c' d'] [)es'8 c'-.] | - [d'8-. c'16( bes] )a4 ~ | + [d'8-. c'16( bes] )as4 ~ | [as16 g( f g] [as c' bes as] | % [)g8 as16 g(] [)f8 g16( f] | [)g8 as16 g(] [)f8 g16( f] | @@ -75,28 +75,32 @@ hoboonemid = \melodic{ [f'8.-> f'16] [f'8 f'] | [bes'8-. as'16( g'] )f'4 ~ | [f'16 es'( d' es'] [f' as' g' )f'] | - [es'( g' f' es'] [d' g' es' d'] | + [es'( g' f' es'] [d' f' es' d'] | [c' es' d' c'] [b d' c' b] | [a c' bes a] [g bes a g] | [fis a g fis] [e g fis )e] | % `a deux [d8 d'] [es'8.-> c'16] | [a8 bes g es] | - [c' d' es8. bes16] | + [c' d' es'8. bes16] | [g8 es bes c] | [d16-. d-. d-. d-.] [d8.-. es16->] | [d'16-.-"cresc." d'-. d'-. d'-.] [d'8.-. es'16->] | [d'16-. d'-. d'-. d'-.] [d'8.-. es'16->] | - [d'16 d' d' d'] [d'8 es'16-.] r16-\fermata-"court"-"tr\\`es" | + [d'16 d' d' d'] [d'8 es'16-.] r16-\fermata^"court"^"tr\\`es" | % Un peu plus lent. - \textstyle "roman"; + \textstyle "bold"; % ugh % d'4(\<^"Un peu plus lent" \textstyle "italic; _"tr\\`es \\'el\\'egant" - d'4(\<^"Un peu plus lent" +% d'4(\<^"Un peu plus lent" + d'4(\< \textstyle "italic"; [e'8_"tr\\`es \\'el\\'egant" \!f'8] | - [)b'-. a'-.] [g16( fis' e' )d'] | +% [)b'-. a'-.] [g16( fis' e' )d'] | + \textstyle "bold"; + [)b'-.^"Un peu plus lent" a'-.] [g16( fis' e' )d'] | + \textstyle "italic"; [d'( c' b\< c'] [)\!f'8-. e'-.] | d4-> ~ [d16 e( fis g] | [a b\< d' fis] [)\!a'8-. g'-.] | @@ -132,7 +136,7 @@ hoboonemid = \melodic{ hoboonesecondstart = \melodic{ \octave c'; % ugh: can't copy: allegro/primo tempo - \textstyle "roman"; + \textstyle "large"; [es'16-.\ff^"Tempo 1$^o$" es'-. es'-. es'-.] [es'8-. d'-.] | \textstyle "italic"; @@ -171,7 +175,6 @@ hoboonelast = \melodic{ [bes16-.-"cresc." bes-. bes-. bes-.] [bes8-. ces'->] | % same measure [bes16-. bes-. bes-. bes-.] [bes8-. ces'->] | - \textstyle "roman"; [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" @@ -207,7 +210,7 @@ hoboonelast = \melodic{ g'8-. r f4-> ~ | [f'8 es'-. ces'8.-. as16-.] | % `a deux - \textstyle "roman"; + \textstyle "large"; [ces'8.->^"Plus vite" bes16-.(] [a bes es' d'] | \textstyle "italic"; [)c!8.-> bes16] [a( bes es' )d'] | @@ -218,7 +221,9 @@ hoboonelast = \melodic{ [g' )f' d'( es'] [f' g' as' a'] | [c'' )bes' bes( c'] [d' es' f' g'] | [as' g' f' g'] [as' bes' c'' d''] | + \textstyle "large"; [)es''-.^"Tempo 1$^o$" g'-. g'-. g-.] [g'8-. g'-.] | + \textstyle "italic"; bes'4.-> g'8-. | gis'2->( | )as'! | @@ -233,7 +238,7 @@ hoboonelast = \melodic{ g'4.-> g'8-. | es'4.-> es'8-. | bes4.-> bes8-. | - \textstyle "roman"; + \textstyle "large"; g'4.->^"Presto" g'8-. | \textstyle "italic"; es'4.-> es'8-. | @@ -256,12 +261,14 @@ hoboone = \melodic { global = \melodic{ \key bes es as; \meter 2/4; - \skip 4*106; + \skip 4*110; + \key fis; | \bar "||"; - \key fis; - \skip 4*60; + \skip 4*58; + \key bes es as; | \bar "||"; - \key bes es as; + \skip 4*206; + \bar "|."; } @@ -280,7 +287,7 @@ a4 = \paper{ \$staff_hoboone \paper{ \a4 } \midi{ - \tempo 4 = 120; + \tempo 4 = 80; } } diff --git a/test/GNUmakefile b/test/GNUmakefile new file mode 100644 index 0000000000..65b8488c06 --- /dev/null +++ b/test/GNUmakefile @@ -0,0 +1,45 @@ +# test/GNUmakefile +# +# This file helps maintainers to keep their Makefile.am automatically +# up to date using GNU make features. +# If you don't have (or run) GNU make, Makefile.am will not be updated +# automatically when source files are added/removed. + +# automake/wild-make should generate this file from Makefile.am.wild + +#ugh +Makefile=$(wildcard Makefile) +# are we configured here, or are we using --srcdir +ifeq ($(Makefile),Makefile) + +include Makefile + +biltdir=. + +else + +#ugh +biltdir=../flowertest + +make-in-build: wild-check + exec $(MAKE) -C $(biltdir) + +# include Makefile +include $(biltdir)/Makefile + +endif + +# Makefile.am.wild: TEST_SCRIPTS = $(wildcard *.sh) +CURRENT_TEST_SCRIPTS = $(wildcard *.sh) + +wild-check: check-test-scripts + +check-test-scripts: +ifneq ($(TEST_SCRIPTS),$(CURRENT_TEST_SCRIPTS)) + @echo \"$(TEST_SCRIPTS)\" + @echo \"$(CURRENT_TEST_SCRIPTS)\" + @echo TEST_SCRIPTS changed: rerunning make-wild. + @-rm -f Makefile.am + $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am +endif + diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 0000000000..88f709d5da --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,24 @@ +# Generated automatically by wild-perl 0.1 +# project LilyPond -- the musical typesetter +# title makefile for test +# file test/Makefile.am.wild + +TEST_SCHRIFTEN = check-lily-midi.sh check-lily-paper.sh check-mi2mu.sh + +# ugh ugh +TESTS = $(top_srcdir)/test/check-lily-midi.sh $(top_srcdir)/test/check-lily-paper.sh $(top_srcdir)/test/check-mi2mu.sh + +INPUTS = test.midi + +RESULTS = ok.midi ok.tex ok.ly + +EXTRA_DIST = Makefile.am.wild GNUmakefile $(TEST_SCHRIFTEN) $(INPUTS) $(RESULTS) + +# override default target for all-am: to get an extra dependency +all-am: Makefile $(PROGRAMS) wild-check + +# dummy target for non-GNU makes; is overridden in GNUmakefile +wild-check: + +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/test/Makefile.am.wild b/test/Makefile.am.wild new file mode 100644 index 0000000000..7d7fdcb0cd --- /dev/null +++ b/test/Makefile.am.wild @@ -0,0 +1,21 @@ +# project LilyPond -- the musical typesetter +# title makefile for test +# file test/Makefile.am.wild + +TEST_SCHRIFTEN = $(wildcard *.sh) + +# ugh ugh +TESTS = $(top_srcdir)/test/check-lily-midi.sh $(top_srcdir)/test/check-lily-paper.sh $(top_srcdir)/test/check-mi2mu.sh + +INPUTS = test.midi + +RESULTS = ok.midi ok.tex ok.ly + +EXTRA_DIST = Makefile.am.wild GNUmakefile $(TEST_SCHRIFTEN) $(INPUTS) $(RESULTS) + +# override default target for all-am: to get an extra dependency +all-am: Makefile $(PROGRAMS) wild-check + +# dummy target for non-GNU makes; is overridden in GNUmakefile +wild-check: + diff --git a/test/Makefile.in b/test/Makefile.in new file mode 100644 index 0000000000..3c032b6410 --- /dev/null +++ b/test/Makefile.in @@ -0,0 +1,240 @@ +# Makefile.in generated automatically by automake 1.2f from Makefile.am + +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1 +# project LilyPond -- the musical typesetter +# title makefile for test +# file test/Makefile.am.wild + + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = .. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AGE = @AGE@ +AUTOGENERATE = @AUTOGENERATE@ +BISON = @BISON@ +CC = @CC@ +COMPILEINFO = @COMPILEINFO@ +CPPFLAGS = @CPPFLAGS@ +CURRENT = @CURRENT@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +DIR_DATADIR = @DIR_DATADIR@ +EXTRA_LIBES = @EXTRA_LIBES@ +FIND = @FIND@ +FLEX = @FLEX@ +ICFLAGS = @ICFLAGS@ +ILDFLAGS = @ILDFLAGS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LIBTOOL = @LIBTOOL@ +LN = @LN@ +LN_S = @LN_S@ +MAKE = @MAKE@ +MAKEINFO = @MAKEINFO@ +MFDIR = @MFDIR@ +NM = @NM@ +PACKAGE = @PACKAGE@ +PERL = @PERL@ +POD2HTML = @POD2HTML@ +POD2MAN = @POD2MAN@ +PYTHON = @PYTHON@ +RANLIB = @RANLIB@ +REVISION = @REVISION@ +TAR = @TAR@ +TEXDIR = @TEXDIR@ +TEXPREFIX = @TEXPREFIX@ +VERSION = @VERSION@ +YACC = @YACC@ +ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ + +TEST_SCHRIFTEN = check-lily-midi.sh check-lily-paper.sh check-mi2mu.sh + +# ugh ugh +TESTS = $(top_srcdir)/test/check-lily-midi.sh $(top_srcdir)/test/check-lily-paper.sh $(top_srcdir)/test/check-mi2mu.sh + +INPUTS = test.midi + +RESULTS = ok.midi ok.tex ok.ly + +EXTRA_DIST = Makefile.am.wild GNUmakefile $(TEST_SCHRIFTEN) $(INPUTS) $(RESULTS) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../flower/config.hh +CONFIG_CLEAN_FILES = +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +GZIP = --best +default: all + +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps test/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +tags: TAGS +TAGS: + + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = test + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ + done +check-TESTS: $(TESTS) + @failed=0; all=0; \ + srcdir=$(srcdir); export srcdir; \ + for tst in $(TESTS); do \ + if test -f $$tst; then dir=.; \ + else dir="$(srcdir)"; fi; \ + if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \ + all=`expr $$all + 1`; \ + echo "PASS: $$tst"; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="$$failed of $$all tests failed"; \ + fi; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0 +info: +dvi: +check: all + $(MAKE) check-TESTS +installcheck: +install-exec: + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) + +install: install-exec install-data all + @: + +uninstall: + +all: Makefile + +install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install +installdirs: + + +mostlyclean-generic: + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-generic + +clean: clean-generic mostlyclean + +distclean: distclean-generic clean + -rm -f config.status + -rm -f libtool + +maintainer-clean: maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +.PHONY: default tags distdir check-TESTS info dvi installcheck \ +install-exec install-data install uninstall all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# override default target for all-am: to get an extra dependency +all-am: Makefile $(PROGRAMS) wild-check + +# dummy target for non-GNU makes; is overridden in GNUmakefile +wild-check: + +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/test/check-lily-midi.sh b/test/check-lily-midi.sh new file mode 100644 index 0000000000..6ce2758490 --- /dev/null +++ b/test/check-lily-midi.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# check-lily-midi.sh + +# out=check-lily.midi +# ugh -o is broken +out=lelie.midi +ok=$LILYPOND_SOURCEDIR/test/ok.midi +cat <<EOF | lilypond -T -o $out +\score{ + \melodic{ + c d e f g a b c' + } + \midi{} +} +EOF + +# ugh +cmp $out $ok +exit $? + diff --git a/test/check-lily-paper.sh b/test/check-lily-paper.sh new file mode 100644 index 0000000000..1829154a4f --- /dev/null +++ b/test/check-lily-paper.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# check-lily-paper.sh + +# out=check-lily.tex +# ugh -o is broken +out=lelie.tex +ok=$LILYPOND_SOURCEDIR/test/ok.tex +cat <<EOF | lilypond -T # -o $out +\score{ + \melodic{ + c d e f g a b c' + } + \paper{} +} +EOF + +# ugh +diff $out $ok +exit $? + diff --git a/test/check-mi2mu.sh b/test/check-mi2mu.sh new file mode 100644 index 0000000000..b445a0373a --- /dev/null +++ b/test/check-mi2mu.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +out=check-mi2mu.ly +# out=check-lily.midi +# ugh -o is broken +out=test.midi.ly +ok=$LILYPOND_SOURCEDIR/test/ok.ly +mi2mu -T $LILYPOND_SOURCEDIR/test/test.midi # -o $out + +# ugh +diff $out $ok +exit $? + diff --git a/test/ok.ly b/test/ok.ly new file mode 100644 index 0000000000..c8b050f494 --- /dev/null +++ b/test/ok.ly @@ -0,0 +1,41 @@ +% Creator: GNU LilyPond +% Automatically generated. +% from input file: /home/fred/lelie/current/test/test.midi + +\version "0.1.9"; +$Track_0 = \melodic{ + % midi copyright: + % instrument: + \duration 4; + % Creator: GNU LilyPond + + % Automatically generated. + + % from musical definition: : 1 + % Track 0 + \tempo 4=60; + +} % Track 0 + +$track1 = \melodic{ + % midi copyright: + % instrument:piano + \duration 4; + + % piano + \tempo 4=60; + c4 d4 e4 f4 | + % 2 + g4 a4 b4 c'4 + +} % track1 + +\score{ + \multi 3 < \type Staff + < \melodic{ \$track1 } > + > + \paper{} + \midi{ + \tempo 4=60; + } +} diff --git a/test/ok.midi b/test/ok.midi Binary files differnew file mode 100644 index 0000000000..08f8f59bcd --- /dev/null +++ b/test/ok.midi diff --git a/test/ok.tex b/test/ok.tex new file mode 100644 index 0000000000..c75af774b2 --- /dev/null +++ b/test/ok.tex @@ -0,0 +1,283 @@ +% Creator: GNU LilyPond +% Automatically generated. +% outputting Score, defined at: : 1 +\def\LilyIdString{Lily was here, 0.1.52.jcn6}% +% + \def\mudelapaperlinewidth{441.017717}% +% +\def\mudelapaperindent{28.452756}% +% +\def\mudelapaperrulethickness{0.400000}% +% +\def\mudelapaperbarsize{16.000000}% +% +\def\mudelapaperinterline{4.000000}% +% +\def\mudelapapernotewidth{5.930000}% +% +\def\mudelapaperwholewidth{8.640000}% +% +\def\mudelapaperunitspace{22.000000}% +% +\def\mudelapaperbasicspace{4.000000}% +% +\def\mudelapapergeometric{0.000000}% +% +\def\mudelapaperarithmetic_basicspace{2.000000}% +% +\def\mudelapaperarithmetic_multiplier{4.800000}% +% +\def\mudelapaperinterbeam{3.140000}% +% +\def\mudelapapergourlay_energybound{100000.000000}% +% +\def\mudelapapergourlay_maxmeasures{14.000000}% +% +\def\mudelapapercastingalgorithm{1.000000}% +% +\input lilyponddefs \musixsixteendefs%(Tex id) +\turnOnPostScript% +\hbox{%<- line of score +\placebox{-16.000pt }% + {79.326pt }% + {\placebox{0.000pt }% + {5.080pt }% + {\stem{-25.039pt }% + {0.000pt }% + }% + }% + \placebox{-16.000pt }% + {79.326pt }% + {\placebox{-26.000pt }% + {0.000pt }% + {\quartball}% + \placebox{-24.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-20.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-16.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-12.000pt }% + {0.000pt }% + {\quartledger}% + }% + \placebox{-16.000pt }% + {120.670pt }% + {\placebox{0.000pt }% + {5.080pt }% + {\stem{-23.039pt }% + {0.000pt }% + }% + }% + \placebox{-16.000pt }% + {120.670pt }% + {\placebox{-24.000pt }% + {0.000pt }% + {\quartball}% + \placebox{-24.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-20.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-16.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-12.000pt }% + {0.000pt }% + {\quartledger}% + }% + \placebox{-16.000pt }% + {162.013pt }% + {\placebox{0.000pt }% + {5.080pt }% + {\stem{-21.039pt }% + {0.000pt }% + }% + }% + \placebox{-16.000pt }% + {162.013pt }% + {\placebox{-22.000pt }% + {0.000pt }% + {\quartball}% + \placebox{-20.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-16.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-12.000pt }% + {0.000pt }% + {\quartledger}% + }% + \placebox{-16.000pt }% + {203.357pt }% + {\placebox{0.000pt }% + {5.080pt }% + {\stem{-19.039pt }% + {0.000pt }% + }% + }% + \placebox{-16.000pt }% + {203.357pt }% + {\placebox{-20.000pt }% + {0.000pt }% + {\quartball}% + \placebox{-20.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-16.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-12.000pt }% + {0.000pt }% + {\quartledger}% + }% + \placebox{-16.000pt }% + {244.700pt }% + {\placebox{0.000pt }% + {0.000pt }% + {\maatstreep{16.000pt }% + }% + }% + \placebox{-16.000pt }% + {275.644pt }% + {\placebox{0.000pt }% + {5.080pt }% + {\stem{-17.039pt }% + {0.000pt }% + }% + }% + \placebox{-16.000pt }% + {275.644pt }% + {\placebox{-18.000pt }% + {0.000pt }% + {\quartball}% + \placebox{-16.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-12.000pt }% + {0.000pt }% + {\quartledger}% + }% + \placebox{-16.000pt }% + {316.987pt }% + {\placebox{0.000pt }% + {5.080pt }% + {\stem{-15.039pt }% + {0.000pt }% + }% + }% + \placebox{-16.000pt }% + {316.987pt }% + {\placebox{-16.000pt }% + {0.000pt }% + {\quartball}% + \placebox{-16.000pt }% + {0.000pt }% + {\quartledger}% + \placebox{-12.000pt }% + {0.000pt }% + {\quartledger}% + }% + \placebox{-16.000pt }% + {358.331pt }% + {\placebox{0.000pt }% + {5.080pt }% + {\stem{-13.039pt }% + {0.000pt }% + }% + }% + \placebox{-16.000pt }% + {358.331pt }% + {\placebox{-14.000pt }% + {0.000pt }% + {\quartball}% + \placebox{-12.000pt }% + {0.000pt }% + {\quartledger}% + }% + \placebox{-16.000pt }% + {399.674pt }% + {\placebox{0.000pt }% + {5.080pt }% + {\stem{-11.039pt }% + {2.000pt }% + }% + }% + \placebox{-16.000pt }% + {399.674pt }% + {\placebox{-12.000pt }% + {0.000pt }% + {\quartball}% + \placebox{-12.000pt }% + {0.000pt }% + {\quartledger}% + }% + \placebox{-16.000pt }% + {50.383pt }% + {\placebox{0.000pt }% + {0.000pt }% + {}% + }% + \placebox{-16.000pt }% + {31.943pt }% + {\placebox{-4.000pt }% + {0.000pt }% + {\violinclef}% + }% + \placebox{-16.000pt }% + {28.453pt }% + {\placebox{8.000pt }% + {0.000pt }% + {\rulesym{0.400pt }% + {412.565pt }% + }% + \placebox{4.000pt }% + {0.000pt }% + {\rulesym{0.400pt }% + {412.565pt }% + }% + \placebox{0.000pt }% + {0.000pt }% + {\rulesym{0.400pt }% + {412.565pt }% + }% + \placebox{-4.000pt }% + {0.000pt }% + {\rulesym{0.400pt }% + {412.565pt }% + }% + \placebox{-8.000pt }% + {0.000pt }% + {\rulesym{0.400pt }% + {412.565pt }% + }% + }% + \placebox{-16.000pt }% + {440.378pt }% + {\placebox{0.000pt }% + {0.000pt }% + {\maatstreep{16.000pt }% + }% + }% + \placebox{-16.000pt }% + {28.453pt }% + {\placebox{0.000pt }% + {0.000pt }% + {\hbox{}% + }% + }% + \placebox{0.000pt }% + {28.453pt }% + {\placebox{0.000pt }% + {0.000pt }% + {\hbox{}% + }% + }% + }% +\interscoreline% +\EndLilyPondOutput diff --git a/test/test.midi b/test/test.midi Binary files differnew file mode 100644 index 0000000000..08f8f59bcd --- /dev/null +++ b/test/test.midi diff --git a/tex/Makefile.am b/tex/Makefile.am index 292c059710..03be784a5b 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 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 +TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex EXTRA_DIST = Makefile.am.wild $(TEXFILES) -CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex +CLEANFILES = install-data-local: $(INSTALL) -d $(TEXDIR)/lilypond @@ -14,4 +14,4 @@ uninstall-local: for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done -rmdir $(TEXDIR)/lilypond/ $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/tex/Makefile.in b/tex/Makefile.in index c50d1b2eec..c18e463893 100644 --- a/tex/Makefile.in +++ b/tex/Makefile.in @@ -100,10 +100,10 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -TEXFILES = dyndefs.tex eglerdefs.tex feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex +TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex EXTRA_DIST = Makefile.am.wild $(TEXFILES) -CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex +CLEANFILES = mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../flower/config.hh CONFIG_CLEAN_FILES = diff --git a/tex/feta11.tex b/tex/feta11.tex deleted file mode 100644 index 51cd339b9d..0000000000 --- a/tex/feta11.tex +++ /dev/null @@ -1,87 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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 deleted file mode 100644 index be72ab40af..0000000000 --- a/tex/feta13.tex +++ /dev/null @@ -1,87 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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 deleted file mode 100644 index bf27fbc151..0000000000 --- a/tex/feta16.tex +++ /dev/null @@ -1,87 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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 deleted file mode 100644 index 29ccfc60b9..0000000000 --- a/tex/feta19.tex +++ /dev/null @@ -1,87 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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 deleted file mode 100644 index 03aa8086b6..0000000000 --- a/tex/feta20.tex +++ /dev/null @@ -1,87 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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 deleted file mode 100644 index f4619e014c..0000000000 --- a/tex/feta23.tex +++ /dev/null @@ -1,87 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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 deleted file mode 100644 index 76079b033f..0000000000 --- a/tex/feta26.tex +++ /dev/null @@ -1,87 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from 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/lilyponddefs.tex b/tex/lilyponddefs.tex index 67cfd2e3bf..d73f989630 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -78,6 +78,7 @@ \font\smalltextfont=cmr8 \font\boldfont=cmbx10 \font\textmusic=cmmi12 + \font\largefont=cmbx12 } \def\cmrsixteen{ \font\smalltextfont=cmr6 @@ -86,6 +87,7 @@ \font\italicfont=cmti9 \font\textmusic=cmmi10 \font\boldfont=cmbx8 + \font\largefont=cmbx10 } \def\cmreleven{ \font\smalltextfont=cmr5 @@ -94,6 +96,7 @@ \font\italicfont=cmti6 \font\textmusic=cmmi8 \font\boldfont=cmbx6 + \font\largefont=cmbx8 } \def\cmrthirteen{ @@ -103,6 +106,7 @@ \font\italicfont=cmti7 \font\textmusic=cmmi9 \font\boldfont=cmbx7 + \font\largefont=cmbx9 } \def\musixsixteendefs{ \sixteenfonts @@ -226,6 +230,7 @@ \def\setbold#1{\boldfont #1} \def\setdynamic#1{\dynfont #1} \def\setfinger#1{\fingerfont #1} +\def\setlarge#1{\largefont #1} % the interline symbol. Redefine to remove it. \def\defaultlineseparator{\vbox{\mussepline\vskip -5pt\mussepline}} |