From 5f42fe18c41237a73d99fd76b34e434a33598704 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 25 Feb 1999 11:35:41 +0100 Subject: [PATCH] release: 1.1.33 --- Documentation/tex/refman.yo | 8 +- NEWS | 24 +- TODO | 70 +- VERSION | 4 +- aclocal.m4 | 49 +- buildscripts/mf-to-table.py | 56 +- buildscripts/set-lily.sh | 5 +- configure | 8 +- debian/changelog | 17 + debian/control | 2 +- debian/control.foka | 5 +- debian/control.in | 2 +- debian/copyright | 4 +- debian/out/control | 2 +- debian/postinst | 9 +- debian/rules | 53 +- lily/atom.cc | 2 +- lily/bar-script-engraver.cc | 6 +- lily/include/atom.hh | 4 +- lily/include/local-key-item.hh | 34 +- lily/include/molecule.hh | 2 + lily/include/multi-measure-rest.hh | 5 +- lily/include/musical-pitch.hh | 4 +- lily/include/span-bar.hh | 12 +- lily/include/tie-engraver.hh | 9 +- lily/local-key-engraver.cc | 10 +- lily/local-key-item.cc | 36 +- lily/main.cc | 2 +- lily/molecule.cc | 60 +- lily/multi-measure-rest.cc | 17 +- lily/musical-pitch.cc | 3 +- lily/paper-outputter.cc | 16 +- lily/parser.yy | 4 +- lily/score.cc | 2 +- lily/span-bar.cc | 17 +- lily/span-score-bar-engraver.cc | 6 +- lily/text-engraver.cc | 6 + lily/tie-engraver.cc | 68 +- ly/center.ly | 2 +- ly/params.ly | 2 + make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- make/toplevel.make.in | 2 +- mf/GNUmakefile | 21 +- mutopia/GNUmakefile | 2 +- mutopia/N.W.Gade/GNUmakefile | 12 + mutopia/N.W.Gade/README | 16 + mutopia/N.W.Gade/brass.ly | 834 ++++++++++++ mutopia/N.W.Gade/global.ly | 49 + mutopia/N.W.Gade/global.tex | 60 + mutopia/N.W.Gade/parts.ly | 313 +++++ mutopia/N.W.Gade/score.ly | 151 +++ mutopia/N.W.Gade/strings.ly | 1335 ++++++++++++++++++++ mutopia/N.W.Gade/wood.ly | 1066 ++++++++++++++++ scm/lily.scm | 9 +- stepmake/aclocal.m4 | 47 +- stepmake/stepmake/install-out-targets.make | 38 +- stepmake/stepmake/install-targets.make | 39 +- 59 files changed, 4370 insertions(+), 291 deletions(-) create mode 100644 mutopia/N.W.Gade/GNUmakefile create mode 100644 mutopia/N.W.Gade/README create mode 100644 mutopia/N.W.Gade/brass.ly create mode 100644 mutopia/N.W.Gade/global.ly create mode 100644 mutopia/N.W.Gade/global.tex create mode 100644 mutopia/N.W.Gade/parts.ly create mode 100644 mutopia/N.W.Gade/score.ly create mode 100644 mutopia/N.W.Gade/strings.ly create mode 100644 mutopia/N.W.Gade/wood.ly diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo index 6cad45cc87..251d65d461 100644 --- a/Documentation/tex/refman.yo +++ b/Documentation/tex/refman.yo @@ -522,7 +522,7 @@ mudela(fragment,verbatim,center)( ) Some more elaborate constructions: mudela(fragment,verbatim,center)( -[a'16 c'' ] +[a'16 c'' ] \times 2/3 { [e'8 f' g'] } ) @@ -1475,6 +1475,12 @@ note. Set to \center to align the center of the text with the note. dit(code(textstyle)) Set the text style for superscripts and subscripts. See above for list of text styles. +dit(code(textScriptPadding)) Determines the extra space added between +super-/subscripted text and the closest staff line or note. + +dit(code(textScriptPadding)) Determines the extra space added between +super-/subscripted text and the closest staff line or note. + dit(code(fontsize)) Can be used to select smaller font sizes for music. The normal font size is 0, and the two smaller sizes are -1 and -2. diff --git a/NEWS b/NEWS index fb55118cd3..6034166157 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,27 @@ +pl 32.mb1 + - bf: \> and \< were interchanged!! + - Added property: textScriptPadding + - Changed copyright text on the Gade score. + +pl 32.uu1 + - really include Gade score now. + - fixes: install-[out-]targets, INSTALLATION_[OUT_]SUFFIXES + - install TFMs in separate dir. +pl 31.hwn3 + - Span_bar bugfix (there you go, Mats). + - bf: Score copy ctor (-> bf declaring score) + - new Tie behavior: only tie identical pitches, switchable with +oldTieBehavior + - junked cautionary_b_ from Musical_pitch + pl 32.jcn1 - - set-lily: set weird locale links for $LILYPONDPREFIX + - set-lily: set weird locale links for $LILYPONDPREFIX + +********** +pl 31.mb2 + - Added example: "Imellan Fjeldene" by Niels W. Gade. + - bf: don't attach staff margin text to clef changes within the + lines. (Still not perfect: no text when a clef change happens pl 31.hwn2 - be somewhat lazy in break/object multiplication. diff --git a/TODO b/TODO index c4ca40e195..31eec353bf 100644 --- a/TODO +++ b/TODO @@ -14,20 +14,6 @@ Grep for TODO and ugh/ugr/urg. . * mutopia/J.S.Bach/wtk1-fugue2.ly . * input/test/grace . * fix: text on rests: ridiculous dims -. * m=\notes\relative c''{ - -c1 | \break -R1*5 | -r2 r4 \bar "||"; \break r | -c2 c | -} - -\score{ - \type StaffGroup < - \type Staff = staffi {\m} - \type Staff = staffii {\m} - > -} . * m=\notes\relative c'''{ \time 2/4; @@ -71,7 +57,6 @@ c2 c | . * fix dynamics decently, ie. use kerning & ligatures. . * support_l_arr_ empty in staff-margin's G_staff_side_item . * minVerticalAlign for StaffGroups. -. * declaring \score . * fix OrchestralScore and Hara-kiri (i.e., fix Coriolan) . * Phrasing: Indicating the textual underlay of a piece, or otherwise dividing a piece into phrases. @@ -81,7 +66,61 @@ present, they're not properly distinguished) but no distinct way to specify the third. Should there be? .* TODO before 1.2 +. * Gade score +. * In the score, the staff lines extend too far to the left. + This is also illustrated in the second score of span-bars.ly + as I've pointed out earlier. +. *m=\notes\relative c''{ + \property Staff.instr = "Instr " + \key f; + f4 \p \< g a bes | + c d e \f \! f | + f e d c | + bes \mf a g f \pp + } + +n=\notes\relative c'{ + \property Staff.instr = "Instr " + \key f; + f4 \mp g a \< bes | + c d e \ff \! f | + f e d c | + bes \mp a g f \ppp + } + +\score{ + \type StaffGroup < + \type Staff = a <{\stemup \property Voice.dynamicDir = \down \m} + {\stemdown \property Voice.dynamicDir = \up \n}> + > +} +. * The minimum distance between different staffs works only within + StaffGroups, not between StaffGroups. The Gade Score looks quite + strange on the pages where the Timpani and/or Brass sections don't + play. I've set the minimum distance with: + \translator { + \OrchestralScoreContext + minVerticalAlign = 2.5*\staffheight; + } + + I sent a copy of the score to the conductor and his reaction was + that it would be easy to fix some "spacing problems" with Finale, + if we could convert the score to Finale. I'm not sure what he + meant, since we just have had mail conversations so far. Maybe + it's the staff distances I mentioned above. + +. * For the trumpet and horn parts, I wrote two parts on the same + staff line in the score. I haven't managed to get different + directions of the dynamics for the two parts. + Voice.dynamicDir seems to set the direction for the full staff. +. * hangOnClef with non-breakable clefs. +. * use an alist for Score_elem "properties". . * Check gcc 2.8.1 compatibility +. * Document source code. +. * limit memory usage; the full coriolan takes up too much resources. +. * Sort items after breaking in order of linenumber. Then be more + eficient with finding +. * Do Mark & sweep GC for Score_elems, junk backlinks. . * make "in-between" engraver (Tie, Extender) . * use Drul_array for Interval. . * compulsory hshift @@ -103,6 +142,7 @@ of property. . * fix partial measures in meaningful way. . * fix AFM for BlueSky AFM files. . * working notehead style. +. * remove links to non-free SW. . * add scripts to bars eg. |^"bla" . * relative mode for mi2mu . * uniformise recent feta contributions. diff --git a/VERSION b/VERSION index 68855f217e..374f94ba07 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=32 -MY_PATCH_LEVEL=jcn1 +PATCH_LEVEL=33 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index 38ec73410c..6fb07b65b4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,3 +1,5 @@ +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -165,8 +167,8 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ # gh_scm2doubles,gh_doubles2scm are new in 1.3 GUILE_FLAGS AC_CHECK_LIB(guile, gh_scm2doubles, - LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[[/-_a-zA-Z0-9]]]\+ //g'` $LIBS"; - AC_DEFINE(HAVE_LIBGUILE), , $GUILE_LDFLAGS dnl + [LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[/-_a-zA-Z0-9]]\+ //g'` $LIBS" + AC_DEFINE(HAVE_LIBGUILE)], , $GUILE_LDFLAGS dnl ) if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then AC_STEPMAKE_WARN(You should install guile 1.3 or newer) @@ -358,8 +360,8 @@ AC_DEFUN(AC_STEPMAKE_LEXYACC, [ AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or newer) if test $BISON != "error"; then - bison_version=`$BISON --version| sed 's/^.*version 1.//g' ` - if test $bison_version -lt 25; then + bison_version=`$BISON --version | sed 's/^.*version 1.//g'` + if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then AC_STEPMAKE_WARN(Your bison is a bit old (1.$bison_version). You might have to install 1.25) fi fi @@ -652,6 +654,39 @@ AC_DEFUN(AC_CHECK_SEARCH_RESULT, [ fi ]) +dnl GUILE_FLAGS --- set flags for compiling and linking with Guile +dnl +dnl This macro runs the `guile-config' script, installed with Guile, +dnl to find out where Guile's header files and libraries are +dnl installed. It sets two variables, marked for substitution, as +dnl by AC_SUBST. +dnl +dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build +dnl code that uses Guile header files. This is almost +dnl always just a -I flag. +dnl +dnl GUILE_LDFLAGS --- flags to pass to the linker to link a +dnl program against Guile. This includes `-lguile' for +dnl the Guile library itself, any libraries that Guile +dnl itself requires (like -lqthreads), and so on. It may +dnl also include a -L flag to tell the compiler where to +dnl find the libraries. + +AC_DEFUN([GUILE_FLAGS],[ +## The GUILE_FLAGS macro. + ## First, let's just see if we can find Guile at all. + AC_MSG_CHECKING(for Guile) + guile-config link > /dev/null || { + echo "configure: cannot find guile-config; is Guile installed?" 1>&2 + exit 1 + } + GUILE_CFLAGS="`guile-config compile`" + GUILE_LDFLAGS="`guile-config link`" + AC_SUBST(GUILE_CFLAGS) + AC_SUBST(GUILE_LDFLAGS) + AC_MSG_RESULT(yes) +]) + # Configure paths for GTK+ # Owen Taylor 97-11-3 @@ -678,7 +713,7 @@ dnl LIBS="$LIBS $GTK_LIBS" dnl dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent +dnl checks the results of gtk-config to some extent) dnl AC_TRY_RUN([ #include @@ -759,7 +794,7 @@ AC_DEFUN(AM_PATH_GTKMM, [dnl dnl -dnl Check check if the installed GTK-- is sufficiently new. +dnl Check if the installed GTK-- is sufficiently new. dnl AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) min_gtkmm_version=ifelse([$1], ,0.9.14,$1) @@ -948,7 +983,7 @@ dnl LIBS="$LIBS $GTK___LIBS" dnl dnl Now check if the installed GTK__ is sufficiently new. (Also sanity -dnl checks the results of gtk__-config to some extent +dnl checks the results of gtk__-config to some extent) dnl AC_TRY_RUN([ #include diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py index aab7f94a2b..eb45314a1b 100644 --- a/buildscripts/mf-to-table.py +++ b/buildscripts/mf-to-table.py @@ -1,6 +1,6 @@ #!@PYTHON@ -# mf-to-table.py -- convert spacing info in MF logs .ly and .tex +# mf-to-table.py -- convert spacing info in MF logs .afm and .tex # # source file of the GNU LilyPond music typesetter # @@ -17,7 +17,7 @@ import time (options, files) = getopt.getopt( sys.argv[1:], 'a:d:hl:o:p:t:', - ['afm=', 'outdir=', 'dep=', 'ly=', 'tex=', 'debug', 'help', 'package=']) + ['afm=', 'outdir=', 'dep=', 'tex=', 'debug', 'help', 'package=']) for opt in options: o = opt[0] @@ -140,35 +140,6 @@ class Afm_file (File): def end (self,nm): self.write ('End%s\n' % nm) -class Ly_file(Indentable_file): - """extra provisions for mozarella quirks""" - def print_lit(self, str): - self.write('\"%s\"\t' % str) - - def print_f_dimen(self, f): - dimstr = '%.2f' % f - - # try to mask rounding errors - if (dimstr == '-0.00'): - dimstr = '0.00' - self.write( dimstr +'\\pt\t'); - - def print_dimen(self, str): - self.print_f_dimen(atof(str)) - - def neg_print_dimen(self, str): - self.print_f_dimen(-atof(str)); - - def def_symbol(self, code, lily_id, tex_id, xdim, ydim): - self.print_lit(lily_id) - self.print_lit('\\\\' + tex_id) - - self.neg_print_dimen(xdim [0]) - self.print_dimen(xdim [1]) - self.neg_print_dimen(ydim [0]) - self.print_dimen(ydim [1]) - self.write('\n') - class Log_reader: """Read logs, destill info, and put into output files""" @@ -179,11 +150,8 @@ class Log_reader: tags = split(line, '@:') label = tags[0] name = tags[1] - ly = self.lyfile afm = self.afmfile if tags[0] == 'font': - ly.indent() - ly.write("% name=\\symboltables {\n") self.texfile.write("% name\n") afm.write ('FontName %s\n' % name) @@ -191,18 +159,11 @@ class Log_reader: afm.start ('CharMetrics') afm.fontsize = atof(tags[2]) elif label == "group": - ly.indent() - ly.print_lit(name) - ly.write(' = \\table {\n') self.texfile.write("% " + name + "\n") afm.groupname = name elif label == "puorg": - ly.dedent() - ly.write("}\n") self.texfile.write("\n") elif label == "tnof": - ly.dedent() - ly.write("% } % $name\n") afm.end ('CharMetrics') afm.end('FontMetrics'); elif label == "char": @@ -211,7 +172,6 @@ class Log_reader: texstr = tags [8] xdim = tags[3:5] ydim = tags[5:7] - ly.def_symbol(code, id, texstr, xdim, ydim) self.texfile.write("\\fetdef\\%s{%s}\n" % (texstr, code)) afm.def_symbol (code, id, texstr, xdim, ydim) @@ -233,7 +193,6 @@ class Log_reader: self.depfile.write (x + '\n') def do_file(self,filenm): - self.lyfile.write ('\n% input from ' + filenm + '\n') self.texfile.write ('\n% input from ' + filenm + '\n') feta = Feta_file(filenm) while not feta.eof(): @@ -243,20 +202,17 @@ class Log_reader: self.writedeps (feta.dependencies) - def __init__(self, lyfile_nm, texfile_nm, depfile_nm, afmfile_nm): - self.lyfile = Ly_file(lyfile_nm, 'w') + def __init__(self, texfile_nm, depfile_nm, afmfile_nm): self.texfile = Indentable_file(texfile_nm, 'w') self.depfile = File (depfile_nm, 'w') self.afmfile = Afm_file (afmfile_nm, 'w') headerstr = '%% Creator: %s\n%% Automatically generated on\n%% Do not edit' % \ (program_id() ) - self.lyfile.write(headerstr) self.texfile.write(headerstr) self.depfile.write ('# automatically generated by %s\n' % program_id ()) def close(self): - self.lyfile.close() self.texfile.close() self.depfile.close () @@ -290,7 +246,7 @@ def help(): def main(): identify() - lyfile_nm = texfile_nm = ''; + texfile_nm = ''; depfile_nm = '' afmfile_nm = '' outdir_prefix = '.' @@ -301,8 +257,6 @@ def main(): depfile_nm = a elif o == '--outdir' or o == '-o': outdir_prefix = a - elif o == '--ly' or o == '-l': - lyfile_nm = a elif o == '--tex' or o == '-t': texfile_nm = a elif o== '--help' or o == '-h': @@ -317,7 +271,7 @@ def main(): print o raise getopt.error - log_reader = Log_reader(lyfile_nm, texfile_nm, depfile_nm, afmfile_nm) + log_reader = Log_reader( texfile_nm, depfile_nm, afmfile_nm) log_reader.outdir = outdir_prefix for filenm in files: log_reader.do_file(filenm) diff --git a/buildscripts/set-lily.sh b/buildscripts/set-lily.sh index c41fe8b6a8..214f3218c1 100755 --- a/buildscripts/set-lily.sh +++ b/buildscripts/set-lily.sh @@ -49,7 +49,10 @@ chmod 755 $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh ln -sf $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh $prefix/bin/ps-to-gifs ln -sf $LILYPOND_SOURCEDIR/mf/out/ afm TFMDIR=`kpsewhich tfm cmr10.tfm` -ln -sf `dirname $TFMDIR` tfm +ln -sf `dirname $TFMDIR` cmtfm +rm -f tfm; +ln -s mf/out tfm + mkdir -p $prefix/share/ if [ ! -x $prefix/share/lilypond ]; then echo ln -sf $sources/lilypond $prefix/share diff --git a/configure b/configure index 17778d3abe..ff26468887 100755 --- a/configure +++ b/configure @@ -1756,8 +1756,8 @@ test -n "$FLEX" || FLEX="error" if test $BISON != "error"; then - bison_version=`$BISON --version| sed 's/^.*version 1.//g' ` - if test $bison_version -lt 25; then + bison_version=`$BISON --version | sed 's/^.*version 1.//g'` + if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then echo "configure: warning: Your bison is a bit old (1.$bison_version). You might have to install 1.25" 1>&2 warn_b=yes @@ -2565,7 +2565,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[/-_a-zA-Z0-9]\+ //g'` $LIBS"; + LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[/-_a-zA-Z0-9]\+ //g'` $LIBS" cat >> confdefs.h <<\EOF #define HAVE_LIBGUILE 1 EOF @@ -3041,8 +3041,6 @@ s%@YODL2MSLESS@%$YODL2MSLESS%g s%@YODL2TEXINFO@%$YODL2TEXINFO%g s%@YODL2TXT@%$YODL2TXT%g s%@YODL2LESS_DIR@%$YODL2LESS_DIR%g -s%@GUILE_CFLAGS@%$GUILE_CFLAGS%g -s%@GUILE_LDFLAGS@%$GUILE_LDFLAGS%g s%@LIBOBJS@%$LIBOBJS%g s%@MAKEINFO@%$MAKEINFO%g s%@TEX_TFMDIR@%$TEX_TFMDIR%g diff --git a/debian/changelog b/debian/changelog index 0cdc629af7..c31123b6ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +lilypond (1.1.31-1) unstable; urgency=low + + * New upstream release. + * Re-incorporated the changes in debian/rules and debian/postinst + from lilypond_1.0.xx series. I forgot these changes when I moved + from 1.0.19.uu3-1 to 1.1.29-1. Sorry! :-) + * [make/lilypond-vars.make]: Copied the definition of TEX_TFMDIR from + make/toplevel.make.in and added it to LILYINCLUDE... + * Applied the patch lilypond-1.1.31.jcn1.diff from Jan Nieuwenhuizen. + * [debian/rules]: + - Temporarily use "-$(MAKE) -k -C Documentation/tex dvi" to + circumvent the occasional \times segfault problem when building + refman.dvi. + - Added symlink /usr/lib/texmf/fonts/tfm/public/lilypond. + + -- Anthony Fok Thu, 18 Feb 1999 00:25:04 -0700 + lilypond (1.1.29-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 16f5a7d875..52b35a3aca 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,6 @@ Description: The GNU Project music typesetter. URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ http://sca.uwaterloo.ca/~praetzel/lilypond/ - http://www.lilypond.org/ + http://www.lilypond.org/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/debian/control.foka b/debian/control.foka index 0dfe808530..52b35a3aca 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -14,11 +14,12 @@ Description: The GNU Project music typesetter. beautiful sheet music from a music definition file. It can also play mechanical performances to a MIDI file. Features include multiple staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas, - beams, slurs, triplets, formatting scores, part extraction. It includes - a nice font of musical symbols. + beams, slurs, triplets, named chords, transposing, formatting scores, + part extraction. It includes a nice font of musical symbols. . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ http://sca.uwaterloo.ca/~praetzel/lilypond/ + http://www.lilypond.org/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/debian/control.in b/debian/control.in index e864f15973..262d03e3ce 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,6 +14,6 @@ Description: The GNU Project music typesetter.@BLURB@ URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ http://sca.uwaterloo.ca/~praetzel/lilypond/ - http://www.lilypond.org/ + http://www.lilypond.org/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/debian/copyright b/debian/copyright index f27e69008b..aa4d619705 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ This package was debianized by Anthony Fok on Wed, 6 Aug 1997 04:30:28 -0600 It was downloaded from - ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.1.29.tar.gz + ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.1/lilypond-1.1.31.tar.gz It is also available from: @@ -20,7 +20,7 @@ Authors: Copyright: - GNU LilyPond is Copyright (C) 1996-1998 + GNU LilyPond is Copyright (C) 1996-1999 Jan Nieuwenhuizen & Han-Wen Nienhuys This program is free software; you can redistribute it and/or modify diff --git a/debian/out/control b/debian/out/control index 16f5a7d875..52b35a3aca 100644 --- a/debian/out/control +++ b/debian/out/control @@ -20,6 +20,6 @@ Description: The GNU Project music typesetter. URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ http://sca.uwaterloo.ca/~praetzel/lilypond/ - http://www.lilypond.org/ + http://www.lilypond.org/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/debian/postinst b/debian/postinst index e7f9906b71..7f781eb295 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,7 +4,7 @@ # # by Anthony Fok # Initial release: Sun, 26 Oct 1997 03:23:00 -0700 -# Last modified: Wed, 22 Apr 1998 03:14:10 -0600 +# Last modified: Wed, 11 Nov 1998 22:59:49 -0700 set -e @@ -21,6 +21,13 @@ echo " Running /usr/bin/mktexlsr ..." #DEBHELPER# +# If we are the last package to use the old /usr/lib/texmf/doc, +# we will create the symlink to /usr/doc/texmf. :-) +if rmdir /usr/lib/texmf/doc >/dev/null 2>&1 +then + ln -s /usr/doc/texmf /usr/lib/texmf/doc +fi + echo echo " $pkg_name configuration completed." echo " Please read /usr/doc/$package/README.Debian to get started." diff --git a/debian/rules b/debian/rules index adf3d4219c..38207cad73 100755 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,24 @@ # for Debian GNU/Linux. package = lilypond + SHELL = /bin/sh r = debian/tmp d = usr/doc/$(package) +strayfiles := stepmake/bin/*.pyc \ + stepmake/stepmake/stepmake \ + stepmake/stepmake/bin \ + stepmake/stepmake/aclocal.m4 \ + stepmake/GNUmakefile \ + GNUmakefile \ + config.h \ + wwwlist \ + Documentation/tex/fonts.aux \ + Documentation/tex/fonts.log \ + Documentation/tex/feta*.tfm \ + Documentation/tex/feta*.*pk + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -20,13 +34,16 @@ build: build-stamp build-stamp: dh_testdir - # CC=egcc LIBS=-lqthreads CC=egcc ./configure --disable-checking --disable-debugging \ --enable-printing --prefix=/usr --disable-optimise \ --enable-shared $(MAKE) all # $(MAKE) htmldoc + # Remove the "-" and the "-k" once the \times segfault + # bug is fixed. (lilypond-1.1.31, 1999-02-17) + -$(MAKE) -k -C Documentation/tex dvi + touch build-stamp clean: @@ -34,36 +51,37 @@ clean: dh_testroot rm -f build-stamp install-stamp -$(MAKE) distclean + dh_clean + + # Remove the following line once the *.make files are fixed + rm -f $(strayfiles) # Correct the owner of the out/dummy.dep files when built with sudo. if [ -n "$$SUDO_USER" -a -n "$$SUDO_GID" ]; then \ find . -user root | xargs -r chown --dereference $$SUDO_USER.$$SUDO_GID; \ - else \ - find . -user root | xargs -r chown --dereference $$LOGNAME; \ fi - # Remove the following line once the *.make files are fixed - rm -f stepmake/bin/*.pyc - rm -f stepmake/stepmake/stepmake - rm -f stepmake/stepmake/bin - rm -f GNUmakefile stepmake/GNUmakefile - rm -f config.h - rm -f wwwlist - - dh_clean - install: install-stamp install-stamp: build-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs usr/lib/texmf/doc \ + dh_installdirs usr/doc/texmf \ usr/lib/emacs/site-lisp \ - usr/doc/$(package)/examples - ln -fs ../../../doc/lilypond $(r)/usr/lib/texmf/doc/lilypond + usr/doc/$(package)/examples \ + usr/lib/texmf/tex \ + usr/lib/texmf/fonts/source/public \ + usr/lib/texmf/fonts/afm/public \ + usr/lib/texmf/fonts/tfm/public + ln -fs ../lilypond $(r)/usr/doc/texmf/lilypond $(MAKE) prefix=`pwd`/$(r)/usr install + ln -s ../../../share/lilypond/tex $(r)/usr/lib/texmf/tex/lilypond + ln -s ../../../../../share/lilypond/mf $(r)/usr/lib/texmf/fonts/source/public/lilypond + ln -s ../../../../../share/lilypond/afm $(r)/usr/lib/texmf/fonts/afm/public/lilypond + ln -s ../../../../../share/lilypond/afm $(r)/usr/lib/texmf/fonts/tfm/public/lilypond + touch install-stamp # Build architecture-independent files here. @@ -79,7 +97,8 @@ binary-arch: build install Documentation/pictures/*.xpm \ Documentation/out/*.txt \ Documentation/tex/*.doc \ - Documentation/tex/*.bib + Documentation/tex/*.bib \ + Documentation/tex/out/*.dvi # dh_installexamples input cp -aP `find input mutopia \( -name '*.ly' -o -name '*.tex' -o -name 'TODO' \)` \ $(r)/$(d)/examples diff --git a/lily/atom.cc b/lily/atom.cc index 7a336f524e..61a1b3e32f 100644 --- a/lily/atom.cc +++ b/lily/atom.cc @@ -22,7 +22,7 @@ Atom::Atom(SCM s) } -#if ATOM_SMOB +#ifdef ATOM_SMOB int Atom::smob_display (SCM smob, SCM port, scm_print_state*) { diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc index 5af8d286ff..14c26b6e03 100644 --- a/lily/bar-script-engraver.cc +++ b/lily/bar-script-engraver.cc @@ -57,7 +57,11 @@ Bar_script_engraver::cast_to_interesting_item (Score_element *e) Item * i =0; if (hang_on_clef_b_) { - i = dynamic_cast (e); + Clef_item * c = dynamic_cast (e); + if (c && c->default_b_) + { + i = c; + } } else { diff --git a/lily/include/atom.hh b/lily/include/atom.hh index eb231dc7fd..15fc068f5e 100644 --- a/lily/include/atom.hh +++ b/lily/include/atom.hh @@ -15,6 +15,7 @@ #include "lily-proto.hh" #include "lily-guile.hh" +//#define ATOM_SMOB #ifdef ATOM_SMOB @@ -25,8 +26,9 @@ class Atom { static SCM smob_mark (SCM); static scm_sizet smob_free (SCM); static int smob_display (SCM, SCM, scm_print_state*); - SCM make_smob () const; public: + SCM make_smob () const; + Offset off_; Atom (SCM s); diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh index 2e85d6dc56..7bc71c2333 100644 --- a/lily/include/local-key-item.hh +++ b/lily/include/local-key-item.hh @@ -10,6 +10,21 @@ #include "array.hh" #include "musical-pitch.hh" +struct Local_key_cautionary_tuple +{ + Musical_pitch pitch_; + bool cautionary_b_; + + Local_key_cautionary_tuple () + { + cautionary_b_ = false; + } + static int compare (Local_key_cautionary_tuple const&s1, Local_key_cautionary_tuple const&s2) + { + return Musical_pitch::compare (s1.pitch_, s2.pitch_); + } +}; + /** Accidentals which can be different for each octave. @@ -22,18 +37,17 @@ */ class Local_key_item : public Item { + Array accidental_arr_; + Link_array support_items_; public: - - Array accidental_pitch_arr_; - Link_array support_items_; - int c0_position_i_; - Local_key_item (); - void add_support (Item*); - void add (Musical_pitch); + int c0_position_i_; + Local_key_item (); + void add_support (Item*); + void add_pitch (Musical_pitch, bool cautionary); protected: - virtual void do_pre_processing(); - virtual void do_substitute_element_pointer (Score_element*,Score_element*); - virtual Molecule* do_brew_molecule_p() const; + virtual void do_pre_processing(); + virtual void do_substitute_element_pointer (Score_element*,Score_element*); + virtual Molecule* do_brew_molecule_p() const; }; #endif // LOCALKEYITEM_HH diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh index 0a4bae3c29..a95c3bff5c 100644 --- a/lily/include/molecule.hh +++ b/lily/include/molecule.hh @@ -16,6 +16,8 @@ #include "protected-scm.hh" #include "cons.hh" +//#define ATOM_SMOB + /** a group of individually translated symbols. You can add molecules to the top, to the right, etc. */ class Molecule { diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index b675686929..2682d500a0 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -17,9 +17,9 @@ class Multi_measure_rest : public Spanner public: Multi_measure_rest (); int measures_i_; - void add_column (Bar*); + void add_column (Item*); - Link_array column_arr_; + Link_array column_arr_; protected: virtual Molecule *do_brew_molecule_p () const; @@ -28,6 +28,7 @@ protected: virtual void do_add_processing (); virtual void do_post_processing (); virtual void do_print () const; + virtual Array get_rods () const; virtual void do_substitute_element_pointer (Score_element*,Score_element*); }; diff --git a/lily/include/musical-pitch.hh b/lily/include/musical-pitch.hh index e961f5cc9b..d4d0a60854 100644 --- a/lily/include/musical-pitch.hh +++ b/lily/include/musical-pitch.hh @@ -21,7 +21,7 @@ */ struct Musical_pitch : public Input { - Musical_pitch (int notename=0, int accidental=0, int octave=0, bool cautionary=false); + Musical_pitch (int notename=0, int accidental=0, int octave=0); /// 0 is c, 6 is b int notename_i_; @@ -29,8 +29,6 @@ struct Musical_pitch : public Input int accidental_i_; /// 0 is central c int octave_i_; - /// Used for cautionary accidentals - bool cautionary_b_; Musical_pitch to_relative_octave (Musical_pitch); void transpose (Musical_pitch); diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh index aa461fe1c4..42a2937cbf 100644 --- a/lily/include/span-bar.hh +++ b/lily/include/span-bar.hh @@ -12,6 +12,15 @@ #include "bar.hh" +/** + This is a barline that is spanned across other bar lines. This is + the implementation of the long barlines that occur in orchestral + score and other multi-staff music. + + TODO: Is this usable for other stuff besides barlines? We only have + to span a Score_element. Perhaps this can be used for large time + sigs? +*/ class Span_bar : public Bar { Link_array spanning_l_arr_; @@ -22,9 +31,8 @@ public: Span_bar(); VIRTUAL_COPY_CONS(Score_element); - void add_bar (Bar*); + void add_bar (Score_element*); void set_align (Align_element *); - protected: void evaluate_empty (); virtual Interval do_width() const; diff --git a/lily/include/tie-engraver.hh b/lily/include/tie-engraver.hh index 68b0ff2cd6..448ed17230 100644 --- a/lily/include/tie-engraver.hh +++ b/lily/include/tie-engraver.hh @@ -14,7 +14,7 @@ #include "engraver.hh" struct CHead_melodic_tuple { - Melodic_req *mel_l_ ; + Melodic_req *req_l_ ; Note_head *head_l_; Moment end_; CHead_melodic_tuple (); @@ -29,6 +29,13 @@ inline int compare (CHead_melodic_tuple const &a, CHead_melodic_tuple const &b) } +/** + Manufacture ties. Acknowledge noteheads, and put them into a + priority queue. If we have a Tie_req, connect the notes that finish + just at this time, and note that start at this time. + + TODO: should share code with Beam_engraver, Extender_engraver? + */ class Tie_engraver : public Engraver { PQueue past_notes_pq_; diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 41eb5e8fc3..44747ad824 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -68,15 +68,9 @@ Local_key_engraver::process_acknowledged () announce_element (Score_element_info (key_item_p_, 0)); } - /* - UGH! Changes input ! - */ - if (note_l->cautionary_b_) - { - note_l->pitch_.cautionary_b_ = true; - } - key_item_p_->add (note_l->pitch_); + key_item_p_->add_pitch (note_l->pitch_, + note_l->cautionary_b_); key_item_p_->add_support (support_l); local_key_.set (note_l->pitch_); } diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc index d00b40657e..d035e5aa4d 100644 --- a/lily/local-key-item.cc +++ b/lily/local-key-item.cc @@ -29,19 +29,22 @@ Local_key_item::add_support (Item*head_l) } void -Local_key_item::add (Musical_pitch p) +Local_key_item::add_pitch (Musical_pitch p, bool cautionary) { - for (int i=0; i< accidental_pitch_arr_.size(); i++) - if (!Musical_pitch::compare (p, accidental_pitch_arr_[i])) + for (int i=0; i< accidental_arr_.size(); i++) + if (!Musical_pitch::compare (p, accidental_arr_[i].pitch_)) return; - - accidental_pitch_arr_.push (p); + + Local_key_cautionary_tuple t; + t.pitch_ = p; + t.cautionary_b_ = cautionary; + accidental_arr_.push (t); } void Local_key_item::do_pre_processing() { - accidental_pitch_arr_.sort (Musical_pitch::compare); + accidental_arr_.sort (Local_key_cautionary_tuple::compare); } Molecule* @@ -51,10 +54,11 @@ Local_key_item::do_brew_molecule_p() const Molecule *octave_mol_p = 0; int lastoct = -100; - for (int i = 0; i < accidental_pitch_arr_.size(); i++) + for (int i = 0; i < accidental_arr_.size(); i++) { + Musical_pitch p (accidental_arr_[i].pitch_); // do one octave - if (accidental_pitch_arr_[i].octave_i_ != lastoct) + if (p.octave_i_ != lastoct) { if (octave_mol_p) { @@ -66,12 +70,12 @@ Local_key_item::do_brew_molecule_p() const octave_mol_p= new Molecule; } - lastoct = accidental_pitch_arr_[i].octave_i_; + lastoct = p.octave_i_; Real dy = - (c0_position_i_ + accidental_pitch_arr_[i].notename_i_) + (c0_position_i_ + p.notename_i_) * paper()->internote_f (); - Molecule m (lookup_l ()->accidental (accidental_pitch_arr_[i].accidental_i_, - accidental_pitch_arr_[i].cautionary_b_)); + Molecule m (lookup_l ()->accidental (p.accidental_i_, + accidental_arr_[i].cautionary_b_)); m.translate_axis (dy, Y_AXIS); octave_mol_p->add_at_edge (X_AXIS, RIGHT, m, 0); @@ -85,7 +89,7 @@ Local_key_item::do_brew_molecule_p() const delete octave_mol_p; } - if (accidental_pitch_arr_.size()) + if (accidental_arr_.size()) { Box b(Interval (0, paper()->internote_f ()), Interval (0,0)); Molecule m (lookup_l ()->fill (b)); @@ -116,8 +120,6 @@ Local_key_item::do_brew_molecule_p() const void Local_key_item::do_substitute_element_pointer (Score_element*o,Score_element*n) { - Item* o_l = dynamic_cast (o); - Item* n_l = n?dynamic_cast (n):0; - - support_items_.substitute (o_l, n_l); + if (Item* o_l = dynamic_cast (o)) + support_items_.substitute (o_l,dynamic_cast (n)); } diff --git a/lily/main.cc b/lily/main.cc index 8d8dc26690..763c5e15b2 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -235,7 +235,7 @@ setup_paths () global_path.parse_path (env_sz); - char *suffixes[] = {"ly", "afm", "scm", "tfm", 0}; + char *suffixes[] = {"ly", "afm", "scm", "tfm", "cmtfm", 0}; for (char **s = suffixes; *s; s++){ if (!prefix_directory.empty_b()) global_path.add (prefix_directory + to_str ('/') + String (*s)); diff --git a/lily/molecule.cc b/lily/molecule.cc index 75e05f0995..61bf50837c 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -14,6 +14,24 @@ #include "killing-cons.tcc" +#ifdef ATOM_SMOB +#define MOL_EOL SCM_EOL +#define NEXT_CELL(a) SCM_CDR(a) +#define CELLTYPE SCM +#define UNBOX_ATOM(a) Atom::atom_l (a) +#define BOX_ATOM(a) a->make_smob () +#define NEWCELL(a,b) gh_cons (a,b) +#define UNBOX_PTR(a) SCM_CAR(a) +#else +#define MOL_EOL 0 +#define NEXT_CELL(a) ptr->next_ +#define CELLTYPE Cons* +#define UNBOX_ATOM(a) a +#define UNBOX_PTR(a) a->car_ +#define BOX_ATOM(a) a +#define NEWCELL(a,b) new Killing_cons(a,b) +#endif + Box Molecule::extent() const { @@ -29,9 +47,9 @@ Molecule::extent(Axis a) const void Molecule::translate (Offset o) { - for (Cons * ptr = atom_list_; ptr; ptr = ptr->next_) + for (CELLTYPE ptr = atom_list_; ptr != MOL_EOL; ptr = NEXT_CELL(ptr)) { - ptr->car_->off_ += o; + UNBOX_ATOM(UNBOX_PTR(ptr))->off_ += o; } dim_.translate (o); } @@ -39,8 +57,8 @@ Molecule::translate (Offset o) void Molecule::translate_axis (Real x,Axis a) { - for (Cons * ptr = atom_list_; ptr; ptr = ptr->next_) - ptr->car_->off_[a] += x; + for (CELLTYPE ptr = atom_list_; ptr != MOL_EOL; ptr = NEXT_CELL(ptr)) + UNBOX_ATOM (UNBOX_PTR(ptr))->off_[a] += x; dim_[a] += x; } @@ -48,15 +66,9 @@ Molecule::translate_axis (Real x,Axis a) void Molecule::add_molecule (Molecule const &m) { - Cons_list al; - copy_killing_cons_list (al, m.atom_list_); - - if (al.head_) - { - *al.tail_ = atom_list_; - atom_list_ = al.head_; - al.head_ =0; - } + for (CELLTYPE ptr = m.atom_list_; ptr != MOL_EOL; ptr = NEXT_CELL(ptr)) + add_atom(UNBOX_ATOM (UNBOX_PTR(ptr))); + dim_.unite (m.dim_); } @@ -65,28 +77,40 @@ Molecule::add_atom (Atom const *al) { Atom *a = new Atom(*al); - atom_list_ = new Killing_cons (a, atom_list_); + atom_list_ = NEWCELL(BOX_ATOM(a), atom_list_); } + + + void Molecule::operator=(Molecule const & src) { - if (&src == this) return; + if (&src == this) + return; + + + +#ifndef ATOM_SMOB delete atom_list_; - atom_list_ = 0; +#endif + + atom_list_ = MOL_EOL; dim_= src.dim_; add_molecule (src); } Molecule::Molecule (Molecule const &s) { - atom_list_ = 0; + atom_list_ = MOL_EOL; add_molecule (s); } Molecule::~Molecule () { +#ifndef ATOM_SMOB delete atom_list_; +#endif } void @@ -111,7 +135,7 @@ Molecule::do_center (Axis a) Molecule::Molecule () { dim_ = Box (Interval(0,0),Interval( 0,0 )); - atom_list_ = 0; + atom_list_ = MOL_EOL; } diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 5776a95fcc..4c23334b7d 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -95,14 +95,25 @@ Multi_measure_rest::do_post_processing () void Multi_measure_rest::do_substitute_element_pointer (Score_element* o, Score_element* n) { - if (Bar* c = dynamic_cast (o)) - column_arr_.substitute (c, dynamic_cast (n)); + if (Item* c = dynamic_cast (o)) + column_arr_.substitute (c, dynamic_cast (n)); } void -Multi_measure_rest::add_column (Bar* c) +Multi_measure_rest::add_column (Item* c) { column_arr_.push (c); add_dependency (c); } + +Array +Multi_measure_rest::get_rods () const +{ + Array a; + Rod r; + r.item_l_drul_ = spanned_drul_; + r.distance_f_ = paper ()->get_var ("mmrest_x_minimum"); + a.push (r); + return a; +} diff --git a/lily/musical-pitch.cc b/lily/musical-pitch.cc index df668d2115..35df93bcc5 100644 --- a/lily/musical-pitch.cc +++ b/lily/musical-pitch.cc @@ -10,12 +10,11 @@ #include "debug.hh" #include "main.hh" -Musical_pitch::Musical_pitch (int n, int a, int o, bool c) +Musical_pitch::Musical_pitch (int n, int a, int o) { notename_i_ = n; accidental_i_ = a; octave_i_ = o; - cautionary_b_ = c; } void diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 38f0c9d809..c221cbb2dd 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -10,6 +10,7 @@ #include #include +#include "dimensions.hh" #include "dictionary-iter.hh" #include "virtual-methods.hh" #include "paper-outputter.hh" @@ -105,16 +106,23 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm) output_comment (nm); } - +#ifdef ATOM_SMOB + for (SCM ptr = m->atom_list_; ptr != SCM_EOL; ptr = SCM_CDR(ptr)) + { + Atom *i = Atom::atom_l (SCM_CAR(ptr)); +#else for (Cons *ptr = m->atom_list_; ptr; ptr = ptr->next_) { Atom * i = ptr->car_; +#endif Offset a_off = i->off_; a_off += o; if (!i->func_) continue; + assert (a_off.length () < 100 CM); + if (i->font_) { output_scheme (gh_list (ly_symbol ("select-font"), @@ -125,8 +133,8 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm) SCM box_scm = gh_list (ly_symbol ("placebox"), gh_double2scm (a_off.x ()), - gh_double2scm (a_off.y ()), - i->func_.to_SCM(), + gh_double2scm (a_off.y ()), + SCM(i->func_), SCM_UNDEFINED); output_scheme (box_scm); @@ -279,6 +287,6 @@ Paper_outputter::output_int_def (String k, int v) void Paper_outputter::stop_line () { - SCM scm = gh_list (ly_symbol ("stop-line"), SCM_UNDEFINED); + SCM scm = gh_list (ly_symbol ("stop-line"), SCM_UNDEFINED); output_scheme (scm); } diff --git a/lily/parser.yy b/lily/parser.yy index 26e916196d..0e94082cc2 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1153,12 +1153,12 @@ close_request_parens: | E_SMALLER { Span_dynamic_req*s =new Span_dynamic_req; $$ = s; - s->dynamic_dir_ = SMALLER; + s->dynamic_dir_ = UP; } | E_BIGGER { Span_dynamic_req*s =new Span_dynamic_req; $$ = s; - s->dynamic_dir_ = BIGGER; + s->dynamic_dir_ = DOWN; } ; diff --git a/lily/score.cc b/lily/score.cc index 455cebd63d..7c4fbd5a84 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -35,7 +35,7 @@ Score::Score (Score const &s) music_p_ = (s.music_p_) ? s.music_p_->clone() : 0; for (int i=0; i < s.def_p_arr_.size (); i++) def_p_arr_.push(s.def_p_arr_[i]->clone()); - + errorlevel_i_ = s.errorlevel_i_; header_p_ = (s.header_p_) ? new Header (*s.header_p_): 0; } diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 9eb41b018b..62c2c66fac 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -9,13 +9,13 @@ #include "span-bar.hh" #include "lookup.hh" #include "dimensions.hh" - #include "paper-def.hh" #include "molecule.hh" #include "align-element.hh" +#include "warn.hh" void -Span_bar::add_bar (Bar*b) +Span_bar::add_bar (Score_element*b) { spanning_l_arr_.push (b); add_dependency (b); @@ -117,9 +117,16 @@ Molecule* Span_bar::do_brew_molecule_p () const { Interval iv (get_spanned_interval ()); - Molecule*output = new Molecule (lookup_l ()->bar (type_str_, iv.length ())); - - output->translate_axis (iv.center (), Y_AXIS); + Molecule*output = new Molecule; + if (!iv.empty_b()) + { + output->add_molecule (lookup_l ()->bar (type_str_, iv.length ())); + output->translate_axis (iv.center (), Y_AXIS); + } + else + { + warning("Huh? My children deflated (FIXME)"); + } return output; } diff --git a/lily/span-score-bar-engraver.cc b/lily/span-score-bar-engraver.cc index 0eb1cf7790..1efa242c6a 100644 --- a/lily/span-score-bar-engraver.cc +++ b/lily/span-score-bar-engraver.cc @@ -16,7 +16,7 @@ Span_score_bar_engraver::get_span_bar_p () const { Span_bar*s = new Span_bar; s->visibility_lambda_ - = gh_eval_str ("spanbar_non_postbreak_visibility"); + = gh_eval_str ("Span_score_bar_visibility"); s->type_str_ = "scorebar"; return s; @@ -34,7 +34,7 @@ Piano_bar_engraver::get_span_bar_p () const { Span_bar *s= new Span_bar; s->visibility_lambda_ - = gh_eval_str ("spanbar_postbreak_only_visibility"); + = gh_eval_str ("Piano_bar_visibility"); s->no_width_b_ =true; s->type_str_ = "{"; return s; @@ -45,7 +45,7 @@ Staff_group_bar_engraver::get_span_bar_p () const { Span_bar *s= new Span_bar; s->visibility_lambda_ - = gh_eval_str ("spanbar_postbreak_only_visibility"); + = gh_eval_str ("Staff_group_bar_visibility"); s->no_width_b_ =true; s->type_str_ = "["; return s; diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 088ca5577c..d33a5d8fff 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -87,6 +87,12 @@ Text_engraver::do_process_requests () text->style_str_ = p; text->text_str_ = t->text_str_; + Scalar padding = get_property ("textScriptPadding", 0); + if (padding.length_i() && padding.isnum_b ()) + { + ss->padding_f_ = Real(padding); + } + announce_element (Score_element_info (text, r)); announce_element (Score_element_info (ss, r)); diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 1b544269a2..177566d034 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -60,18 +60,24 @@ Tie_engraver::do_process_requests () void Tie_engraver::process_acknowledged () { + bool old_behavior = get_property ("oldTieBehavior", 0).to_bool (); + if (req_l_) { - if (now_heads_.size () != stopped_heads_.size ()) + if (old_behavior) { - req_l_->warning ("Unequal number of note heads for tie"); - } - int sz = now_heads_.size () warning ("Unequal number of note heads for tie"); + } + int sz = now_heads_.size () tie_p_arr_.size ()) - { now_heads_.sort (CHead_melodic_tuple::pitch_compare); stopped_heads_.sort(CHead_melodic_tuple::pitch_compare); @@ -84,6 +90,46 @@ Tie_engraver::process_acknowledged () announce_element (Score_element_info (p, req_l_)); } } + else + { + now_heads_.sort (CHead_melodic_tuple::pitch_compare); + stopped_heads_.sort(CHead_melodic_tuple::pitch_compare); + int i=0; + int j=0; + int tie_count=0; + while ( i < now_heads_.size () && j < stopped_heads_.size ()) + { + int comp + = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ , + stopped_heads_[j].req_l_->pitch_); + + if (comp) + { + (comp < 0) ? i ++ : j++; + continue; + } + else + { + tie_count ++; + + /* don't go around recreating ties that were already + made. Not infallible. Due to reordering in sort (), + we will make the wrong ties when noteheads are + added. */ + if (tie_count > tie_p_arr_.size ()) + { + Tie * p = new Tie; + p->set_head (LEFT, stopped_heads_[j].head_l_); + p->set_head (RIGHT, now_heads_[i].head_l_); + tie_p_arr_.push (p); + announce_element (Score_element_info (p, req_l_)); + } + i++; + j++; + + } + } + } } } @@ -128,14 +174,14 @@ ADD_THIS_TRANSLATOR(Tie_engraver); CHead_melodic_tuple::CHead_melodic_tuple () { head_l_ =0; - mel_l_ =0; + req_l_ =0; end_ = 0; } CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom) { head_l_ = h; - mel_l_ = m; + req_l_ = m; end_ = mom; } @@ -143,7 +189,7 @@ int CHead_melodic_tuple::pitch_compare (CHead_melodic_tuple const&h1, CHead_melodic_tuple const &h2) { - return Melodic_req::compare (*h1.mel_l_, *h2.mel_l_); + return Melodic_req::compare (*h1.req_l_, *h2.req_l_); } int diff --git a/ly/center.ly b/ly/center.ly index 500c25aad5..3cebe3647c 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -7,7 +7,7 @@ \include "paper16.ly" \paper { - \paper_sixteen; + \paper_sixteen % linewidth = 7.\cm; linewidth = 11.\cm; } diff --git a/ly/params.ly b/ly/params.ly index 8be7f2a9b2..165a781726 100644 --- a/ly/params.ly +++ b/ly/params.ly @@ -132,6 +132,8 @@ volta_thick = 1.6*\staffline; extender_height = 0.8*\staffline; +% Multi-measure rests +mmrest_x_minimum = 2.0*\staffheight; \include "engraver.ly"; diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 6edf3af678..b095586091 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.1.32 -Inschrijf datum: 22FEB99 +Versie: 1.1.33 +Inschrijf datum: 25FEB99 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.1.32.tar.gz + 770k lilypond-1.1.33.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.32.tar.gz + 770k lilypond-1.1.33.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 19c3951bac..611fd850b2 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.1.32 -Entered-date: 22FEB99 +Version: 1.1.33 +Entered-date: 25FEB99 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 770k lilypond-1.1.32.tar.gz + 770k lilypond-1.1.33.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.32.tar.gz + 770k lilypond-1.1.33.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index c5c631cd97..b825962573 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.1.32 +Version: 1.1.33 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.32.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.33.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/make/toplevel.make.in b/make/toplevel.make.in index 00da08431c..32e2911ba5 100644 --- a/make/toplevel.make.in +++ b/make/toplevel.make.in @@ -36,4 +36,4 @@ examples: localinstall: mkdir -p $(datadir) - ln -s $(TEX_TFMDIR) $(datadir)/tfm + ln -s $(TEX_TFMDIR) $(datadir)/cmtfm diff --git a/mf/GNUmakefile b/mf/GNUmakefile index b2db6331c5..3c04833f44 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -8,33 +8,34 @@ EXTRA_DIST_FILES += TODO README feta.mp mfplain.ini FET_FILES = $(wildcard feta[0-9]*.mf) -LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly)) LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log)) TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex)) XPM_FONTS = feta20 AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) TFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tfm)) -ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES) +ALL_GEN_FILES= $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES) #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" INSTALLATION_DIR=$(datadir)/mf/ INSTALLATION_FILES=$(MF_FILES) -INSTALLATION_OUT_DIR=$(datadir)/tex -INSTALLATION_OUT_FILES=$(TEXTABLES) +INSTALLATION_OUT_SUFFIXES=1 2 3 -INSTALLATION_OUT_DIR1=$(datadir)/afm -INSTALLATION_OUT_FILES1=$(AFM_FILES) $(TFM_FILES)#ugh +INSTALLATION_OUT_DIR1=$(datadir)/tex +INSTALLATION_OUT_FILES1=$(TEXTABLES) -INSTALLATION_OUT_DIR2=$(datadir)/ly -INSTALLATION_OUT_FILES2=$(LYTABLES) +INSTALLATION_OUT_DIR2=$(datadir)/afm +INSTALLATION_OUT_FILES2=$(AFM_FILES) + +INSTALLATION_OUT_DIR3=$(datadir)/tfm +INSTALLATION_OUT_FILES3=$(TFM_FILES) export MFINPUTS:=.:$(MFINPUTS) include $(depth)/make/stepmake.make default: $(ALL_GEN_FILES) -$(outdir)/%.afm $(outdir)/%.ly $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log - $(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$( \! ) g ] | % grace note g8 c2 +g2 \p r4 | +g \mf ( d' c~ | +c ) b r | +R2. | +r4 r c \p ( | +) g r r | +g [g8. ( a16 ] ) g4 | +R2. | +r4 r [g8^""^"solo" \mf \< () \! e' ] | +\tiny d8*1/2 \normalsize g2 \> ( *7/8 [ \! e8. c16 ] | % grace note d8 g2 +) g2 r4 | +R2. | +r4 r \times 2/3 {[e'8 \f ( g, ) g'] } | +g4 () e r | +r r \times 2/3 {[g8 \f ( e ) g] } +d4 () g r | +r r [d16 \f ( g, e' d ] | +[g, d' e ) d ] g,4 r | +r \tiny g8 \f *1/2 \normalsize d'2 \> ( *7/8| % grace note g8 d2 +[g,8. a16 g8. a16 \! g8. ) a16 ] | +g4 r r | +R2. | +r4 r^\fermata r8^\fermata r | +R2*8 | +d'8-. \pp r c-. r | +d r c g | +[g-. \< g-. g-. \! g-. ] | +g4.:8 g8 \f ( | +) c4. r8 | +c4. r8 | +c4. r8 | +c4 () b8 r | +e,4. r8 | +e'4. r8 | +e,4. r8 | +e'4. r8 | +e r e r | +e r e r | +c4 \sfz r | +R2*12 | +r4 r8 g' ( | +) g,4. \f g8 ( | +[ ) d' d16-> ( e ] ) d8 r | +R2 | +r4 r8 g \f ( | +) g,4. g8 ( | +[ ) d' d16 ( e ] [) d8 d ] ~ | +d4.-> d8 ~ | +d4.-> r8 | +r4 r8 e ( | +) d4. \f d8 ~ | +d4.-> d8 ~ | +d4.-> r8 | +r4 r8 e \f ( | +[ ) d d16 ( e ] ) d8 r | +R2*4 | +d4. \f r8 | +R2 | +d4. \sfz r8 | +d4. \sfz r8 | +d4 d-> ~ | +d4 d-> ~ | +d g ( | +[ ) d8 d16 ( e] ) d8 r | +d4 d ~ | +d4 d ~ | +d g ( | +[ ) d8 d16 ( e] ) d8 r | +d4 d ~ | +d4_"dim." d ~ | +d4 d ~ | +d4 d ~ | +d8 r r4 | +R2*35 | +c,2 \pp ~ | +c4. r8 | +R2*2 | +d'2 \pp ~ | +d4. r8 | +d8 r c r | +d-. r c-. g | +g2:8 \< | +\! g4.:8 g8 \f ( | +) e'4. r8 | +c4. r8 | +c4. c8 | +c2:8 | +c4. r8 | +d4 () c8 r | +d4 () c8 r | +f4 () e8 r | +c4 r | +e r | +c r | +e r | +c8 r d r | +es r d r | +d \sfz r r4 | +R2*2 | +d4 ( \p \< e | +\! f g \> ~ | +g ) \! e8 r | +R2 | +d4 ( \p \< e | +\! ) f2 | +b,4_"dim." ( c | +) d r | +R2*3 | +[c8 ( \f c16 d ][es8 d16 ) c ] | +d4. r8 | +R2*2 | +[c8 ( c16 d ][es8 d16 ) c ] | +d4. c8 ( | +) g'4.-> c,8 ( | +) g'4.-> r8 | +R2 | +r4 r8 g \f ~ | +g4. g8 ~ | +g4. r8 | +r4 r8 d ( | +[ ) g g16 ( a ] ) g8 r | +R2 | +r4 r8 g, \p | +[g-. \< g-. g-. \! g-.] | +[g-. \< g-. g-. \! g ( ] | +) e'4. r8 | +R2 | +d4. \f r8 | +d4. g,8 ( | +) e' r d4 ( | +) e8 r d4 ( | +) e8 r c4 ( | +[) d8 f-. f-. d-. ] | +e r d4 ( | +) e8 r d4 ( | +) e8 r c4 ( | +[) d8 f-. f-. d-. ] | +e r d4 ( | +) e8 r d4_"dim." ( | +) c8 r g4 | +g8 r [g'8.^""^"solo" ( \< \! a16 ] | +g4. \> \! ) e8 | +c4 ( d | +e d | +) c [g'8. ( \< \! a16 ] | +g4. \> \! ) e8 | +c4 ( d | +e d | +) c [c8. ( d16 ] | +) c2 ( | +) g ~ | +g_"dim." ~ | +g ~ | +g \p ~ | +g ~ | +g ~ | +g | +R2*2 | +d'2 \sfz \> ( | +) \! g, ~ | +g \p ~ | +g | +c \< ~ | +\! c | +c4. \f r8 | +d4. r8 | +d4. r8 | +d4. r8 | +c2 ~ | +c4. r8 | +c2 ~ | +c4. r8 | +d4. r8 | +d4. d8 | +[e-. d-. e-. d-.] | +[e-. d-. e-. d-.] | +e r d r | +c r d r | +c r e r | +g r e r | +c4 r8 g ( | +) e'4 r8 g,8 ( | +) c4 r8 g ( | +) e'4 r8 g,8 ( | +) c4 r | +R2 | +e4 \sfz r^\fermata +} + +corIhelp=\notes\relative c''' { +\key c; +\tiny + +s2.*32 | +s2*33 | +r4 r8 [g16^"oboe" \p ( a ] | +[ ) g8-. fis16 ( g ][ ) fis8-. f16 ( g ] | +[ ) f8-. e16 ( f ] ) e8-. s | +s2*66 | +[f,,16^"Vlc." ( g f g][f g f8 ] | +) e4 r | +[f16 ( g f_"dim." g][f g f8 ] | +) e4 r | +} + +corIIhelp=\notes\relative c'' { +\key c; +\tiny + +[c8.^"Oboe" ( d16] ) c2 | +[c8. ( d16] ) c2 | +s2.*15 | +r4 r [g8^"Cor. I" ( ) e'] | +g2 ( [e8. ) c16 ] | +g2 s4 | +s2.*12 | +s2*35 | +r4 r8 g'8^"Cor. I" ( | +) g,4. s8 | +s2*65 | +[f,16^"Vlc." ( g f g][f g f8 ] | +) e4 r | +[f16 ( g f_"dim." g][f g f8 ] | +) e4 r | +s2*35 | +r4 r8 a''^"Oboe" | +a-. [ gis-. gis-. \< g-.] | +[g-. fis-. \! fis-. f-. ] | +} + +corII=\notes\relative c'' { +\key c; + +\property Staff."midi_instrument" = "french horn" + +R2.*19 | +r4 r [g8^"solo" \p (\< \! ) e'] | +\tiny d8*1/2 \normalsize g2 \> ( *7/8 [e8. ) \! c16 ] | % grace note d8 () g2 +g2 r 4 | +r r \times 2/3 {[e'8 \p ( g, ) g' ]} | +g4 \> () \! e r | +r r \times 2/3 {[g8 \p ( e ) g ]} | +d4 \> () \! g r | +r r [g,16 ( \p d' e d ] | +) g,4 r r | +R2. | +[g8. ( a16 g8. a16 g8. a16] | +[g8._"dim." a16 ] g4. a8 | +[g8. a16] ) g4^\fermata \pp r8^\fermata r | +R2*8 | +g8-. \pp r c,-. r | +g'-. r c,-. r | +R2 | +r4 r8 e \f ~ | +e4. r8 | +c4. r8 | +c4. r8 | +e4. r8 | +c4. r8 | +g'4. r8 | +c,4. r8 | +g'4. r8 | +e r e r | +e r e r | +fis4 \sfz r | +R2*13 | +r4 r8 g \f ( | +) g,4. r8 | +R2*2 | +r4 r8 g' ( | +) g,4.-> g'8 ( | +) g,4.-> g'8 ( | +) g,4.-> r8 | +R2 | +r4 r8 g' ( | +) g,4.-> g'8 ( | +) g,4.-> r8 | +R2*6 | +d''4. \f r8 | +R2 | +c4. \sfz r8 | +c4. \sfz r8 | +g4 g,-> ~ | +g g-> ~ | +g g ~ | +g r | +g4 g-> ~ | +g g-> ~ | +g g-> ~ | +g r | +g4 g ~ | +g_"dim." g ~ | +g g ~ | +g g ~ | +g8 r r4 | +R2*35 | +c2 \pp ~ | +c4. r8 | +R2*4 | +g'8-. \pp r c,-. r | +g'-. r c,-. r | +R2 | +r4 r8 e \f ( | +) g4. r8 | +c,4. r8 | +c4. c8 | +c2:8 | +c'4. r8 | +d4 () c8 r | +d4 () c8 r | +d4 () c8 r | +c,4 r | +e r | +c r | +e r | +c'8 r d r | +es r d r | +g, \sfz r r4 | +R2*13 | +c,4. \f c8 ( | +)c,4. r8 | +R2*2 | +c'4. \f c8 ( | +)c,4. c''8 | +c,4. c'8 | +c,4. r8 | +R2 | +r4 r8 c' \f ~ | +c4. c8 ~ | +c4. r8 | +R2*3 | +r4 r8 c,8 \p | +c2:8 | +c4.:8 e8 ( | +) g4. \f r8 | +R2 | +g4. \sfz r8 | +g4. g8 ( | +) c r g4 ( | +) c8 r g4 ( | +) c8 r c,4 ( | +[ ) g'8 d'-. d-. g,-. ] | +c r g4 ( | +) c8 r g4 ( | +) c8 r c,4 ( | +[ ) g'8 d'-. d-. g,-. ] | +c r g4 ( | +) c8 r g4_"dim." ( | +) c,8 r c4 ~ | +c8 r r4 | +R2*4 | +c2 \p ~ | +c ~ | +c4 r | +r [c'8. \f ( d16 ] | +) c2 ( | +) g ~ | +g_"dim." ~ | +g ~ | +g \pp ~ | +g ~ | +g ~ | +g | +R2*2 | +g \sfz ~ | +g ~ | +g ~ | +g | +c, \< | +c | +\! c4. r8 | +d'4. r8 | +g,4. r8 | +g4. r8 | +c2 ( | +) c,4. r8 | +c'2 ( | +) c,4. r8 | +d'4. r8 | +g,4. g8 | +[c-. g-. c-. g-. ] | +[c-. g-. c-. g-. ] | +c r g r | +c, r g' r | +c r g r | +e r g r | +e4 r8 g ( | +) c,4 r8 g'8 ( | +) e4 r8 g ( | +) c,4 r8 g'8 ( | +) e4 r | +R2 | +c'4-. \sfz r^\fermata +} + +trpI=\notes\relative c'' { +\key c; + +\property Staff."midi_instrument" = "trumpet" + +[d8. ( \f e16 ] ) d2 | +R2.*30 | +r4 r^\fermata r8 ^\fermata r | +R2*12 | +g,2 \f ~ | +g4 r | +g r | +g () fis8 r | +R2 | +d'4 r | +R2 | +d4 r | +R2*2 | +e8 r r4 | +R2*19 | +c4. \f r8 | +c4. r8 | +R2*2 | +c4. \f r8 | +c4. r8 | +R2*8 | +e4. \f r8 | +e4. r8 | +r4 e-> ~ | +d8 r e4-> ~ | +d8 r d4 ~ | +e8 r r4 | +r e ~ | +d8 r e4 ~ | +d8 r d4 ~ | +e8 r r4 | +r e_"dim." ~ | +d8 r e4 ~ | +d8 r r4 | +R2*47 | +g,2 \f ~ | +g4 r | +g r8 g | +g2:8 | +c4. r8 | +c4. r8 | +c4. r8 | +e4. r8 | +e,4. r8 | +e'4. r8 | +e,4. r8 | +e'4. r8 | +e8 r e r | +e r e r | +d \sfz r r4 | +R2*13 | +r4 g,8 \f r | +[d'-. d16 ( e ] ) d8 r | +R2*2 | +r4 g,8 \f r | +[d'-. d16 ( e ] ) d8 r | +g,4. \f r8 | +g4. r8 | +R2*2 | +g4. \f r8 | +g4. r8 | +R2*6 | +d'4. \f r8 | +R2 | +c4. \f r8 | +c4. r8 | +g4 r | +g r | +g8 r g r | +[d' d16 ( e ] ) d8 r | +g,4 r | +g r | +g8 r g r | +[d' d16 ( e ] ) d8 r | +g,4 \p r | +g_"dim." r | +g r | +R2*25 | +c4 \f r | +e r | +d r | +d r | +g, r | +e' ~ d8 r | +g,4 r | +e' ~ d8 r | +e4-. r | +d-. r | +d8-. r d-. r | +d-. r d-. r | +d-. r d-. r | +d-. r d-. r | +d r d r | +d r d r | +g,4 r | +d'-. r | +d-. r | +d-. r | +g, r | +R2 | +g4 \sfz r^\fermata +} + +trpIhelp=\notes\relative c'' { +\tiny + +s2.*32 | +s2*9 | +r4 r8 c-.^"Clar. I" | +[bes-. a-. g-. f-. ] | +[e-. d-. c-. ] r8 | +s2*23 | +r4 r8 g''8^"Cor. I" ( | +) g,4. g8 ( | +[) d' d16 ( e ] )d8 s | +s2*75 | +r4 r8 c-.^"Clar. I" | +[bes-. a-. g-. f-. ] | +[e-. d-. c-. ] s8 | +s2*25 +r4 r8 a''^"Oboe" | +a-. [ gis-. gis-. \< g-.] | +[g-. fis-. \! fis-. f-. ] | +s2*53 | +r4 r8 [c'16^"Flauto" ( d] | +) c8 [b16 ( c ] ) b8 [bes16 ( c ] | +)bes8 [a16 ( bes ] ) a8 [c16 ( d] | +) c8 [b16 ( c ] ) b8 [bes16 ( c ] | +)bes8 [a16 ( bes ] ) a8 +} + +trpIIhelp=\notes\relative c'' { +\tiny + +s2.*32 | +s2*9 | +r4 r8 c-.^"Clar. I" | +[bes-. a-. g-. f-. ] | +[e-. d-. c-. ] r8 | +s2*23 | +r4 r8 g''8^"Cor. I" ( | +) g,4. g8 ( | +[) d' d16 ( e ] )d8 s | +s2*75 | +r4 r8 c-.^"Clar. I" | +[bes-. a-. g-. f-. ] | +[e-. d-. c-. ] s8 | +s2*28 +r4 g'8^"Trp. I" \f r | +[d'-. d16 ( e ] ) d8 r | +s2*51 | +r4 r8 [c'16^"Flauto" ( d] | +) c8 [b16 ( c ] ) b8 [bes16 ( c ] | +)bes8 [a16 ( bes ] ) a8 [c16 ( d] | +) c8 [b16 ( c ] ) b8 [bes16 ( c ] | +)bes8 [a16 ( bes ] ) a8 +} + +trpII=\notes\relative c' { +\key c; + +\property Staff."midi_instrument" = "trumpet" + +R2.*31 | +r4 r^\fermata r8 ^\fermata r | +R2*12 | +g2 \f ~ | +g4 r | +g r | +g' ~ fis8 r | +R2 | +d'4 r | +R2 | +d4 r | +R2*2 | +e,8 r r4 | +R2*19 | +c4. \f r8 | +c4. r8 | +R2*2 | +c4. \f r8 | +c4. r8 | +R2*8 | +e4. \f r8 | +e4. r8 | +r4 g4 ~ | +fis8 r g4 ~ | +fis8 r d'4 ~ | +e8 r r4 | +r g, ~ | +fis8 r g4 ~ | +fis8 r d'4 ~ | +e8 r r4 | +r g, ~ | +fis8_"dim." r g4 ~ | +fis8 r r4 | +R2*47 | +g,2 \f ~ | +g4. r8 | +g4 r | +R2 | +c4. r8 | +c4. r8 | +c4. r8 | +e4. r8 | +c4. r8 | +g'4. r8 | +c,4. r8 | +g'4. r8 | +e r e r | +e r e r | +c' r r4 | +R2*19 | +g4. \f r8 | +g4. r8 | +R2*2 | +g,4. \f r8 | +g4. r8 | +R2*6 | +d''4. r8 | +R2 | +c,4. \f r8 | +c4. r8 | +g4. r8 | +g4 r | +g8 r r4 | +R2 | +g4 r | +g r | +g8 r r4 | +R2 | +g4 r | +g_"dim." r | +g r | +R2*25 | +c4 \f r | +e r | +d' r | +d r | +g,, r | +c' ~ g8 r | +g,4 r | +c' ~ g8 r | +g4 r | +fis r | +g8-. r g-. r | % Staccato copied from trp. I +g-. r g-. r | +g-. r d'-. r | +g,-. r d'-. r | +g, r g r | +g r g r | +g4-. r | +g-. r | +g-. r | +g-. r | +g r | +R2 | +g4 \sfz r^\fermata +} + +timpani=\notes\relative c, { +\clef "bass"; + +\property Staff."midi_instrument" = "timpani" + +R2.*6 | +f2.:32 \pp ~ | +f2.:32 ~ | +f2.:32 ~ | +f2.:32 ~ | +c'4 r r | +R2.*3 | +c2.:32 \pp | +c2.:32 | +c2.:32 | +c2.:32 | +c4 r r | +R2.*7 | +c2.:32 \pp | +c2.:32 | +c2.:32 | +c2.:32 | +c4 r r | +r r^\fermata r8^\fermata r | +R2*12 | +f,2:32 \f ~ | +f4 r | +f r | +R2 | +f8 r r4 | +R2 | +f8 r r4 | +R2*16 | +r4 r8 c' \p | +[c-. \< c-. c-. \! c-.] | +c4.:8 \f r8 | +R2 | +r4 r8 c \p | +c2:8 \< | +\! c4.:8 \f r8 | +c4:32 ~ c8 r | +c4:32 ~ c8 r | +R2*2 | +f,4:32 \f ~ f8 r | +f4:32 ~ f8 r | +R2*3 | +r4 r8 c' \p | +c2:8 \< | +\! c4.:8 r8 | +R2*4 | +c4 \f r | +c4 r | +c2:32 | +c8 r r4 | +c4 r | +c4_"dim." r | +c2:32 ~ | +c8 r r4 | +c4_"dim." r | +c4 r | +c4 r | +c4 r | +c8 r r4 | +R2*45 | +f,2:32 \f ~ | +f4 r | +f4 r | +R2 | +f4 r | +R2*3 | +f8 r r4 | +R2 | +f8 r r4 | +R2*3 | +c'4 \sfz r | +R2*12 | +r4 r8 f, \p | +[f \< f f \! f ] | +f4.:8 \f r8 | +R2 | +r4 r8 f \p | +f2:8 \< | +\! f4.:8 \f r8 | +f4:32 \f ~ f8 r | +f4:32 ~ f8 r | +R2*2 | +f4:32 \f ~ f8 r | +f4:32 ~ f8 r | +R2*3 | +r4 r8 f \p | +f2:8 | +f4.:8 r8 | +R2*2 | +c'4 \f r | +c r | +f, r | +f r | +f2:32 ~ | +f8 r r4 | +f r | +f r | +f2:32 ~ | +f8 r r4 | +f r | +f_"dim." r | +f r | +R2*28 | +r4 r8 c' \f | +f,2:32^\trill ~ | +f4 r8 c' | +f,2:32^\trill ~ | +f4 r | +f r | +c' r8 c-. | +[f,-. c'-. f,-. c'-.] | +[f,-. c'-. f,-. c'-.] | +f, r c' r | +f, r c' r | +f, r c' r | +f, r c' r | +f,2:32 \ff ~ | +f2:32 ~ | +f2:32 ~ | +f2:32 ~ | +f8 r r4 | +r2 | +f4 \sfz r^\fermata +} + +timphelp=\notes\relative c' { +\tiny + +[c8.^"Oboe, \\okt" ( d16] ) c2 | +[c8. ( d16] ) c2 | +s2.*30 | +s2*9 | +r4 r8 \clef "treble"; c'-.^"Clar. I" | +[bes-. a-. g-. f-. ] | +[e-. d-. c-. ] r8 \clef "bass"; | +s2*21 | +r4 r8 \clef "treble"; [g''16^"oboe" \p ( a ] | +[ ) g8-. fis16 ( g ][ ) fis8-. f16 ( g ] | +[ ) f8-. e16 ( f ] ) e8-. \clef "bass"; s | +s2*77 | +r4 r8 \clef "treble"; c-.^"Clar. I" | +[bes-. a-. g-. f-. ] | +[e-. d-. c-. ] r8 \clef "bass"; | +s2*25 +r4 r8 \clef "treble"; a''^"Oboe" | +a-. [ gis-. gis-. \< g-.] | +[g-. fis-. \! fis-. ] \clef "bass"; s8 | +s2*57 | +r4 r8 \clef "treble"; bes,^"Vi. I" ( ] | +) bes'4. d,8 ( | +) d'4. c,8 ( | +) c'4. e,8 ( | +) e'4. \clef "bass"; s8 | +} \ No newline at end of file diff --git a/mutopia/N.W.Gade/global.ly b/mutopia/N.W.Gade/global.ly new file mode 100644 index 0000000000..135997817d --- /dev/null +++ b/mutopia/N.W.Gade/global.ly @@ -0,0 +1,49 @@ + +globalNoKey=\notes { +\time 3/4; +\skip 2.*31; +s2 s8 \bar "||"; \break +s8 +\time 2/4; +\skip 2*225; +\bar "|."; +} + +global=\notes { +\key f; +\globalNoKey +} + +marks=\notes { +\time 3/4; +\property Voice.textstyle = "Large" +\skip 2.*31; +s2 s8 s^"\\Allegromoltovivace" +\time 2/4; +\skip 2*12; +\mark "A"; +\skip 2*12; +\mark "B"; +\skip 2*26; +\mark "C"; +\skip 2*24; +\mark "D"; +\skip 2*32; +\mark "E"; +\skip 2*10; +\mark "F"; +\skip 2*26; +\mark "G"; +\skip 2*16; +\mark "H"; +\skip 2*20; +\mark "I"; +\skip 2*12; +\mark "K"; +\skip 2*16; +\mark "L"; +\skip 2*8; +\mark "M"; +\skip 2*11; +%slut +} diff --git a/mutopia/N.W.Gade/global.tex b/mutopia/N.W.Gade/global.tex new file mode 100644 index 0000000000..13015a5e4c --- /dev/null +++ b/mutopia/N.W.Gade/global.tex @@ -0,0 +1,60 @@ +% Defined as macros so Lilypond doesn't assign any horisontal spacing. +\newcommand{\Allegromoltovivace}{\hspace{-10mm}\raise 20pt\hbox{ + \Large \textbf{Allegro molto vivace}}} +%\newcommand{\Andanteconmoto}{\hspace{-12mm}\raise 20pt\hbox{ +% \Large Andante con moto}} +\newcommand{\Andanteconmoto}{} +\renewcommand{\thepiece}{Andante con moto} + +\newcommand{\okt}{$8^{va}$} + +\newcommand{\thecopyright}{ + \begin{tabular}{l} + \copyright{} mats.bengtsson@s3.kth.se, 1999. Free circulation permitted and + encouraged.\\ Typeset from handwritten parts at Statens + Musikbibliotek, Stockholm, Sweden + \end{tabular} +} + +% Modified from lilypond/tex/headers.tex: +\advance\topmargin-5mm +\advance\headsep-4mm +\addtolength{\textheight}{12mm} +\advance\footskip-3mm + +\usepackage{fancyheadings} +\lhead{\textbf{\large\theinstrument}} +\chead{} +\lfoot{} +\cfoot{\ifnum\thepage=1{\thecopyright\hfill\LilyIdString}\fi} +\rfoot{\ifnum\thepage>1{\hfill\thepage\hfill}\fi} +\headrulewidth0mm +\pagestyle{fancy} + +% Modified from lilypond/tex/titledefs.tex: +\def\makelilytitle{% + \begin{center} + \bfseries + \ifx\mudelanull\thetitle\else\sethuge{\thetitle}\\ \fi + \ifx\mudelanull\thesubtitle\else\setLarge{\thesubtitle}\\ \fi + \end{center} + \bigskip + % urg + \edef\saveparskip{\parskip}\parskip-5mm + \begin{minipage}[t]{0.45\textwidth} + \ifx\mudelanull\thepoet\else\settext{\thepoet}\\ \fi + \ifx\mudelanull\themetre\else\settext{\themetre}\\ \fi + \end{minipage}\hspace*{\fill} + \begin{minipage}[t]{0.45\textwidth} + \begin{flushright} + \ifx\mudelanull\thecomposer\else\setlarge{\normalfont\scshape\thecomposer}\\ \fi + \ifx\mudelanull\theopus\else\settext{\theopus}\\ \fi + \ifx\mudelanull\thearranger\else\settext{\thearranger}\\ \fi + \end{flushright}% + \end{minipage}\par + \parskip\saveparskip +% {\center\setlarge{\theinstrument}\par} +% {\flushleft\setLarge{\normalfont\scshape\thepiece}} + {\flushleft\setLarge{\textbf\thepiece}} + \leavevmode +} diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly new file mode 100644 index 0000000000..7491098fda --- /dev/null +++ b/mutopia/N.W.Gade/parts.ly @@ -0,0 +1,313 @@ +\header{ +title = "Imellan Fjeldene. Ouverture"; +composer = "Niels W Gade"; +enteredby = "Mats Bengtsson"; +latexheaders = "\\input global"; +copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + + "encouraged.\\\\ Typeset from handwritten parts at " + + "Statens Musikbibliotek, Stockholm, Sweden"; +} + +\version "1.0.14"; + +\include "global.ly" +\include "wood.ly" +\include "brass.ly" +\include "strings.ly" + +my_paper = \paper { + textheight = 275.0 \mm; + \translator { + \OrchestralPartStaffContext + textScriptPadding = 5.0; + } +\translator{\VoiceContext +\remove Auto_beam_engraver; +} + \translator { + \ScoreContext + SkipBars = 1; + markScriptPadding = "6.0"; + textstyle = "italic"; + } +} +%{ +\score{ + \type Staff < + \global + \marks + \oboe + \oboehelp + > + \header{ + instrument = "Oboe"; + } + \paper{ + \my_paper; + output = "oboe"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \global + \marks + \flauto + \flautohelp + > + \header{ + instrument = "Flauto"; + } + \paper{ + \my_paper; + output = "flauto"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \globalNoKey + \marks + \clarI + > + \header{ + instrument = "Clarinetto I in B\\textflat"; + } + \paper{ + \my_paper; + output = "clarI"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \globalNoKey + \marks + \clarII + > + \header{ + instrument = "Clarinetto II in B\\textflat"; + } + \paper{ + \my_paper; + output = "clarII"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \global + \marks + \fagotto + > + \header{ + instrument = "Fagotto"; + } + \paper{ + \my_paper; + output = "fagotto"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \globalNoKey + \marks + \corI + \corIhelp + > + \header{ + instrument = "Corno I in F"; + } + \paper{ + \my_paper; + output = "corI"; + } + \midi { + \tempo 4=120; + } +} +%} +\score{ + \type Staff < + \globalNoKey + \marks + \corII + \corIIhelp + > + \header{ + instrument = "Corno II in F"; + } + \paper{ + \my_paper; + output = "corII"; + } + \midi { + \tempo 4=120; + } +} +%{ +\score{ + \type Staff < + \globalNoKey + \marks + \trpI + \trpIhelp + > + \header{ + instrument = "Tromba I in B\\textflat"; + } + \paper{ + \my_paper; + output = "trpI"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \globalNoKey + \marks + \trpII + \trpIIhelp + > + \header{ + instrument = "Tromba II in B\\textflat"; + } + \paper{ + \my_paper; + output = "trpII"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \globalNoKey + \marks + \timpani + \timphelp + > + \header{ + instrument = "Timpani"; + } + \paper{ + \my_paper; + output = "timpani"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \global + \marks + \viI + > + \header{ + instrument = "Violino I"; + } + \paper{ + \my_paper; + output = "viI"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \global + \marks +% \notes{s2.*32 s2*141 \break} + \viII + > + \header{ + instrument = "Violino II"; + } + \paper{ + \my_paper; + output = "viII"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \global + \marks + \notes{s2.*32 s2*142 \break} + \vla + > + \header{ + instrument = "Viola"; + } + \paper{ + \my_paper; + output = "viola"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \global + \marks + \vlc + > + \header{ + instrument = "Violoncello"; + } + \paper{ + \my_paper; + output = "violoncello"; + } + \midi { + \tempo 4=120; + } +} + +\score{ + \type Staff < + \global + \marks + \cb + > + \header{ + instrument = "Contrabasso"; + } + \paper{ + \my_paper; + output = "cb"; + } + \midi { + \tempo 4=120; + } +} +%} \ No newline at end of file diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly new file mode 100644 index 0000000000..23181116e2 --- /dev/null +++ b/mutopia/N.W.Gade/score.ly @@ -0,0 +1,151 @@ +\header{ +title = "Imellan Fjeldene. Ouverture"; +composer = "Niels W Gade"; +enteredby = "Mats Bengtsson"; +latexheaders = "\\input global"; +copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + + "encouraged.\\\\ Typeset from handwritten parts at " + + "Statens Musikbibliotek, Stockholm, Sweden"; +} + +\version "1.0.14"; + +\include "global.ly" +\include "wood.ly" +\include "brass.ly" +\include "strings.ly" +\include "paper16.ly"; + + +\score{ < + \type StaffGroup = wood < + \type Staff = flauto < + \property Staff.instrument = "Flauto" + \property Staff.instr = "Fl." + \global + \flauto + > + \type Staff = oboe < + \property Staff.instrument = "Oboe" + \property Staff.instr = "Ob." + \global + \marks + \oboe + > + \type Staff = clarI < + \property Staff.instrument = "Clarinetto I" + \property Staff.instr = "Cl. I" + \global + \clarI + > + \type Staff = clarII < + \property Staff.instrument = "Clarinetto II" + \property Staff.instr = "Cl. II" + \global + \clarII + > + \type Staff = fagotto < + \property Staff.instrument = "Fagotto" + \property Staff.instr = "Fg." + \global + \fagotto + > + > + \type StaffGroup = brass < + \type Staff = cor < + \global + \property Staff.instrument = "2 Corni in F" + \property Staff.instr = "Cor." + \type Voice = corI { \stemup \corI } + \type Voice = corII { \stemdown \corII } + > + \type Staff = trp < + \global + \property Staff.instrument = "2 Trp. in B\\textflat " + \property Staff.instr = "Trp." + \type Voice = trpI { \stemup \trpI } + \type Voice = trpII { \stemdown \trpII } + > + > + \type StaffGroup = percussion <\type Staff = timpani < + \property Staff.instrument = "Timpani" + \property Staff.instr = "Timp." + \global + \timpani + > + > + \type StaffGroup = strings < + \type GrandStaff = violins < + \type Staff = viI < + \property Staff.instrument = "Violin I" + \property Staff.instr = "Vi. I" + \global + \viI + > + \type Staff = viII < + \property Staff.instrument = "Violin II" + \property Staff.instr = "Vi. II" + \global + \viII + > + > + \type Staff = vla < + \property Staff.instrument = "Viola" + \property Staff.instr = "Vla." + \global + \vla + > + \type Staff = vlc < + \property Staff.instrument = "Violoncello" + \property Staff.instr = "Vlc" + \global + \vlc + > + \type Staff = cb < + \property Staff.instrument = "Contrabasso" + \property Staff.instr = "C.B." + \global + \cb + > + > +> + \paper { + \paper_sixteen + linewidth = 185.\mm; + textheight = 260.\mm; + \translator { + \OrchestralScoreContext + minVerticalAlign = 2.5*\staffheight; + } + \translator { \StaffContext + \consists "Staff_margin_engraver"; + marginHangOnClef = 1; + marginScriptPadding = "20.0"; + textstyle = "italic"; + textScriptPadding = 5.0; + } +\translator{\VoiceContext +\remove Auto_beam_engraver; % Bug workaround! +} + } +} + +\score{ + \type StaffGroup < + \oboe + \flauto + \type Staff = cor {\notes \transpose bes <\clarI \clarII >} + \fagotto + \type Staff = cor {\notes \transpose f <\corI \corII >} + \type Staff = cor {\notes \transpose bes <\trpI \trpII >} + \timpani + \viI + \viII + \vla + \vlc + \cb + > + \midi { + \tempo 4=120; + } +} diff --git a/mutopia/N.W.Gade/strings.ly b/mutopia/N.W.Gade/strings.ly new file mode 100644 index 0000000000..afc4eb1a37 --- /dev/null +++ b/mutopia/N.W.Gade/strings.ly @@ -0,0 +1,1335 @@ +\version "1.0.14"; + +viI=\notes\relative c'' { + +\property Staff."midi_instrument" = "violin" + +r4 r [g8.-> \mf ( a16 ] | +) g4 r c, \p | +[c'8. ( d16 ] c4. a8 | +[f8. e16 ] f4. ) a8 | +[c8. ( d16 ] c4. ) a8 | +[a8. ( g16 ] ) f4 r | +[c'8. ( d16 ] c4. a8 | +[f8. e16 ] f4. ) a8 | +[c8. ( d16 ] c4. ) a8 | +[a8. ( g16 ] ) f4 r | +[c'8. \mf ( \< d16 ] [b8 c] \! ) f4 | +[ e8. \> ( d16 ] c4 \! ) g \pp | +[c8. ( \< d16 ] [b8 c] \! ) f4 | +[ e8. \> ( d16 ] ) \! c2 \p | +[c8. ( d16 ] c4. a8 | +[g8. a16 ] f4. ) a8 | +[c8. ( d16 ] c4. ) a8 | +[a8. ( g16 ] ) f4 r | +g2 \< ( \! f4 | +e \> \! ) f r | +r8 [ c ( g' c, f c ] | +[ bes c a8 c a ) c ] | +[a ( c a c a c ] | +[a \pp c a c a ) c ] | +[bes ( c ] bes4 [a8 c ] | +[ bes c ] ) bes2 ~ | +bes r4 | +R2.*4 | +r4 r^\fermata r8^\fermata [c'16 \pp ( d] | \time 2/4; +) c8 r r [c16 ( d] | +) c8 r r [c16 ( d] | +[c d c a][f a c d] | +[f8 d ) c d ( ] | +[ ) a bes () g d' ( ] | +[ ) a bes () g ] [d'16 ( es ] | +[ d es d bes][g bes d es] | +[ g8 es ) d bes ( ] | +[) g a () f c' ( ] | +[) g a () f ][ c'16 ( d ] | +[ ) c8 c16 ( d ][ ) c8 c16 ( d ] | +[ ) c8 c16 ( d ][ ) c8 c16 \f ( d ] | +[c d c a][f a c d] | +[f8 d ) c f, ( ] | +[f' d ) c a ( ] | +[a' f ) e ] [a,,16 ( b ] | +[c-> d c b ][ ) a8 a'16 ( b ] | +[c d c b ][ ) a8 a,16 ( b ] | +[c \> d c \! b ][ ) a8 a'16 ( b ] | +[c d c b ][ ) a8 a,16 ( b ] | +[) c8-. b16 ( c][ ) d8-. c16 ( d ] | +[ es f es ) d ][c8-. d'16 ( e ] | +[f! \sfz g f e][d \> e d c ] | +[ b c b \! a][g a g ) fis ] | +f4 ( \p \< g | +\! a2 | +a4 \> [g8 \! f'] | +[e c a ) g ] | +f4 ( \< g | +\! a2~ | +a4 \> ) g | +\! a2 ( | +[a8_"dim." g f d] | +<{[b g ][a ) g ] |} % grace note b8 b + \type Voice=x {s8.. \tiny b8}> +R2 | +r4 r8 a'-. \mf | +[a-. \< a-. a-. \! a-. ] | +b4. \sfz r8 | +R2 | +r4 r8 a-. \mf | +[a-. \< a-. a-. \! a-. ] | +b4. \f bes8 ( | +) bes'4.-> bes,8 ( | +) bes'4.-> a8 | +[g-. \< f-. e-. \! d-. ] | +[cis16 ( e d b][ ) g8 \f bes8 (] | +) bes'4.-> bes,8 ( | +) bes'4.-> a8 \p | +[g-. \< f-. e-. \! d-. ] | +[g, g'16 \f ( a ][ ) g8 g,, \p ] | +g4 ( a | % added longer slur +b \tiny [a16*1/2 b*1/2] \normalsize[c8*1/2 ) g ] | % grace notes [a16 ( b][) c +g4 ( a | +b \tiny [a16*1/2 b*1/2] \normalsize [) c8*1/2 bes' \f ( ] | % grace notes [a16 ( b][) c +) bes'4.-> a8 | +[f-. e-. d-. f, ( ] | +< ) d'4. \sfz a'> g,8 ( | +< ) d'4. \sfz g> g,8 ( | +) e' r g4-> ( | +) e8 r g4-> ( | +) e8 r es4 ( | +[) d8 g16 ( a ] [ ) g8 g, ( ] | +) e'! r g4-> ( | +) e8 r g4-> ( | +) e8 r es4 ( | +[) d8 g16 ( a ] [ ) g8 g, ( ] | +) e' r g4_"dim." ( | +) e8 r d4 ( | +) e8 r g4 ( | +) e8 r d4 ( | +[ ) e8 \p g,-. a-. b-.] | +c r r4 | +R2 | +r4 e,-. \p | +a ( \< ) e' | +e-. () \! e-. | +e \sfz \> [ d8 \! c ] | +b2 \p | % \p added +\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4 +\! e ) b | +\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4 +\! e ) b | +\tiny d8*1/2 \normalsize f2 \sfz ( *7/8 | +b,4 [c8 ) b] | +a2-> ~ | +gis4 e | +a ( ) e' | +e-. \< () \! e-. | +e ( \sfz \> [ d8 \! c ] | +) b2 \p | +\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4 +\! e ) b | +\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4 +\! e ) b | +\tiny d8*1/2 \normalsize f2 \sfz ( *7/8 | +b,4 [c8 ) b] | +a2 \p ~ | +gis | +\tiny a8*1/2 \normalsize d2 ( \> *7/8 | % grace note a8 () d2 +b4 [ c8 \! b ] | +a2 \p | +) gis | +R2*4 | +[c16 ( \pp d c a][f a c d] | +[f8 d ) c d ( ] | +[ ) a bes () g d' ( ] | +[ a ) bes g ] [d'16 ( es ] | +[ d es d bes][g bes d es] | +[ g8 es ) d bes ( ] | +[) g a () f c' ( ] | +[) g a () f ][ c'16 ( d ] | +[ ) c8 c16 ( d ][ ) c8 c16 ( d ] | +[ ) c8 c16 ( d ][ ) c8 c16 \ff ( d ] | +[c d c a][f a c d] | +[f8 d ) c f, ( ] | +[f' d ) c ][f,16 ( g] | +[ ) f8 f16 ( g][ ) f8 f'16 ( g] | +[f g f d][bes d f g] | +[bes8 g ) f bes, ( ] | +[bes'8 g ) f d ( ] | +[d' bes ) a d,,16 ( e ] | +[f g f e ][ ) d8 d'16 ( e ] | +[f-> g f e][ ) d8 d,16 ( e ] | +[f g f e ][ ) d8 d'16 ( e ] | +[f g f e][ ) d8 d,16 ( e ] | +[ ) f8 e16 ( f][ ) g8 f16 ( g ] | +[as bes as g][ ) f8 g'16 ( a! ] | +[bes! \sfz c bes a][g a g ) f ] | +[e ( f e d][c d c ) b ] | +bes!4 \p ( \< c | % \p added +\! d2 ~ | +d4 [c8 bes' \> ] | +[a f d ) \! c ] | +bes4 ( \< c | +\! d2 ~ | +d4 \> c | +\! d2 | +[d8 c][bes g] | +[e c] \tiny e8*1/4 \normalsize [d *3/4 ) c ] | % grace note e8() d +R2 | +r4 r8 d' \mf | +d2:8 \< | +\! e4 \f r | +R2 | +r4 r8 d | +d2:8 \< | +\! e4 \f r8 es ( | +) es'4.-> es,8 ( | +) es'4.-> d8 \p | +[c-. \< bes-. a-. \! g-. ] | +[fis16 ( a g ) e!] [c8 es8 ( \f ] | +) es'4.-> es,8 ( | +) es'4.-> d8 \p | +[c-. \< bes-. a-. \! g-. ] | +[c, c'16 ( \f d] [) c8 c,, \p ] | +c4^\trill ( d^\trill | +e^\trill \tiny [d16*1/2 e*1/2] \normalsize [f8 *1/2 ) c ] | % grace notes [d16 ( e] )f +c4^\trill ( d^\trill | +e^\trill \tiny [d16*1/2 e*1/2] \normalsize [f8 *1/2 ) es' \f ( ] | % grace notes [d16 ( e] )f % \f added +) es'4. d8 | +[bes-. a-. g-. bes, ( ] | +) d'4. \sfz c,8 ( | +) c'4. \sfz c,8 ( | +) a' r c4-> ( | +) a8 r c4-> ( | +) a8 r as4 ( | +[) g8 c16 ( d][) c8 c, ( ] | +) a' r c4 ( | +) a8 r c4 ( | +) a8 r as4 ( | +[) g8 c16 ( d][) c8 c, ( ] | +) a' r c4_"dim." ( | +) a8 r g4 ( | +) f8 r c4 ( | +) a8 r g4 \p ( | +) f2 \< ~ | +\! f2 ( ~ | +f4 g | +f ) e | +es2 ~ | +d4 r | +\tiny f'8*1/2 \normalsize a4 \sfz ( *3/4 e | % grace note f8() a +f b, | +) c r | +R2 | +f,8 \p r r4 | % \p added +e8 r r [c'16 ( \pp d] | +[ ) c8-. b16 ( c ][ ) b8-. bes16 ( c ] | +[ ) bes8-. a16 ( bes ][ ) a8-. c16 ( d ] | +[ ) c8-. b16 ( c ][ ) b8-. bes16 ( c ] | +[ ) bes8-. a16 ( bes ][ ) a8-. e'16 ( f ] | +[ ) e8-. d16 ( e ][ ) d8-. c16 \< ( d ] | +[ ) c8-. b16 ( \! c ][ ) b8-. bes ] | +bes'4. \sfz \> a8 | +[g-. \! f-. ] [e-. c16 ( d ] | +[ ) c8-. b16 ( c ][ ) b8-. bes16 ( c ] | +[ ) bes8-. a16 ( bes ][ ) a8-. c16 ( d ] | +[ ) c8-. b16 ( c ][ ) b8-. bes16 ( c ] | +[ ) bes8-. a16 \< ( bes ][ ) a8-. \! bes ( ] | +) bes'4. \f d,8 ( | +) d'4.-> c,8 ( | +) c'4.-> e,8 ( | +) e'4.-> [c16 ( d] | +[c d c a][f a c d] | +[f8 d ) c ][ c16 ( d ] | +[c d c a][f a c d] | +[f8 d ) c ][f,16 ( g ] | +[f g f d ][ ) b8 bes'!16 ( c ] | +[bes c bes g][ ) e8 c'16 ( d ] | +[) c8 c16 ( d ][) c8-. c16 ( d ] | +[) c8-. c16 ( d ][) c8-. c16 ( d ] | +) c8-. r c r | +a r r | + r a' r | +c r a r | + r8 c ( | + r8 c ( | + r8 c ( | + r8 c, | +f2 ~ | +f ( | + r^\fermata + +} + +viII=\notes\relative c' { + +\property Staff."midi_instrument" = "violin" + +r4 r e-> \mf ~ | +e r e ( \p | +) f2 f4 ( | +) c r r | +f2 f4 ( | +) e f r | +f2 f4 ( | +) c r r | +f2 f4 ( | +e \< [f8. d16][c8. \! ) d16] | +[e8. \mf ( f16][d8 ) e] f4 ~ | +f ( e [c8 ) e] | +a2. \pp ( | +gis4 e ) f | +g! \p [f8. ( g16] ) f8 r | +c4 ( ~ [c8. d16] ) c8 r | +g'4 [f8. ( g16] ) f8 r | +c4 r r | +}> ~ | +\! c2._"dim." ~ | +c \pp ~ | +c \< ~ | +\! c \> ~ | +\! c \pp \< ~ | +\! c \> ~ | +\! c \pp ~ | +c2 r4 | +R2.*4 | +r4 r^\fermata r8^\fermata [c'16 \pp ( d] | \time 2/4; +) c8 r r [c16 ( d] | +) c8 r r [c16 ( d] | +[c d c a][f a c d] | +[f8 d ) c ] r | +fis,-. r g-. r | +fis r [g d'16 ( es ] | +[ d es d bes][g bes d es] | +[ g8 es ) d ] r | +e,! r f r | +e r f r | +R2 | +r4 r8 [ c'16 \f ( d ] | +[c d c a][f a c d] | +[f8 d ) c f, ( ] | +[f' d ) c f, ( ] | +[f' d ) c ] [a,16 ( b ] | +[c d c b ][ ) a8 a'16 ( b ] | +[c-> d c b ][ ) a8 a,16 ( b ] | +[c d c b ][ ) a8 a'16 ( b ] | +[c-> d c b ][ ) a8 a,16 ( b ] | +[) c8-. b16 ( c][ ) d8-. c16 ( d ] | +[ es f es ) d ][c8-. d'16 ( e! ] | +[f! g f e][d e d c ] | +) b r r8 r4 | +<{d,2 ( \p ~ | + d4 e | + f2 | + ) e | + d ( \p ~ | + d4 e | + f2 | + f | + ) f4 } + {b,2 ( ~ | + b4 c | + b2 | + ) c | + b ( ~ | + b4 c | + b2 | + b4 c | + ) d \p } > r | +R2*2 | +r4 r8 fis-. \mf | +[fis-. \< fis-. fis-. \! fis-. ] | +f!4. \f r8 | +R2 | +r4 r8 fis-. | +fis2:8 | +f!4. \f e8 ( | +) e'4.-> e,8 ( | +) e'4.-> c,8 \p | +[cis-. \< d-. e-. \! f-. ] | +f4. \f e8 ( | +) e'4.-> e,8 ( | +) e'4.-> c,8 \p | +[cis-. \< d-. e-. \! f-. ] | +[f \f g16 ( a][ ) g8 g, \p ] | +g4^\trill ( \< \! a^\trill | +b^\trill \> \tiny [a16*1/2 b*1/2] \normalsize [ ) c8 *1/2 \! g] | % grace notes [a16 b] [c8 +g4^\trill ( \< \! a^\trill | +b^\trill \> \tiny [a16*1/2 b*1/2] \normalsize [ ) \! c8 *1/2 g' \f ( ] | +< ) g4.-> bes> a8 | +[a a a f ( ] | + g,8 ( | + g,8 ( | +<{ ) e r f4_> ( | + ) e8 r f4_> ( | + ) e8 } + {c'8 s d4 ( | + ) c8 s d4 ( | + ) c8 }> r fis4 ( | +[ ) f!8 g16 ( a][ ) g8 f ( ] | +<{ ) e! r f4_> ( | + ) e8 r f4_> ( | + ) e8 } + {c'8 s d4 ( | + ) c8 s d4 ( | + ) c8 }> r fis4 ( | +[ ) f!8 g16 ( a][ ) g8 f ( ] | +<{ ) e r f4 ( | + ) e8 r f4_"dim." ( | + ) e8 r f4 ( | + ) e8 r f4 ( | + [ ) e8 \p } + {c'8 s d4 ( | + ) c8 s b4 ( | + ) c8 s d4 ( | + ) c8 s b4 ( | + [ ) c8 }> g,-. a-. b-. ] | +c r r4 | +R2*2 | +a4:16 \p \< \! b4:16 \> | +\! c2:16 \< | +\! b2:16 \> | +\! b2:16 | +b4:16 \p \< \! c4:16 \> | +\! b2:16 | +b4:16 \p \< \! c4:16 \> | +\! b2:16 | +\tiny d8*1/2 \normalsize f2 ( \> *7/8 | % grace note c8 f2 % corrected to d8 +\! ) e | +b-> ( | +) e4 r | +a,4:16 \p b4:16 | +c2:16 \< | +\! b2:16 \sfz \> | +\! b2:16 | +b4:16 \p \< \! c4:16 \> | +\! b2:16 | +b4:16 \p \< \! c4:16 \> | +\! b2:16 | +\tiny d8*1/2 \normalsize f2 ( \sfz *7/8 | % grace note d8 f2 +) e | +[ a,16 ( \p d a d ][a d a d] | +[ b16 d b d ][b d b ) d] | +f2 ( \> | +) \! e | +[ a,16 ( d a d ][a d a d] | +[ b16 d b d ][b d b ) d] | +R2 | +r8 [e16^"solo" ( f] ) e4 ~ | +d2_"dim." ~ | +d ~ | +c4 r | +r r8 d' ( | +[ ) a bes () g d' ( ] | +[ a ) bes g ] r | +R2 | +r4 r8 bes ( | +[) g a () f c' ( ] | +[) g a () f ] r | +R2 | +r4 r8 [c'16 \sfz ( d ] | +[c d c a][f a c d] | +[f8 d ) c f, ( ] | +[f' d ) c ][f,16 ( g] | +[ ) f8 f16 ( g][ ) f8 f'16 ( g] | +[f g f d][bes d f g] | +[bes8 g ) f bes, ( ] | +[bes' g ) f bes, ( ] | +[bes' g ) f d,16 ( e! ] | +[f-> g f e ][ ) d8 d'16 ( e ] | +[f g f e][ ) d8 d,16 ( e ] | +[f g f e ][ ) d8 d'16 ( e ] | +[f g f e][ ) d8 d,16 ( e ] | +[ ) f8 e16 ( f][ ) g8 f16 ( g ] | +[as bes as g][ ) f8 g'16 ( a! ] | % misprint sfz to early +[bes! \sfz c bes a][g a g ) f ] | +e r r8 r4 | +<{e,2 \p ~ | + e4 \< \! f | + e2 \> | + \! f | + e \< | + e4 \! f | + e2 ( | + ) e4 ( f | + ) g4 \p } + {g2 ( ~ | + g4 a | + bes2 | + ) a | + g2 | + g4 a | + bes2 ( + ) bes2 ( + ) bes4}> r | +R2*2 | +r4 r8 b \p | +b2:8 \< | +< \! g4 bes! \sfz > r | +R2 | +r4 r8 b \p | +b2:8 \< | +< \! g4 bes! \f > r8 a ( | + ) a'> a8 ( | + ) a'> f,8 \p | +[fis-. g-. a-. bes-.] | +bes4. a8 ( \f | + ) a'> a8 ( | + ) a'> f,8 \p | +[fis-. \< g-. a-. \! bes-.] | +[bes \f c16 ( d][)c8 c, \p ] | +c4^\trill ( d^\trill | +e^\trill \tiny [d16*1/2 e*1/2] \normalsize [ f8 *1/2 ) c ] | % grace notes [d16 ( e] )f +c4^\trill ( d^\trill | +e^\trill \tiny [d16*1/2 e*1/2] \normalsize [ ) f8 *1/2 a ( \f ] | % grace notes [d16 ( e] )f + d8 | +[d d d bes \f (] | + bes8 (| + bes8 (| +<{a r bes4 ( | + ) a8 r bes4 ( | + ) a8} + { ) f' r g4^> ( | + ) f8 r g4^> ( | + ) f8}> r b4 ( | +[ ) bes!8 c16 ( d][ ) c8 bes ( ] | +<{a r bes4 ( | + ) a8 r bes4 ( | + ) a8} + {) f' r g4 ( | + ) f8 r g4 ( | + ) f8}> r b4 ( | +[ ) bes!8 c16 ( d][ ) c8 bes ( ] | +<{a r bes4_"dim." ( | + ) a8 r bes4 ( | + ) a8} + {) f' r g4 ( | + ) f8 r e4 ( | + ) f8}> r g4 ( | +) c,8 r e4 \p | +es2 ( | +) d4 \< \! des | +c2 \> ~ | +\! c | +a4 ( \< c | +d \! des | +c \f \> \! ) bes | +a ( \> g | +\! ) a r | +R2 | +c8 \p r r4 | +c8 r r4 | +R2 | +r4 r8 c \p ~ | +c d4 e8 ~ | +e f4 c8 ~ | +c d4 e8 ~ | +e \< e4 \! e8 ( | +) bes'!4. \sfz \> \! a8 | +[g-. f-. e-.] r | +R2 | +r4 r8 es \p ~ | +es es4 es8 ~ | +es \< es4 \! d8 \f | + d'4.-> <{bes8 ( | + ) g'4. bes,8 ( | + ) g'4. bes,8 ( | + ) g'4. } + {d,8 | + bes'4. g8 | + bes4._> g8 | + bes4._> }> [c,16 ( d] | +[c d c a][f a c d] | +[f8 d ) c ][ c16 ( d ] | +[c d c a][f a c ) d] | +[f8 ( d ) c ][f16 ( g ] | +[f g f d ][ ) b8 bes!16 ( c ] | +[bes c bes g][ ) e8 < bes' g'^. > ] | +<{[a bes a bes] | + [a bes a bes] | + [a} + {[f'-. g-. f-. g-.] | + [f-. g-. f-. g-.] | + [ f}> c16 ( d ][ ) c8-. c16 ( d ] | +[ ) c8-. c16 ( d ][ ) c8-. c16 ( d ] | +) c8-. r r | + r r | + r8 c ( | + r8 c ( | + r8 c ( | + r8 c, | +[a16 ( gis a gis][a gis a gis] | +[a gis a gis][a gis a gis] | +<) a4 f' \sfz > r^\fermata +} + +vla=\notes\relative c' { +\clef "alto"; + +\property Staff."midi_instrument" = "viola" + +[c8. \f ( d16 ] ) c2_"dim." | +\type Staff <{\voiceone s4 c2 | + c2. ~ | + c2. ~ | + c2. ~ | + c2. ~ | + c2. ~ | + c2. ~ | + c2. ~ | } + { \voicetwo [c8. ( d16 ] c4 ) bes | + [a8 \p ( bes ] a4. ) c8 | % added \p + [a8 ( bes ] a4. ) c8 | + [a8 ( bes ] a4. ) c8 | + [c8 ( bes ] ) a2 | + [a8 ( bes ] a4. ) c8 | + [a8 ( bes ] a4. ) c8 | + [a8 ( bes ] a4. ) c8 |} > +[c8. ( \< bes16 ] ) \! a2 | +g2 \mf [a8 \< ( \! d ] | +[ c \> b \! c g e ) c] | +[e'8. \pp ( f16 d8 e f d ] | +b4 [c8 \< a f \! ) a ] | +c,2 \p ~ c'4 | +c,2 ~ c'4 | +c,2 ~ c'4 | +c, ~ c' r | +[c,8 ( g' ][ c g c a ] | +[bes c ] ) a4 r | +R2. | +r4 r dis, \< ~ | +\! e r dis' \pp ~ | +e r r | +R2. | +r4 r c, \pp ~ | +c2. ~ | +c4 r r | +R2.*3 | +r4 r^\fermata r8^\fermata r8 | +R2*4 | +c'8-. \pp r bes-. r | +c-. r bes-. r | +R2*2 | +bes8-. r a-. r | +bes-. r [a-. c16 ( d ] | +[ ) c8 c16 ( d ] [ ) c8 c16 ( d ] | +[ ) c8 c16 ( d ] [ ) c8 c16 () f ] | +[c ( \f f c f][ c f c ) f ] | +[d ( f d f][ c f c ) f ] | +[d ( f d f][ c f c ) f ] | +[d ( f d f] ) a8 r | +f,4.-> [a16 ( b] | +[c d c b] ) a8 r | +f4. [a16 ( b] | +[c d c b] ) a8 r | + r r | + r r | +[ d'16 ( e][f g f e ] | +[d e d c] ) b8 r | +[as16 ( \p g as g] [fis g fis ) g ] | +[f! ( g f g][e g e ) g] | +d4 \> \! g | +[c,16 ( g' a g ] [a g a ) g ] | +[as16 ( \p g as g] [fis g fis ) g ] | +[f! ( g f g][e g e ) g] | +[d ( g d g ][d g d g ] | +[d g d g ] [c, g' c, g' ] +) d4 r | +r r8 | + | + | +< \! c2:8 \f g'2:8 > | +<{[c8 c c c \p ]}{[g' g g g]}> | + | + | + | +<{[c8 c c c ] | + c'4.-> c,8 | + c'4. } + {[g8 g g g (] | + ) g'4. g,8 ( | + ) g'4. } + > a'8-. \p | +[g-. \< f-. e-. \! d-. ] | +b4. <{c,8 \f | + c'4.-> c,8 | + c'4. } + { g8 ( | + ) g'4. g,8 ( | + ) g'4. }> a'8-. \p | +[g-. \< f-. e-. \! d-. ] | +b4 r8 | + | + | +< c2:8 g'2:8 > | +<{[ \! c8 c c cis \f (]}{[g' g g s ]}> | +) cis'4.-> cis8 | +[d a d ] | + | + g,8 ( | +[c,16 g' fis ) g] [c, (g' fis ) g ] | +[c, ( g' fis ) g] [c, (g' fis ) g ] | +[c, ( g' fis ) g] [c, (a' gis ) a ] | +[b ( c d ) b ][g ( a f ) d ] | +[c ( g' fis ) g] [c, (g' fis ) g ] | +[c, ( g' fis ) g] [c, (g' fis ) g ] | +[c, ( g' fis ) g] [c, (a' gis ) a ] | +[b ( c d ) b ][g ( a f ) d ] | +[c ( g' fis ) g] [c, (g' fis ) g ] | +[c,_"dim." ( g' fis ) g] [c, (g' fis ) g ] | +[c, ( g' fis ) g] [c, (g' fis ) g ] | +[c, ( g' fis ) g] [c, (g' fis ) g ] | +c,8 \p r r4 | +r8 [g'-. a-. b-.] | +c r r4 | +r8 <{[b c d] | c }{gis-. a-. b!-. | a}> + r r4 | +R2*2 | +g'4 \p ( [fis8 \< dis ] | +\! e4 fis | +g \> [fis8 ) \! dis ] | +e4 \< ( \! fis | +g \> [fis8 ) \! dis ] | + ~ | + | + ~ | + | +c4 r | +R2*2 | +g'4 \p ( [fis8 \< dis ] | +\! e4 fis | +g \> [fis8 ) \! dis ] | +e4 \< ( \! fis | +g \> [fis8 ) \! dis ] | + ~ | + | +d \p ~ | +d | + > ~ | + | +d \p ~ | +d ~ | +d ~ | +d_"dim." ~ | +d4 r | +r8 [e16 ( f ] e4 | +) es \pp r | +R2*3 | +g,2 ~ | +g4. r8 | +R2 | +r4 r8 [c16 \p ( d ] | +[ ) c8 c16 ( d ] [ ) c8 c16 ( d ] | +[ ) c8 c16 ( d ] [ ) c8 c16 ( f ] | +[c \sfz f c f][ c f c ) f ] | +[d ( f d f][ c f c ) f ] | +[d ( f d f] ) c8 r | +r4 r8 [ f16 () g ] | + | + | + | + r | +bes,4.-> [d16 ( e ] | +[f g f e ] ) d8 r | +bes4.-> [d16 ( e ] | +[f g f e ] ) d8 r | + r r | + r r | +[ g'16 ( a ] [bes! \> c \! bes a ] | +[g a g f ] ) e r r8 | +[des16 ( \p c des c ] [ b c b c ] | +[bes! \< c bes c ] [ \! a c a ) c ] | +g4 \> \! c, ( | +[f16 c' d c][d c d ) c] | +[des16 ( \p c des c ] [ b c b c ] | +[bes! \< c bes c ] [ \! a c a ) c ] | +[g \> ( c g c][g c g \! c ] | +[g c g c][f, c' f, ) c'] | +e,4 \p r | +r r8 | + | + | + | +<{[f8 \f f f f \p ]}{[c'8 c c c]}> | + | + | + | +<{[f8 f f f] | + f'4._> f,8 | + f'4._> } + {[c8 c c c ( ] | + ) c'4. c,8 ( | + ) c'4. }> d'8 \p | +[c-. \< bes-. a-. \! g-. ] | +<{c,4. f,8 \f | + f'4._> f,8 | + f'4. } + {e4. c8 ( | + ) c'4. c,8 ( | + ) c'4. }> d'8 | +[c-. \< bes-. a-. \! g-. ] | + r8 | + | + | + | +<{[f8 f f fis \f ~ ]}{[c'8 c c s]}> | + fis'8 | +[g d g ] | + | + c,8 ( | +[f16 c' b ) c ][ f, ( c' b ) c ] | +[ f, ( c' b ) c ] [ f, ( c' b ) c ] | +[ f, ( c' b ) c ] [ f, ( d' cis ) d ] | +[e ( f g ) e ][c ( d bes ) g] | +[ f ( c' b ) c ] [ f, ( c' b ) c ] | +[ f, ( c' b ) c ] [ f, ( c' b ) c ] | +[ f, ( c' b ) c ] [ f, ( d' cis ) d ] | +[e ( f g ) e ][c ( d bes ) g] | +[ f ( c' b ) c ] [ f, ( c' b ) c ] | +[ f,_"dim." ( c' b ) c ] [ f, ( c' b ) c ] | +[ f, ( c' b ) c ] [ f, ( c' b ) c ] | +[ f, ( c' b ) c ] [ f, ( c' b ) c ] | +f,2 \p ~ | +f4 r | +R2*2 | +f'2 ( ~ | +f | +f4 \f g | +) f [f8. ( \> g16 ] | +\! f2 | +) c | +a8 \p r r4 | +g8 r r a \pp ~ | +a as4 g8 ~ | +g f4 a!8 ~ | +a as4 g8 ~ | +g f4 e8 ~ | +e \< f4 e8 ~ | +\! e d4 c8 ( | + f8 | +[g-. a-. bes-. a ~ ] | +a as4 g8 ~ | +g f4 a!8 ~ | +a \< as4 \! g8 ~ | +g f4 \f f8 ( | + ) f' > g8 ( | + ) bes' > e,!8 ( | + ) g' > | + ) g' > c,8 ~ | +f4. a8 ( | +[d f ) a ] c,,8 ~ | +f4. a8 ( | +[d f ) a ] [f16 ( g ] | +[f g f d ][ ) b8 bes'!16 ( c ] | +[bes c bes g][ ) e8 c'16 ( d ] | +[) c8-. c16 ( d ][) c8-. c16 ( d ] | +[) c8-. c16 ( d ][) c8-. c16 ( d ] | +[) c8-. c,16 ( d ][) c8-. c16 ( d ] | +[) c8-. c16 ( d ][) c8-. c16 ( d ] | +) c8-. r c-. r | +a r c-. r | + r8 c ( | + r8 c, ( | + r8 c ( | + r8 c, | +[c'16 ( b c b][c b c b] | +[c b c b][c b c b] | + r^\fermata +} + +vlc=\notes\relative c' { +\clef "bass"; + +\property Staff."midi_instrument" = "cello" + +r4 r [bes8. \mf ( c16] | +) bes4 r bes \p ( | +[ a8 bes ) a f, ( c' f] | +[ a8 bes ) a f, ( c' f] | +[ a8 bes ) a f, ( c' f] | +[c' bes ) a f, ( c' f] | +[ a8 bes ) a f, ( c' f] | +[ a8 bes ) a f, ( c' f] | +[ a8 bes ) a f, \< ( c' f] | +[c' bes a f \! c ) f, ] | +<{g2. ( | ) g2 } + {c,2. \mf ( | ) c2 \> ( ) \! c'4 |} + {s2. \< \! s8}> +a2 \pp d4 \< ( | +e ) \! a2 | +[bes8 \p ( c] [a c a c] | +[bes8 c] [a c a c] | +[bes8 c] [a c a ) c] | +[c ( bes a f c ) f, ] | +e2 (\< \! f4 | +g \> ) \! f r | +e'2 ( f4 | +g ) f f, ( \< | % added slur +) \! e2 f'4 ( | +) e2 dis4 ( \< | +\! ) e2 dis4 ( \pp | +) e2. ~ | +e2 r4 | +R2.*4 | +r4 r4^\fermata r8^\fermata [c'16 \pp ( d] | \time 2/4; % \pp added +) c8 r r [c16 ( d] | +) c8 r r [c16 ( d] | +[c d c a][f a c d] | +[f8 d ) c] r | +d,-. \pp r g-. r | +d-. r [g-. d'16 ( es] | +[d es d bes][g bes d es] | +[g8 es ) d] r | +c,-. r f-. r | +c-. r [f-. c'-. ] | +[bes-. a-. g-. f-.] | +[e d][c a'16 \f ( f] | +[a f a f][a f a ) f] | % Misprint trem 8 +[bes ( f bes f][a f a ) f] | +[bes ( f bes f][a f a ) f] | +[a ( d, a' d,][)a8 a'16 ( b] | +[c d c b ][) a8 f ( ] | +) e4. [a16 ( b] | +[c d c b ][) a8 f ( ] | +) e4. [a,16 ( b ] | +[)c8 b16 ( c][)d8 c16 ( d] | +[es f es d] ) c8 r | +[g \sfz d''16 ( e] [f g f e] | +[d e d c][b c b ) a] | +[as \p ( g as g][fis g fis g ] | +[f! \< g f g][e g e ) \! g] | +[d \> ( g d g] [d g d ) \! g] | +c,2 | +[as'16 ( g as g][fis g fis g ] | +[f! g f g][e g e ) g] | +[d ( g d g] [d g d g] | +d4 c \p | +) b r | +R2*2 | +r4 r8 c'8 \f ( | % Misprint, missing slur +) c,4. c8 ( | +) c,4. r8 | +R2 | +r4 r8 c''8 \f (| +) c,4. c8 ( | +) c,4. c''8 ( | +< ) g4. c,_> > c8 ( | +< ) g4. c,> c,8 | +[cis-. \p \< d-. e-. \! f-. ] | +g,4. c8 \f ( | +< ) c4. f,_> > c8 ( | % slur added +< ) c4. f,> c8-> | +[cis-. \p \< d-. e-. \! f-. ] | +g,4 r8 <{ c8 \p | + c2:8 | + c2:8 \< | + \! c2:8 | + [c8 c s s] | + a4.} + {g'8 | + g2:8 | + g2:8 | + g2:8 | + [g8 g c cis] | + e,4.-> }> a8 | +[d-. e-. f-. b ( ] | +) b,4. \f b'8 ( | +< ) d,4. \f g,> g8 ( | +[)c,16 g' (fis) g][c,( g' fis ) g] | +[c, ( g' fis ) g][c, ( g' fis ) g] | +[c, ( g' fis ) g][c, ( a' gis ) a] | +[b ( c d ) b][g ( a f )d ] | +[c ( g' fis ) g][c, ( g' fis ) g] | +[c, ( g' fis ) g][c, ( g' fis ) g] | +[e ( g fis ) g][c, ( a' gis ) a] | +[b ( c d ) b][g ( a f )d ] | +[c ( g' fis ) g][c, ( g' fis ) g] | +[c, ( g' fis ) g][c, ( g' fis ) g] | +c,4_"dim." r | +c4 r | +c8 r8 r4 | +R2 | +r8 [c-.^"solo" \p d-. dis-. ] | +e r e, r | +c'4:16 \p d4:16 | +e4:16 \< \! fis4:16 | +g!2:16 \> | +g4:16 \! a4:16 | +g4:16 \< \! a4:16 | +g4:16 \> \! a4:16 | +g4:16 \< \! a4:16 | +g4:16 \> \! a4:16 | +gis2 \sfz ~ | +gis | +f! ( | +[e8 d c ) b ] | +c4:16 \p d4:16 | +e4:16 \< \! fis4:16 | +g!2:16 \> | +\! g4:16 \p \< \! a4:16 | +g4:16 \> \! a4:16 | +g4:16 \< \! a4:16 | +g4:16 \> a4:16 | +g4:16 \! a4:16 | +gis2 \sfz ~ | +gis ~ | +f \p \> | +\! e_"dim." | +d | +e | +f | +e | +[f16 ( g f g][f g f8 ] | +) e4 r | +[f16 ( g f_"dim." g][f g f8 ] | +) e4 r | +[c'16 ( d c a][f a c ) d] | +[f8 ( d ) c] r | +fis,8-. r g-. r | +d r [g d'16 ( es] | +[d es d bes][g bes d es] | +[g8 es ) d] r | +c, r f-. r | +c r [f-. c'-. ] | +[bes-. a-. g-. f-.] | +[e d][c a'16 \f ( f] | +[a f a f][a f a ) f] | % Misprint trem 8 +[bes ( f bes f][a f a ) f] | +[bes ( f bes f][) a8 f-.] | +[e-. es-. d-. c-. ] | +[bes16 ( f' bes f][bes f bes ) f] | +[bes, ( a bes a][bes d f ) bes ] | +[bes, ( a bes a][bes d f ) bes ] | +g4 ( [ ) d8 d'16 ( e] | +[f g f ) e] [d8 bes^._> ] | +a4. [d16 ( e] | +[f g f ) e] [d8 bes ( ] | +) a4. [d,16 ( e ] | +[) f8-. e16 ( f] [) g8-. f16 ( g] | +[)as ( bes as g ] ) f8 r | +c \sfz r r [e'16 ( f ] | +[g a_"dim." g f][e f e ) d] | +[des \p \< ( c des c][b c b \! ) c ] | +[bes! ( c bes c][a c a ) c ] | +[g ( c g c][g c g ) c] | % misprint a c a c a c a c, comp. bar 59 +f,2 | +[des'16 \p ( c des c][b c b ) c ] | +[bes! ( c bes c][a c a ) c ] | +[g ( c g c][g c g c] | % misprint a c a c a c a c, comp. bar 64 +g4 f | +) e r | +R2*2 | +r4 r8 f' \f (| +) f,4.-> f8 ( | +) f,4.-> r8 | +R2 | +r4 r8 f'' (| +) f,4.-> f8 ( | +) f,4.-> f'8 (| +<) c4. f, > f8 ( | +<) c4. f,> f8 \p | +[fis-. \< g-. a-. \! bes-. ] | +c,4. f8 \f ( | +<) f4. bes,_> > f8 (| +<) f4. bes,> f8 | +[fis-. \< g-. a-. \! bes-. ] | +c,4 r8 <{ f8 \p | + f2:8 \< | + f2:8 | + \! f2:8 | } + {c'8 | + c2:8 | + c2:8 | + c2:8 |}> + [c'8 c f fis ( \f ] | + < ) a,4. d,_> > d,8 | +[g-. a-. bes-. e! ( ] | +) e,4.-> e'8 | +< g,4. c,_> > c8 | +[f,16 ( c' b c][f,16 c' b ) c] | +[f,16 ( c' b c][f,16 c' b ) c] | +[f,16 ( c' b ) c][f, ( d' cis ) d] | +[e ( f g ) e][c ( d bes ) g] | +[f16 ( c' b ) c][f,16 ( c' b ) c] | +[f,16 ( c' b ) c][f,16 ( c' b ) c] | +[f,16 ( c' b ) c][f, ( d' cis ) d] | +[e ( f g ) e][c ( d bes ) g] | +[f16 ( c' b ) c][f,16 ( c' b ) c] | +[f,16 ( c' b ) c][f,16 ( c' b ) c] | +f,8 r e'4 ( | +) f8 r bes,4 ( | +) a2 ( | +) bes | +a4 \< ( \! bes | +a \> ) \! g | +a2 ( \< | +) \! bes | +f4 \f \> ( cis | +d \! g, | +) c!8 r r4 | +R2 | +c8 r r4 | +c8 r r4 | + r r | + r r | + r r | + r r | +e, r e r | +e r [e () c] | +c'4. \f \> \! d8 | +[e-._"dim." f-. g-.] r | + r r | + r r | + r r | + r bes' \f | +bes,4.-> g'8 ( | +) g,4.-> e'!8 ( | +) e,!4.-> c'8 ( | +) c,4.-> [c''16 ( d ] | +[c d c a][f a c d] | +[f8 d ][) c c16 ( d] +[c d c a][f a c d] | +[f8 d ][) c d, ( ] | +) g,4.-> g'8 ( | +) c,4.-> c'8 ( | +[ ) f, c-. f-. c-. ] | +[f-. c-. f-. c-. ] | +f r c r | +f r c' r | +f, r c r | +a r c r | +f4 r8 c8 ( | +) f4 r8 c8 ( | +) f,4 r8 c'8 ( | +) f4 r8 c8 ( | +) f,2 ~ | +f ( | +) f'4 \sfz r^\fermata +} + +cb=\notes\relative c { +\clef "bass"; + +\property Staff."midi_instrument" = "contrabass" + +r4 r c-> \mf ~ | +c r c \p ( | +) f,2. ~ | +f ~ | +f2 f'4 ( | +c ) f r | +f,2. ~ | +f ~ | +f ~ | +f2 r4 | +c'2. ~ | +c | +a2 d4 ( | +e a ) f | +c2. \p ~ | +c ~ | +c ~ | +c4 () f r | +e2 f4 ( | +g ) f r | +R2. | +r4 r f ( \< | +\! ) e2 r4 | +r r dis ( \< | +\! ) e2 r4 | +R2.*6 | +r4 r^\fermata r8^\fermata r | +R2*4 | +d8-. \pp r g-. r | +d-. r g-. r | +R2*2 | +c,8-. r f-. r | +c-. r f-. r | +R2 | +r4 r8 f8 \f ~ | +f2 | +f | +f | +d4 () a8 r | +f4.-> f'8 ( | +) e4. r8 | +f,4.-> f'8 ( | +) e4. r8 | +f,8 r f' r | +fis r fis r | +g \sfz r r4 | +R2*3 | +r4 g, ( | +) c r | +R2*8 | +c'4_"pizz." \f r | +c, r | +R2*2 | +c'4_"pizz." r | +c, r8 c'8_"arco?" ( | +) c,4.-> c'8 ( | +) c,4. f8-. | +[f-. \p \< f-. f-. \! f-.] | +g4. c,8 ( | +) f,4.-> c'8 ( | +) f,4.-> f'8 | +[f-. \p \< f-. f-. \! f-.] | +g4 r8 c, \p | +c2:8 \< | +c2:8 | +c'2:8 | +\! c4.:8 cis8 \f ( | +) a,4. a8 | +[d e f b ( ] | +) b,4. \f b'8 ( | +) g,4. \f g'8-> | +c,4 c-> ~ | +c c-> ~ | +c c-> ~ | +c r | +c c ~ | +c c ~ | +c c ~ | +c r | +c r | +c r | +c_"dim." r | % dim. added +c r | +c8 r r4 | +R2 | +r8 [c-.^"solo" \p d-. dis-.] | +e r e, r | +a2 \p | +a \< ( | +\! e' \> | +\! ) e4 r | +e2 \< ~ | +\! e4 \> \! r | +e2 \< ~ | +\! e4 \> \! r | +e2 \sfz ~ | +e | +f! ( | +[e8 d c ) b] +a2 \p ~ | +a | +e' \sfz \> ~ | +\! e4 r | +e2 \> ~ | +\! e4 r | +e2 \> ~ | +\! e4 r | +e2 \sfz ~ | +e ~ | +f \p ~ | +e | +d \> ( | +e | +\! f \p | +) e4 r | +R2*6 | +fis8-. r g-. r | +d-. r g-. r | +R2*2 | +c,8-. r f-. r | +c-. r f-. r | +R2 | +r4 r8 f \f ~ | +f2 | +f | +f,4. f'8 | +[e8-. es-. d-. c-. ] | +bes2 | +bes | +bes | +g'4 () d8 r | +bes4. bes'8 ( | +) a4. r8 | +bes,4. bes'8 ( | +) a4. r8 | +bes, r bes' r | +b r b, r | +c \sfz r r4 | +R2*3 | +r4 c ( | +) f r | +R2*8 | +f4_"pizz." r | +f, r | +R2*2 | +f'4 r | +f, r | +f'4._"arco" r8 | +f4. bes,8 \p | +bes2:8 \< | +\! c4. f8 \f ( | +) bes,4.-> | +) bes,4. bes'8 | +c2: \< | +\! c4 r8 f, \p | +f2:8 \< | +f2:8 | +\! f2:8 | +f4.:8 fis8 \f ( | +) d4.-> d8 | +[g-. a-. bes-. e ( ] | +) e,4.-> e'8 | +c,4.-> c'8 ( | +) f,4 f~ | +f f~ | +f f~ | +f r | +f, f ~ | +f f ~ | +f f' ~ | +f r | +f r | +f_"dim." r | +f r | +f r | +f2 \p \< ~ | +f ~ | +\! f \> ~ | +\! f | +f, \< ~ | +\! f | +f'4 ( \f \> cis | +\! d g, | +) c! r | +R2 | +c8 \p r r4 | +c8 r r4 | +f8 \pp r f r | +f r f r | +f r f r | +f r f r | +e r e r | +e r e r | +c4. \f \> d8 | +[e-. f-. \! g-.] r | +f \p r f r | +f r f r | +f r f r | +f r f r | +bes4.-> r8 | +g4.-> r8 | +e!4.-> r8 | +c4. c8 ( | +) f2 ( | +) f,4. c'8 | +f2 ( | +) f,4. d'8 ( | +) g,4.-> g'8 ( | +) c,4.-> c'8 ( | +[ ) f, c-. f-. c-. ] | +[ f-. c-. f-. c-. ] | +f r c r | +f r c' r | +f, r c r | +a r c r | +f4 r8 c8 ( | +) f4 r8 c8 ( | +) f,4 r8 c'8 ( | +) f4 r8 c8 ( | +) f,2 ~ | +f ( | +) f'4 \sfz r^\fermata +} \ No newline at end of file diff --git a/mutopia/N.W.Gade/wood.ly b/mutopia/N.W.Gade/wood.ly new file mode 100644 index 0000000000..d7afe817ad --- /dev/null +++ b/mutopia/N.W.Gade/wood.ly @@ -0,0 +1,1066 @@ +\version "1.0.14"; + +oboe=\notes\relative c'' { +\clef "treble"; +\property Staff."midi_instrument" = "oboe" + +[c8. \f ( d16] ) c2_"dim." | +[c8. ( d16] ) c2 | +[c8. \p ( d16] c4. a8 | +[f8. e16 ] f4. ) a8 | +[c8. ( d16] c4. ) a8 | +[a8. ( g16 ] ) f4 r | +[c'8. \p ( d16] c4. a8 | +[f8. e16 ] f4. ) a8 | +[c8. ( d16] c4. ) a8 | +[a8. ( g16 ] ) f4 r | +R2.*4 | +[c'8. ( d16] c4. a8 | +[g8. a16 ] f4. ) a8 | +[c8. ( d16] c4. ) a8 | +[a8. ( g16 ] ) f4 r | +R2.*13 | +r4 r4^\fermata r8^\fermata r8 \time 2/4; +R2*4 | +d'8-. \pp r d-. r | +d-. r d-. r | +R2*2 | +c8-. r c-. r | +c8-. r c-. \p [c16 ( d]| +) c8 r \< r [c16 ( \! d]| +) c8 r r [c16 \f ( d]| +) c8 r r f, ( | +) f'4. f,8 ( | +) f'4. a,8 ( | +) a'4. r8 | +dis,2 ( | +) e4. r8 | +dis2 ( | +) e4. r8 | +a r a r | +a r d, r | +g r r4 | +R2*10 | +r4 r8 [g16 \p ( a ] | +[ ) g8-. fis16 ( g ][ ) fis8-. f16 ( g ] | +[ ) f8-. e16 ( f ][ ) e8-. es16 ( f ] | +[ ) es8 \f c16 ( d][es8 d16 c ] | +) d4 r8 [g16 \p ( a ] | +[ ) g8-. fis16 ( g ][ ) fis8-. f16 ( g ] | +[ ) f8-. \< e16 ( f ][ ) e8-. \! es16 ( f ] | +[ ) es8 \f c16 ( d][es8 d16 c ] | +) d4 r8 bes! ( | +) bes'4.-> bes,8 ( | +) bes'4.-> a8 \p | +[g-. \< f-. e-. \! d-. ] | +[cis16 ( e d ) b] g8 bes! \f ( | +) bes'4.-> bes,8 ( | +) bes'4.-> a8 \p | % \p added +[g-. \< f-. e-. \! d-. ] | +g-. r r [g16 \p ( a] | +[ ) g8-. fis16 ( g ][ ) fis8-. f16 ( g ] | +[ ) f8-. e16 ( f ][ ) e8-. e16 ( f ] | +[ ) e8-. es16 ( f ][ ) es8-. d16 ( e ] | +[ ) d8-. c16 ( d ] ) c8 bes! \f ( | +) bes'4. r8 | +R2 | +d,4. \sfz r8 | +d4. \sfz r8 | +e8 r g4-> ( | +) e8 r g4-> ( | +) e8 r es4 ( | +) d8 r r g ( | +) e!8 r g4-> ( | +) e8 r g4-> ( | +) e8 r es4 ( | +) d8 r r g ( | +) e!8_"dim." r g4 ( | +) e8 r r4 | +R2*2 | +r8 [g,-.^""^"solo" \p a-. b-. ] | +c r r4 | +R2*10 | +\tiny d8 \sfz *1/2 \normalsize f2 \> ( *7/8 | +\! b,4 [c8 b] | +a2-> | +) gis | +a4 ( \p \< ) e' | +e-. () \! e-. | +e ( \> [ d8 \! c ] | +) b2 \p | +\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4 +\! e ) b | +\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4 +\! e_"dim." ) b | +\tiny d!8 \sfz *1/2 \normalsize f2 ( \> *7/8 | +b,4 [ \! c8 b] | +a2 \p | +) gis | +\tiny a8*1/2 \normalsize d2( \> *7/8 | % grace note a8 () d2 +\! b4 [ c8 b ] | +a2 \p | +) gis | +R2*11 | +r4 r8 [c16 \p ( d ] | +) c8 r r [c16_"cresc." ( d ] | +) c8 r r [c16 \f ( d ] | +) c8 r r f, ( | +) f'4. f,8 ( | +) f'4. a,8 | +[bes-. c-. d-. es-. ] | +d4 r8 bes ( | +) bes'4 r8 bes, ( | % slur added +) bes'4 r8 d, ( | +[ d' bes ) a ] d ( | +) gis,2 ( | +) a4 r8 d ( | +) gis,2 ( | +) a4 r8 d ( | +) as r g r | +f r f r | +e r r4 | +R2*10 | +r4 r8 a | +a-. [ gis-. gis-. \< g-.] | +[g-. fis-. \! fis-. f-. ] | +[f f16 ( \f g][as8 g16 f ] | +) g8 [c16 ( d] ) c8 a \p | +[a-. gis-. gis-. \< g-.] | +[g-. fis-. \! fis-. f-. ] | +[f f16 ( \f g][as8 g16 f ] | +) g8 [c16 ( d] ) c8 r | +es,4.-> r8 | +es4.-> r8 | +r4 r8 d ( | +) c4. r8 | +es4.-> r8 | +es4.-> r8 | +r4 r8 d8 ( | +) bes4 r8 a' \p | +[a-. gis-. gis-. \< g-.] | +[ \! g-. f-. f-. ] c | +[c-. \< b-. b-. bes-. ] | +[bes-. a-. \! a-. es' ( ] | +) a4. \f r8 | +r4 r8 bes, ( | +) g'4. \sfz c,8 ( | +) g'4. \sfz c,8 ( | +) a' r c4-> ( | +) a8 r c4-> ( | +) a8 r as4 ( | +) g8 r r c ( | +) a! r c4 ( | +) a8 r c4 ( | +) a8 r as4 ( | +) g8 r r c ( | +) a! r c4_"dim." ( | +) a8 r g4 ( | +) f8 r r4 | +R2*7 | +\tiny f8 \f *1/2 \normalsize a4 \> ( *3/4 e | % grace note f8 a4 +f \! b, | +) c r | +R2*7 | +e8-. \p r d-. \< r | +c-. r b-. \! r | +bes!4. \f r8 | +R2 | +c8-. \p r b-. r | +bes!-. r a-. r | +c-. \p r b-. r | +bes!-. r a-. bes \f ( | +) bes'4. bes,8 ( | +) bes'4. bes,8 ( | +) bes'4. bes,8 ( | +) bes'4. c,8 ( | +) a'4 r8 f ( | +bes4 ) a8 c, ( | +) a'4 r8 f ( | +bes4 ) a8 f ( | +) b4. e,8 ( | +) bes'!4. bes8 | +[a-. bes-. a-. bes-. ] | +[a-. bes-. a-. bes-. ] | +a-. r c-. r | +a-. r e-. r | +f-. r a-. r | +c r a r | +f4 r8 c ( | +) a'4 r8 c, ( | +) f4 r8 c ( | +) a'4 r8 c, ( | +) f4 r | +R2 | +f4-. \sfz r^\fermata +} + + +flauto=\notes\relative c''' { +\clef "treble"; +\property Staff."midi_instrument" = "flute" + +[c8. \f ( d16] c2 | +)c,8 r r4 r | +R2.*4 | +[c8. \p ( d16] c4. ) a8 | +[f8. ( e16 ] f4. ) a8 | +[c8. ( d16] c4. ) a8 | +[a8. ( g16 ] ) f4 r | +R2.*4 | +[c'8. ( d16] c4. ) a8 | +[g8. ( a16 ] f4. ) a8 | +[c8. ( d16] c4. ) a8 | +[a8. ( g16 ] ) f4 r | +R2.*13 | +r4 r4^\fermata r8^\fermata r8 \time 2/4; +R2*4 | +a'8-. \pp r g-. r | +a8-. r g-. r | +R2*2 | +g8-. r f-. r | +g8-. r f-. r | +R2 | +r4 r8 [c'16 \f ( d] | +[c d c a][f a c d] | +[f8 d ) c] f, ( | +[f'8 d ) c] a ( | +[a'8 f ) e] a ( | +dis,2 | +) e4 r8 a8 ( | +dis,2 | +) e4 r8 a ( | +) es r d r | +c r d r | +g, r r4 | +R2*10 | +R4 r8 e' \p | +e [es-. es-.] d-. | +d-. [cis-. cis-.] c-. | +c [c16 ( d] [es8 d16 c] | % slur added +) d4 r8 e!-. \p | +e-. [es-. es-.] d-. | +d-. [cis-. cis-.] c | +c-. [c16 ( d][es8 d16 c] | +) d4 r8 e,! ( | +)e'4.-> e,8 ( | +)e'4.-> a8 \p | +[g-. f-. e-. d-.] | +[cis16 ( \< e d \! b ] ) g8 e \f ( | +)e'4.-> e,8 ( | +)e'4.-> a8 \p | +[g-. \< f-. e-. \! d-.] | +g r r e-. \p | +e-. [es-. \< es-.] d-. | +d-. [c-. \! c-.] g-. | +g-. [fis-. \< fis-.] f-. | +f-. [e-. \! e-.] bes \f ( | +) bes'4.-> a8-. | +[f'-. e-. d-.] f, ( | +) f'4. \sfz g,8 ( | +) g'4. \sfz g,8 ( | +) e' r g4-> ( | +) e8 r g4-> ( | +) e8 r es4-> ( | +) d8 r r g, ( | +) e' r g4 ( | +) e8 r g4 ( | +) e8 r es4-> ( | +) d8 r r g, ( | +) e' r g4 ( | +) e8 r d4 ( | +) e8 r r4 | +R2*27 | +d2 ( \p | +) gis, | +R2*2 | +d'2 ( \p | +) gis, | +a ( | +) gis | +a_"dim." ( | +) gis ( | +) a ( | +bes!4 ) a8 r | +a r bes r | +fis r g r | +bes2 ( | +c4 ) bes8 r | +bes r a r | +e! r f r | +R2 | +r4 r8 [c'16 \f ( d] | % \f added +[c d c a][f a c d] | +[f8 d ) c] f, ( | +[f'8 d ) c] f,-. | +[g-. a-. bes-. a-. ] | +bes4 r8 bes,8 ( | +[bes' g ) f] bes,8 ( | +[bes' g ) f] bes,8 ( | +[d' g ) f! ] d ( | +gis,2 | +) a4. d8 ( | +gis,2 | +) a4. d,8 ( | +) d' r d-. r | +d-. r d-. r | +c r r4 | +R2*10 | +r4 r8 [c16^""^"solo" \p ( d] | +) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] | +)bes8-. [a16 ( \! bes ] ) a8-. [as16 ( bes ] | +) as8-. \f [f16 ( g][as8 g16 f ] | +) g4 r8 [c16 ( d] | +) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] | +)bes8-. [a16 ( \! bes ] ) a8-. [as16 bes ] | +as8 \f [f16 ( g][as8 g16 f ] | +) g4 r8 es ( | +)es'4.-> es,8 ( | +)es'4.-> d8 \p | +[c8-. \< bes-. a \! g ] | +[fis16 ( a g e! ] ) c8 es ( \f | +) es'4.-> es,8 ( | +) es'4.-> d8 \p | +[c8-. \< bes-. a \! g ] | +c r r a'-. \p | +a-. [gis-. \< gis-.] \! g-. | +g-. [f-. f-.] c-. | +c-. [b-. \< b-.] bes-. | +bes-. [a-. \! a-.] a( \f | +) es'4.-> d8 | +[bes-. a-. g-.] bes, ( | +) d'4. \sfz c,8 ( | +) c'4. \sfz c,8 ( | +) a' r c4-> ( | +) a8 r c4-> ( | +) a8 r as4-> ( | +) g8 r r c ( | +) a! r c4 ( | +) a8 r c4 ( | +) a8 r as4-> ( | +) g8 r r c, ( | +) a'! r c4_"dim." ( | +) a8 r g4 ( | +) f8 r c4 ( | +) a8 r r4 | +R2*19 | +r4 r8 [c'16 \p ( d] | +) c8-. [b16 ( c ] ) b8-. [bes16 ( c ] | +)bes8-. [a16 ( bes ] ) a8-. [c16 ( d] | +) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] | +)bes8-. [a16 ( \! bes ] ) a8-. bes ( \f | +) bes,4. d8 ( | +) d'4. c8 ( | +) c,4. e!8 ( | +) e'4. c8 ( | +) a'4 r | +[f8 ( d ) c ] c ( | +) a'4 r | +[f8 ( d ) c ] f, ( | +) f'4. e,8 | +e'4. e8 | +[f-. e-. f-. e-.] | +[f-. e-. f-. e-.] | +f r e r | +f r e r | +f r a, r | +c r a r | +f4 r8 c' ( | +) a4 r8 c ( | +) f4 r8 c ( | +) a4 r8 c ( | +) f4 r | +R2 | +f4 \sfz r^\fermata + +} + +clarI=\notes\relative c'' { +\key G; +\clef "treble"; +\property Staff."midi_instrument" = "clarinet" + +[d8. \fp ( e16 ] ) d2 | +[d8._"dim." ( e16 ] ) d2 | +R2.*8 | +[d8. \mf ( \< e16 ][ cis8 d ] \! g4 | +[fis8. \> e16 ] \! d4 ) a | +b2. \pp \< ( | +\! ais4 ) b2 | +a4 \p ( [g8. a16 ] g4 | +fis ) g8 r r4 | +a4 ( [g8. a16 ] g4 | +fis ) g8 r [d^""^"solo" \mf \< () \! b' ] | +\tiny a8*1/2 \normalsize d2 ( \> *7/8 [b8. \! g16] | % grace note a8 d2 +) d2 r4 | +R2. | +r4 r \times 2/3 { [b'8^""^"solo" ( \ff d, ) d' ] } | +d4-> () b r | +r r \times 2/3 { [d8 ( b ) d ] } | +a4 () d r | +R2.*6 | +r4 r4^\fermata r8^\fermata r8 | +R2*4 | +gis,8-. \pp r a-. r | +gis-. r a-. r | +R2*2 | +fis!8 r g r | +fis r g d'-. \p | +[c-. b-. \< a-. g-. ] | % crescendo added +[ \! fis-. e-. d-. ] [d'16 \f ( e ] | % \f added +[d e d b][g b d e] | +[g8 e ) d ] g, ( | +[g' e ) d ] b ( | +[b' g ) fis] b | +f2 ~ | +fis!4 r8 b ( | +) f2 ~ | +fis!4 r8 b | +f r e r | +d r d r | +cis r r4 | +R2 | +g4 \p ( a | +b2 \< ~ | +b4 [a8 \! g'] | +[fis \> d b \! ) a] | +g4 \p ( a | +b2 ~ | +b4 a | +b2 ~ | +[b8_"dim." a g ) e ] | +<{[cis ( a ) b a-. ] | } % grace note cis\8 b + \type Voice = x {s8.. \tiny cis8 } > +[fis''-. f-. f-. e-. ] | +[e-. \< dis-. dis-. \! d-. ] | +d r b4 \f ~ | +cis8 [a'16-> ( b] ) a8 fis-. \p | % \p added +[fis-. f-. f-. e-. ] | +[e-. dis-. dis-. d-. ] | +d r b4 \f ~ | +cis8 [a'16-> ( b] ) a8 r | +d,4. r8 | +d4.-> r8 | +R2*2 | +d4. \f r8 | +d4. r8 | +R2 | +cis4.-> fis8-. \p | % \p added +[fis-. \< f-. f-. e-. ] | +[\! e-. d-. d-. ] [fis16 \mf ( g ] | +) fis8 [f16 ( g] ) f8-. [e16 \< ( fis ] | +) e8 [\! d16 ( e ] ) d8-. c! \f ~ | +c'4.-> b8 | +[g-. fis-. e-.] g,8 ~ | +b'4. \sfz a,8 ~ | +a'4. \sfz a,8 ~ | +fis' r a4-> ~ | % -> added +fis8 r a4-> ~ | +fis8 r f4 ~ | +e8 [a,16 ( b ] ) a8 a ~ | +fis' r a4-> ~ | +fis8 r a4-> ~ | +fis8 r f4 ~ | +e8 [a,16 ( b ] ) a8 a ~ | +fis' r a4_"dim." ~ | +fis8 r e4 ~ | +fis8 r a4 ~ | +fis8 r e4 \p ~ | +fis8 r r4 | +R2*3 | +fis,2 \pp ~ | +fis ~ | +fis ~ | +fis4 r | +R2*4 | +e'2 \sfz \> ~ | +\! fis,4 r | +b2 \> ~ | +\! ais4 r | +fis2 \pp \< ~ | +\! fis ~ | +fis \> ~ | +\! fis4 r | +R2*4 | +e'2 \sfz \> ~ | +\! fis,4 r | +e'2 \p ~ | +ais, | +R2*2 | +e'2 \p ~ | +ais, | +b ~ | +ais | +b_"dim." ~ | +ais ~ | +b ( | +c4 ) b8 r | +e-. r e-. r | +e-. r e-. r | +c2 ( ~ | +d4 ) c8 r | +d-. r d-. r | +d-. r [d-. d-. ] | +[c-. \< b-. a-. g-. ] | +[fis-. \! e-. d-. ] [d'16 \f ( e ] | +[d e d b][g b d e] | +[g8 e ) d] g, ( | +[g' e ) d ] b-. | +[c-. d-. e-. ] [g16 ( a] | +[g a g e][c e g a] | +[c8 a ) g ] c, ( | +[c' a ) g] r | +[e ( c ) b ] e ~ | +ais,2 ~ | +b4 r8 e ~ | +ais,2 ~ | +b4 r8 e | +bes r a r | +g r e' r | +d [a16 ( b ][c! d c b] | +[a b a g] ) fis8 r | +c'4 ( \p \< d | +\! e2 ~ | +e4 \> [d8 c' ] | +[b g e \! ) d ] | +c4 \p ( \< d | +e2 ~ | +\! e4 d \> | +e2 ~ | +[\! e8 d_"dim." c a ] | +) fis r r [d'16 \p ( e] | +) d8-. [cis16 ( d] ) cis8-. [c16 ( d] | +) c8-. [ b16 ( c] ) b8-. [bes16 ( c ] | +) bes8-. r e4 \f ~ | +[fis8 d16 ( e] ) d8 [d16 \p ( e] | +) d8-. \< [cis16 ( d] ) cis8-. [c16 ( d] | +) c8-. [ b16 ( c] ) b8-. [bes16 ( \! c ] | +) bes8-. r e4 \f ~ | +[fis8 d16 ( e] ) d8 f ~ | +b4.-> f8 ~ | +b4.-> r8 | +R2 | +r4 r8 f \f ~ | +b4.-> f8 ~ | +b4.-> r8 | +R2 | +r4 r8 [d,16 \p ( e] | +) d8-. [cis16 ( d] ) cis8-. [c16 ( d] | +) c8-. \< [ b16 ( c] ) \! b8-. [b'16 ( c ] | +) b8-. [bes16 ( c ] ) bes8-. [a16 ( b ] | +) a8-. [g16 ( as ] ) g8 b, \f ~ | +f'4.-> r8 | +r4 r8 c ~ | +e'4. \sfz d,8 ~ | +d'4. d,8 ~ | +b' r a4-> ~ | +g8 r a4-> ~ | +g8 r g4 ~ | +fis8 [d16 ( e] ) d8 d ~ | +g r a4 ~ | +g8 r a4 ~ | +g8 r g4 ~ | +fis8 [d16 ( e] ) d8 c ~ | +b r c4 ~ | +b8 r c4_"dim." ~ | +b8 r c4 ~ | +b8 r a4 \p ~ | +g8 r r4 | +R2 | +b'4^"solo" \p ( fis \> | +g [d8. \! e16 ] | +d4. b8 | +g4 \< ) \! a | +b \> ( \! a | +) g [g8. \f (a16 ] | +) g2 | +d2 ~ | +d2_"dim." ~ | +d4. r8 | +R2*2 | +d'8-. \p r cis-. r | +c! r b r | +R2*2 | +d4. \sfz d8 \> | +[d d \! d] r | +R2*3 | +r4 r8 c \f ~ | +c'4. e,8 ~ | +e'4. d,8 ~ | +d'4. d,8 ~ | +a'4. fis8 ~ | +g4 r8 g ~ | +c4 ~ b8 fis ~ | +g4 r8 g ~ | +c4 ~ b8 cis, ~ | +g'4. c,!8 ~ | +fis4. fis8 | +[g-. fis-. g-. fis-. ] | +[g-. fis-. g-. fis-. ] | +g-. r fis-. r | +g r d r | +[d16 ( e d e][d e d e] | +[d e d e] [d e d e] | +) d4 r8 d ~ | +b'4 r8 d, ~ | +g4 r8 d ~ | +b'4 r8 d, ~ | +g,2 ~ | +g ~ | +g'4-. \sfz r^\fermata +} + + +clarII=\notes\relative c'' { +\key G; +\clef "treble"; +\property Staff."midi_instrument" = "clarinet" + +[d8. \fp ( e16 ] ) d2 | +[d8._"dim." ( e16 ] ) d2 | +R2.*8 | +[fis,8. \mf ( \< g16 ][ e8 fis ] \! ) g4 | +[a8. ( \> g16 ] \! ) fis4 r | +b2. \pp \< ( | +\! ais4 ) b2 | +a4 \p ( [g8. a16 ] g4 | +fis ) g8 r r4 | +a4 ( [g8. a16 ] g4 | +fis ) g8 r [d^""^"solo" \mf \< () \! b' ] | +\tiny a8*1/2 \normalsize d2 ( \> *7/8 [b8. \! g16] | % grace note a8 d2 +) d2 r4 | +R2. | +r4 r \times 2/3 { [b'8 ( \f d, ) d' ] } | +d4 () b r | +r r \times 2/3 { [d8 \f ( b ) d ] } | +a4 () d r | +R2.*6 | +r4 r4^\fermata r8^\fermata r8 | +R2*9 | +r4 r8 d-. \p | +[c-. b-. \< a-. g-. ] | +[\! fis-. e-. d-. ] [d'16 \f ( e ] | +[d e d b][g b d e] | +[g8 e ) d ] g, ( | +[g' e ) d ] g, ( | +[g' e ) d ] b' ~ | +f2 ~ | +fis!4 r8 b ( | +) f2 ~ | +fis!4 r8 b, ~ | +b r b r | +b r b r | +a r r4 | +R2 | +g!4 \p \< ( a | +\! b!2 ~ | +b4 \> a ~ | +a \! ) fis8 r | +g4 \p \< ( a | +\! b2 ~ | +b4 \> a | +g2 ~ | +\! ) g4 r | +R2*3 | +r4 gis \f ~ | +[ g!8 a16-> ( b ] ) a8 r | +R2*2 | +r4 gis \f ~ | +[ g!8 a16 ( b ] ) a8 r | +fis4. r8 | +fis4. r8 | +R2*2 | +fis4. \f r8 | +fis4. r8 | +R2 | +g4. -> r8 | +R2 | +r4 r8 a-. \mf | +[a-. gis-. gis-. g-. ] | +g [ fis-. fis-. ] fis \f ~ | % \f added +dis'4.-> r8 | +r4 r8 g,8 ~ | +e'4. \sfz g,8 ~ | +e'4. \sfz g,8 ~ | +fis r a4-> ~ | +a8 r a4-> ~ | +a8 r gis4 ~ | +[g!8 g-. g-. g~ ] | +fis! r a4 ~ | +a8 r a4-> ~ | +a8 r gis4 ~ | +g!8 [g-. g-.] g~ | +fis! r a4_"dim." ~ | % dim. added +a8 r a4 ~ | +a8 r a4 ~ | +a8 r a4 \p ~ | +a8 r r4 | +R2*3 | +fis2 \pp \< ~ | +fis ~ | +\! fis \>~ | +\! fis4 r | +R2*4 | +g2 \f \> ~ | +\! fis4 r | +b2 \> ~ | +\! ais4 r | +fis2 \pp \< ~ | +fis ~ | +\! fis \>~ | +\! fis4 r | +R2*16 | +f2 \pp ~ | +g4. r8 | +b-. r a-. r | +b-. r a-. r | +a2 ~ | +a4. r8 | +c r b r | +a r [g-. \p d'-. ] | +[c-. b-. a-. g-. ] | +[fis-. e-. d-. ] [d'16 \f ( e ] | +[d e d b][g b d e] | +[g8 e ) d] g, ( | +[g' e ) d ] g,-. | +[a-. b-. c-. ] [g'16 ( a] | +[g a g e][c e g a] | +[c8 a ) g ] c, ( | +[c' a ) g] r | +[c, ( a ) g ] e' ~ | +ais,2 ~ | +b4 r8 e ~ | +ais,2 ~ | +b4 r8 e ~ | +bes r a r | +g r g r | +[fis ( a16 b ][c! d c b] | +[a b a g] ) fis8 r | +R2 | +a4 \p \< ( b | +\! c \> fis, | +) \! g r | +R2 | +fis4 \< g ( | +) \! a r | +fis4 \> g_"dim." ( | +) \! a r | +r r8 b-. \p | +b [ais-. \< ais-. a-. ] | +[a-. gis-. \! gis-. g-. ] | +g r cis4 \f ~ | +c! r8 b!-. \p | +b [ais-. \< ais-. a-. ] | +[a-. gis-. \! gis-. g-. ] | +g r cis4 \f ~ | +c! r8 b ~ | +f'4.-> b,8 ~ | +f'4.-> r8 | +R2 | +r4 r8 b,8 \f ~ | +f'4.-> b,8 ~ | +f'4.-> r8 | +R2 | +r4 r8 b,8-. \p | +b-. [ais-. ais-. a-. ] | +[a-. g-. g-. ] [b16 ( c ] | +) b8-. \< [bes16 ( c ] ) bes8-. [a16 ( b ] | +) \! a8-. [g16 ( as ] ) g8 f \f ~ | +b4.-> r8 | +r4 r8 c ~ | +a'4. \sfz c,8 ~ | +a'4. \sfz c,8 ~ | +b r c4-> ~ | +b8 r c4-> ~ | +b8 r bes4 ~ | +[a8 d16 ( e ] [) d8 c ~ ] | +b! r c4 ~ | +b8 r c4 ~ | +b8 r bes4-> ~ | +[a8 d16 ( e ] ) d8 a ~ | +g r a4 ~ | +g8_"dim." r a4 ~ | +g8 r a4 ~ | +g8 r fis4 ~ | +g8 \p r r4 | +R2*6 | +r4 [g8. ( \f a16 ] | +) g2 ~ | +d_"dim." ~ | +d ~ | +d4. r8 | +R2*6 | +fis4. \sfz \> \! g8 | +[a-. b-. c-. ] r | +R2*3 | +r4 r8 e, \f ~ | +e'4. a,8 ~ | +a'4. a,8 ~ | +a'4. fis,8 ~ | +d'4. c8 ~ | +b4 r8 g ( | +e'4 [d8 ) c ] | +b4 r8 g ( | +e'4~ ) d8 g, | +cis4. fis,8 ~ | +c'!4. c8 | +[b-. c-. b-. c-. ] | +[b-. c-. b-. c-. ] | +b r a r | +b r c r | +[b d16 ( e ] [d e d e] | +[d e d e] [d e d ) e] | +d4 r | +d4 r | +b4 r | +d4 r8 d, ~ | +g2 ~ | +g ~ | +b4-. \sfz r^\fermata +} + +fagotto=\notes\relative c' { +\clef "bass"; +\property Staff."midi_instrument" = "bassoon" + +[c8. \f ( d16 ] ) c2_"dim." | +[c8. ( d16 ] ) c4 r | +R2.*29 | +r4 r4^\fermata r8^\fermata r8 | +R2*4 | +c8-. \pp r bes-. r | +c8-. r bes-. r | +R2*2 | +bes8-. r a-. r | +bes8-. r [a-. c-.] | +[bes-. \< a-. g-. f-. ] | +[e-. \! d-. c-. ] c \f ~ | +c'4. r8 | +d4 ~ c8 r | +d4 ~ c8 r | +d4 ~ [c8 a16 ( b ] | +[c d c b] ) a8 f-> ~ | +e4 r8 [ a16 ( b ] | +[c d c b] ) a8 f-> ~ | +e4 r8 a ~ | +c r d r | +es r d r | +d4 \sfz r | +R2*2 | +d4 \p ( \< e | +\! f b, \> | +) \! c r | +R2 | +d4 \p ( \< e | +\! ) f2 \> | +\! b,4 \p ( c | +) d r | +r r8 g, \p | +[g \< g g g] | +[g g g \! g] | +g \f [c16 ( d] [es8 d16 c ] | +) d4 r8 g, \p | +[g g g g] | +[g g g g] | +g [c16 ( d] [es8 d16 c ] | +) d4 r8 c ~ | +g4.-> c8 ~ | +g4.-> r8 | +r4 r8 a ~ | +b4. g8 \f ~ | +c4.-> g8 ~ | +c4.-> r8 | +r4 r8 a \f ~ | +d4. \clef "tenor"; [g16 \p ( a] | +) g8 [fis16 ( g] ) fis8-. \< [f16 ( g ] | +) f8-. [e16 ( \! f ] ) e8 g-. \mf | +[g-. fis-. \< fis-. f-. ] | +[f-. e-. \! e-. ] \clef "bass"; cis \f ~ | +e4. a,8 | +[d,-. e-. f-. ] f' ~ | +d4. d8 | +b4. b8 ~ | +c r f4-> ~ | +e8 r f4-> ~ | +e8 r c4 ~ | +[d8-. f-. d-. b ~ ] | +c r f4-> ~ | +e8 r f4-> ~ | +e8 r c4 ~ | +[d8-. f-. d-. b ~ ] | +c r f4 ~ | +e8 r f4_"dim." ~ | +e8 r f4 ~ | +e8 r f4 \p ~ | +e8 r r4 | +r8 [g,-.^"solo" \p a-. b-. ] | +c r r4 | +R2 | +a,2 \pp \< ~ | +\! a | +e' \> ~ | +\! e4 r | +e2 \p \< ~ | +\! e \> ~ | +\! e \< ~ | +\! e \> | +\tiny \! d'8 \sfz *1/2 ~ \normalsize f2 \> *7/8 ~ | % grace note d8 f +\! e4. r8 | +f,2 \> ( ~ | +[ \! e8 d c ) b ] | +a2 \pp \< ~ | +\! a | +e' \> ~ | +\! e4 r | +e2 \p ~ +e ~ | +e ~ | +e | +\tiny d'8 \sfz *1/2 ~ \normalsize f2 \> *7/8 ~ | % grace note d8 f +\! e4. r8 | +f,2 \p ~ | +e4 r | +f'2-> ~ | +e4. r8 | +f,2 ~ | +e | +d' \p ~ | +d ~ | +d_"dim." ~ | +d ~ | +c \pp ~ | +d4 ~ c8 r | +c r bes r | +c r bes r | +d2 ~ | +es4 ~ d8 r | +e! r f-. r | +bes,-. r [a-. c-.] | +[bes-. a-. g-. f-. ] | +[e-. d-. c-. ] c ~ | +c'4. \f r8 | +d4 ~ c8 r | +d4 ~ c8 a-. | +[bes-. c-. d-. es-. ] | +d4.-> r8 | +es4 ~ d8 r | +es4 ~ d8 r | +d4 ~ d8 [d16 ( e! ] | +[f g f e] ) d8 bes ~ | +a4 r8 [d16 ( e ] | +[f g f e] ) d8 bes ~ | +a4 r8 d ~ | +f r g r | +as r g r | +c,4 \sfz r | +R2*6 | +bes4 ( \p \< a | +) \! g r | +g_"dim." ( f | +) e r | +r r8 c' | +[c c c c] | +[c \< c c \! c] | % crescendo added +[c c c c] | +[c c c ] c \p | +[c \< c c c] | +[c c c c] | +[\! c \f c c c] | +[c c c ] f ~ | +c4.-> f8 ~ | +c4.-> r8 | +r4 r8 f8 ~ | +e!4. c8 \f ~ | +f4.-> c8 ~ | % slur added +f4.-> r8 | +r4 r8 d ~ | +e4. r8 | +R2 | +r4 r8 c \p | +[c-. \< d-. d-. e-. ] | +[ \! e-. f-. f-. ] r | +fis4. \f d,8-. | +[g-. a-. bes-. ] e! ~ | +g4. \f g8 ~ | +e4. e8 ~ | +f r c4-> ~ | +c c-> ~ | +c d ~ | +e r8 c ~ | +f4 c~ | +c c~ | +c d ~ | +e r8 c ~ | +f4 c~ | +c c~ | +c r | +R2*5 | +es2 \p \> ( ~ | +\! d4 \< \! ) des | +c \f ( bes | +a b | +) c r | +R2 | +a8-. \p r r4 | +g8-. r r4 | +R2*4 | +a2 \p \< ~ | +a4 ~ \! gis8 g ~ | +c4. \sfz c8 \> | +[c c \! c ] r8 | +R2*2 | +es2 \p \< ~ | +\! es4. d8 \f ~ | +f,4. bes8 ~ | +d,4. c'8 ~ | +c,4. c'8 ~ | +c,4. bes'8 ~ | +a4 r8 c~ | +d4 ~ c8 bes ~ | +a4 r8 c~ | +d4 ~ c8 d ~ | +g,4. g'8 ~ | +c,4. c,8 | +[f-. c-. f-. c-. ] | +[f-. c-. f-. c-. ] | +f-. r c'-. r | +c-. r c-. r | +[c16 ( d c d][c d c d] | +[c16 d c d][c d c d] | +) c4 r8 c ~ | +f4 r8 c ~ | +f,4 r8 c' ~ | +f4 r8 c ~ | +f,2 ~ | +f ~ | +c'4 \sfz r^\fermata +} + +oboehelp=\notes\relative c'' { +\tiny + +s2.*32 | +s2*32 | +[a8^"Vi. I" ( g f d] | +[b g ) a ] s8 | +s2*106 | +[d'8^"Vi. I" ( c bes g] | +[e c ) d] s | +} + +flautohelp=\notes\relative c'' { +\tiny + +s2.*32 | +s2*32 | +[a8^"Vi. I" ( g f d] | +[b g ) a ] s8 | +s2*60 | +f''2^"Oboe" ( | +b,4 [c8 ) b] | +s2*44 | +[d8^"Vi. I" ( c bes g] | +[e c ) d] s | +s2*54 | +bes''4.^"Vi. I" a8 | +[g-. f-. e-. ] s8 | +} diff --git a/scm/lily.scm b/scm/lily.scm index 4cea79ddbf..a87b677c26 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -60,7 +60,14 @@ (define (postbreak_only_visibility d) (if (= d 1) '(#f . #f) '(#t . #t))) (define (non_postbreak_visibility d) (if (= d -1) '(#t . #t) '(#f . #f))) (define (spanbar_non_postbreak_visibility d) (if (= d -1) '(#t . #t) '(#f . #f))) -(define (spanbar_postbreak_only_visibility d) (if (= d 1) '(#f . #f) '(#t . #t))) + +;; Score_span_bars are only visible at start of line +;; i.e. if break_dir == RIGHT == 1 +(define Span_score_bar_visibility postbreak_only_visibility) +(define Piano_bar_visibility postbreak_only_visibility) +(define Staff_group_bar_visibility postbreak_only_visibility) + + ;;;;;;;; TeX diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 38ec73410c..3d65f241f9 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -165,8 +165,8 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ # gh_scm2doubles,gh_doubles2scm are new in 1.3 GUILE_FLAGS AC_CHECK_LIB(guile, gh_scm2doubles, - LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[[/-_a-zA-Z0-9]]]\+ //g'` $LIBS"; - AC_DEFINE(HAVE_LIBGUILE), , $GUILE_LDFLAGS dnl + [LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[/-_a-zA-Z0-9]]\+ //g'` $LIBS" + AC_DEFINE(HAVE_LIBGUILE)], , $GUILE_LDFLAGS dnl ) if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then AC_STEPMAKE_WARN(You should install guile 1.3 or newer) @@ -358,8 +358,8 @@ AC_DEFUN(AC_STEPMAKE_LEXYACC, [ AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or newer) if test $BISON != "error"; then - bison_version=`$BISON --version| sed 's/^.*version 1.//g' ` - if test $bison_version -lt 25; then + bison_version=`$BISON --version | sed 's/^.*version 1.//g'` + if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then AC_STEPMAKE_WARN(Your bison is a bit old (1.$bison_version). You might have to install 1.25) fi fi @@ -652,6 +652,39 @@ AC_DEFUN(AC_CHECK_SEARCH_RESULT, [ fi ]) +dnl GUILE_FLAGS --- set flags for compiling and linking with Guile +dnl +dnl This macro runs the `guile-config' script, installed with Guile, +dnl to find out where Guile's header files and libraries are +dnl installed. It sets two variables, marked for substitution, as +dnl by AC_SUBST. +dnl +dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build +dnl code that uses Guile header files. This is almost +dnl always just a -I flag. +dnl +dnl GUILE_LDFLAGS --- flags to pass to the linker to link a +dnl program against Guile. This includes `-lguile' for +dnl the Guile library itself, any libraries that Guile +dnl itself requires (like -lqthreads), and so on. It may +dnl also include a -L flag to tell the compiler where to +dnl find the libraries. + +AC_DEFUN([GUILE_FLAGS],[ +## The GUILE_FLAGS macro. + ## First, let's just see if we can find Guile at all. + AC_MSG_CHECKING(for Guile) + guile-config link > /dev/null || { + echo "configure: cannot find guile-config; is Guile installed?" 1>&2 + exit 1 + } + GUILE_CFLAGS="`guile-config compile`" + GUILE_LDFLAGS="`guile-config link`" + AC_SUBST(GUILE_CFLAGS) + AC_SUBST(GUILE_LDFLAGS) + AC_MSG_RESULT(yes) +]) + # Configure paths for GTK+ # Owen Taylor 97-11-3 @@ -678,7 +711,7 @@ dnl LIBS="$LIBS $GTK_LIBS" dnl dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent +dnl checks the results of gtk-config to some extent) dnl AC_TRY_RUN([ #include @@ -759,7 +792,7 @@ AC_DEFUN(AM_PATH_GTKMM, [dnl dnl -dnl Check check if the installed GTK-- is sufficiently new. +dnl Check if the installed GTK-- is sufficiently new. dnl AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) min_gtkmm_version=ifelse([$1], ,0.9.14,$1) @@ -948,7 +981,7 @@ dnl LIBS="$LIBS $GTK___LIBS" dnl dnl Now check if the installed GTK__ is sufficiently new. (Also sanity -dnl checks the results of gtk__-config to some extent +dnl checks the results of gtk__-config to some extent) dnl AC_TRY_RUN([ #include diff --git a/stepmake/stepmake/install-out-targets.make b/stepmake/stepmake/install-out-targets.make index eb445927a9..e461473f6b 100644 --- a/stepmake/stepmake/install-out-targets.make +++ b/stepmake/stepmake/install-out-targets.make @@ -5,37 +5,23 @@ localinstall: localinstall-files localinstall-outfiles localinstall-files: # urg, parameterise -localinstall-outfiles: $(INSTALLATION_OUT_FILES) $(INSTALLATION_OUT_FILES1) $(INSTALLATION_OUT_FILES2) +localinstall-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_FILES$(suff))) -$(INSTALL) -d $(INSTALLATION_OUT_DIR) $(foreach i, $(INSTALLATION_OUT_FILES), \ - $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR) && )true -ifneq ($(strip $(INSTALLATION_OUT_FILES1)),) - -$(INSTALL) -d $(INSTALLATION_OUT_DIR1) - $(foreach i, $(INSTALLATION_OUT_FILES1), \ - $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR1) && )true -endif -ifneq ($(strip $(INSTALLATION_OUT_FILES2)),) - -$(INSTALL) -d $(INSTALLATION_OUT_DIR2) - $(foreach i, $(INSTALLATION_OUT_FILES2), \ - $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR2) && )true -endif + $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR) && ) true + $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), \ + $(foreach i, $(INSTALLATION_OUT_FILES$(suff)), \ + $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR$(suff)) && ) true && ) true + localuninstall: localuninstall-outfiles localuninstall-files localuninstall-files: localuninstall-outfiles: - $(foreach i, $(notdir $(INSTALLATION_OUT_FILES)), \ - rm -f $(INSTALLATION_OUT_DIR)/$(i) && ) true - -rmdir $(INSTALLATION_OUT_DIR) -ifneq ($(strip $(INSTALLATION_OUT_FILES1)),) - $(foreach i, $(notdir $(INSTALLATION_OUT_FILES1)), \ - rm -f $(INSTALLATION_OUT_DIR1)/$(i) && ) true - -rmdir $(INSTALLATION_OUT_DIR1) -endif -ifneq ($(strip $(INSTALLATION_OUT_FILES2)),) - $(foreach i, $(notdir $(INSTALLATION_OUT_FILES2)), \ - rm -f $(INSTALLATION_OUT_DIR2)/$(i) && ) true - -rmdir $(INSTALLATION_OUT_DIR2) -endif -# -(cd $(INSTALLATION_OUT_DIR)/..; dir=`dirname \`pwd\`` cd ..; rmdir $$dir) + rm -f $(foreach i, $(notdir $(INSTALLATION_OUT_FILES)), \ + $(INSTALLATION_OUT_DIR)/$(i)) + rm -f $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), \ + $(foreach i, $(INSTALLATION_OUT_FILES$(suff)), \ + $(INSTALLATION_OUT_DIR$(suff))/$(i))) + -rmdir $(INSTALLATION_OUT_DIR) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_DIR$(suff))) diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make index aa648c3541..6351355541 100644 --- a/stepmake/stepmake/install-targets.make +++ b/stepmake/stepmake/install-targets.make @@ -10,40 +10,19 @@ localinstall-files: -$(INSTALL) -d $(INSTALLATION_DIR) $(foreach i, $(INSTALLATION_FILES),\ $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR) &&)true + $(foreach suff, $(INSTALLATION_SUFFIXES), \ + $(foreach i, $(INSTALLATION_FILES$(suff)), \ + $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR$(suff)) && ) && ) true $(POST_INSTALL) -ifneq ($(strip $(INSTALLATION_FILES1)),) - $(PRE_INSTALL1) - -$(INSTALL) -d $(INSTALLATION_DIR1) - $(foreach i, $(INSTALLATION_FILES1),\ - $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR1) &&)true - $(POST_INSTALL1) -endif -ifneq ($(strip $(INSTALLATION_FILES2)),) - $(PRE_INSTALL2) - -$(INSTALL) -d $(INSTALLATION_DIR2) - $(foreach i, $(INSTALLATION_FILES2),\ - $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR2) &&)true - $(POST_INSTALL2) -endif localuninstall: localuninstall-outfiles localuninstall-files localuninstall-outfiles: localuninstall-files: - $(foreach i, $(INSTALLATION_FILES),\ - rm -f $(INSTALLATION_DIR)/$(i) && ) true - -$(foreach i, $(SUBDIRS), rmdir $(INSTALLATION_DIR)/$(i); ) - -rmdir $(INSTALLATION_DIR) -ifneq ($(strip $(INSTALLATION_FILES1)),) - $(foreach i, $(INSTALLATION_FILES1),\ - rm -f $(INSTALLATION_DIR1)/$(i) && ) true - -$(foreach i, $(SUBDIRS), rmdir $(INSTALLATION_DIR1)/$(i); ) - -rmdir $(INSTALLATION_DIR1) -endif -ifneq ($(strip $(INSTALLATION_FILES2)),) - $(foreach i, $(INSTALLATION_FILES2),\ - rm -f $(INSTALLATION_DIR2)/$(i) && ) true - -$(foreach i, $(SUBDIRS), rmdir $(INSTALLATION_DIR2)/$(i); ) - -rmdir $(INSTALLATION_DIR2) -endif + rm -f $(foreach i, $(INSTALLATION_FILES), $(INSTALLATION_DIR)/$(i)) + rm -f $(foreach suff, $(INSTALLATION_SUFFIXES), \ + $(foreach i, $(INSTALLATION_FILES$(suff)),\ + $(INSTALLATION_DIR$(suff)/$(i)))) + rmdir $(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(INSTALLATION_DIR$(suff))) + -- 2.39.5