From 0ba6b09d5fa86ccb3650888f0e92ddc8cc915007 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 12 Mar 2000 23:52:45 +0100 Subject: [PATCH] release: 1.3.32 =========== * Fixed and cleaned-up Dynamic_engraver. Optionionally uses vanilla spanner instead of Dynamic_line_spanner. * Made gcc-2.95 compile fix in libc-extension. * Various fixes to Coriolan, score starts to look acceptable. 1.3.31.j --- CHANGES | 23 + Documentation/index.texi | 2 +- Documentation/programmer/GNUmakefile | 2 +- Documentation/topdocs/INSTALL.texi | 7 +- INSTALL.txt | 7 +- VERSION | 4 +- debian/changelog | 51 ++ debian/control | 26 +- debian/control.foka | 20 +- debian/control.in | 26 +- debian/copyright | 11 +- debian/out/control | 26 +- debian/rules | 50 +- flower/libc-extension.cc | 4 +- input/test/crescendi.ly | 2 +- input/test/dyn-line.ly | 8 +- input/test/span-dynamic.ly | 0 lily/crescendo.cc | 28 +- lily/dynamic-engraver.cc | 614 +++++++++--------------- lily/span-dynamic-performer.cc | 72 ++- lily/staff-symbol-referencer.cc | 5 +- ly/engraver.ly | 5 +- ly/spanners.ly | 3 +- ly/textscripts.ly | 3 - make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mf/GNUmakefile | 1 + mutopia/Coriolan/bassi-part.ly | 2 +- mutopia/Coriolan/clarinetti-part.ly | 2 +- mutopia/Coriolan/clarinetti.ly | 6 +- mutopia/Coriolan/clarinetto-1.ly | 50 +- mutopia/Coriolan/clarinetto-2.ly | 26 +- mutopia/Coriolan/contrabasso-part.ly | 2 +- mutopia/Coriolan/contrabasso.ly | 43 +- mutopia/Coriolan/coriolan-midi.ly | 3 + mutopia/Coriolan/coriolan-paper.ly | 27 ++ mutopia/Coriolan/coriolan-part-paper.ly | 23 +- mutopia/Coriolan/coriolan.ly | 14 +- mutopia/Coriolan/corni-part.ly | 2 +- mutopia/Coriolan/corni.ly | 6 +- mutopia/Coriolan/corno-1.ly | 14 +- mutopia/Coriolan/corno-2.ly | 26 +- mutopia/Coriolan/fagotti-part.ly | 2 +- mutopia/Coriolan/fagotti.ly | 6 +- mutopia/Coriolan/fagotto-1.ly | 76 ++- mutopia/Coriolan/fagotto-2.ly | 62 ++- mutopia/Coriolan/flauti-part.ly | 2 +- mutopia/Coriolan/flauti.ly | 6 +- mutopia/Coriolan/flauto-1.ly | 68 ++- mutopia/Coriolan/flauto-2.ly | 14 +- mutopia/Coriolan/oboe-1.ly | 84 ++-- mutopia/Coriolan/oboe-2.ly | 28 +- mutopia/Coriolan/oboi-part.ly | 2 +- mutopia/Coriolan/oboi.ly | 6 +- mutopia/Coriolan/timpani-part.ly | 2 +- mutopia/Coriolan/timpani.ly | 18 +- mutopia/Coriolan/trombe-part.ly | 2 +- mutopia/Coriolan/trombe.ly | 6 +- mutopia/Coriolan/trombo-1.ly | 20 +- mutopia/Coriolan/trombo-2.ly | 20 +- mutopia/Coriolan/viola-1.ly | 282 ++++++++--- mutopia/Coriolan/viola-2.ly | 26 +- mutopia/Coriolan/viola-part.ly | 10 +- mutopia/Coriolan/violino-1-part.ly | 2 +- mutopia/Coriolan/violino-1.ly | 381 +++++++++++---- mutopia/Coriolan/violino-2-part.ly | 2 +- mutopia/Coriolan/violino-2.ly | 329 +++++++++---- mutopia/Coriolan/violoncello-part.ly | 2 +- mutopia/Coriolan/violoncello.ly | 317 +++++++++--- scm/generic-property.scm | 10 +- 70 files changed, 1964 insertions(+), 1079 deletions(-) delete mode 100644 input/test/span-dynamic.ly create mode 100644 mutopia/Coriolan/coriolan-midi.ly create mode 100644 mutopia/Coriolan/coriolan-paper.ly diff --git a/CHANGES b/CHANGES index 4b8dcfb1ea..69278c3e1a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +1.3.31.jcn5 +=========== + +* Fixed and cleaned-up Dynamic_engraver. Optionionally uses vanilla + spanner instead of Dynamic_line_spanner. + +* Made gcc-2.95 compile fix in libc-extension. + +* Various fixes to Coriolan, score starts to look acceptable. + +1.3.31.jcn3 +=========== + +* Moved optional text of crescendo into Crescendo spanner. Fixed horizontal + and vertical alignment of dynamics. + +* Added new text crescendo spanners to Coriolan and made some fixes. + If you're using timidity, use the -EO option to prevent notes get + stuck. I'm not sure whose fault this is, Lily's MIDI output may be + stretching the standard a bit. + 1.3.30.jcn4 =========== @@ -8,6 +29,8 @@ * Cleaned up Span_dynamic_performer. +1.3.31 +====== 1.3.30.mb1 ========= diff --git a/Documentation/index.texi b/Documentation/index.texi index 1608ab2ad0..023b144077 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -82,7 +82,7 @@ changes)} changes)} @item @uref{../misc/out-www/ANNOUNCE-1.2.txt, Announcement of 1.2 (includes summary of changes)} @item @uref{../misc/out-www/AIMS.txt, Why LilyPond?} -@item @uref{../misc/out-www/interview.txt, Answers} to the Brave GNU world standard questions. +pp@item @uref{../misc/out-www/interview.txt, Answers} to the Brave GNU world standard questions. @end itemize diff --git a/Documentation/programmer/GNUmakefile b/Documentation/programmer/GNUmakefile index 25b42eea53..d54746320a 100644 --- a/Documentation/programmer/GNUmakefile +++ b/Documentation/programmer/GNUmakefile @@ -30,7 +30,7 @@ default: localclean: rm -f fonts.aux fonts.log feta*.tfm feta*.*pk -local-WWW: $(HTML_FILES) +local-WWW: $(HTML_FILES) $(addsuffix .gz, $(PS_FILES)) $(PYTHON) $(step-bindir)/ls-latex.py --title 'Hacker documentation' \ $(DOC_FILES) $(TEXI_FILES) $(TELY_FILES) \ | sed "s!$(outdir)/!!g" > $(outdir)/index.html diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 8678c583b1..0a4e7e79e8 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -345,9 +345,10 @@ in addition to the those needed for running: @section Debian GNU/linux -A Debian package is also available; contact Anthony Fok -@email{foka@@debian.org}. The build scripts are in the subdirectory -@file{debian/}. +A Debian package is also available; see +@uref{http://packages.debian.org/lilypond,http://packages.debian.org/lilypond} +or contact Anthony Fok @email{foka@@debian.org} for more information. +The build scripts are in the subdirectory @file{debian/}. @section Windows NT/95 diff --git a/INSTALL.txt b/INSTALL.txt index 0d2bafa7fc..37dcaa182f 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -314,8 +314,11 @@ addition to the those needed for running: Debian GNU/linux ================ - A Debian package is also available; contact Anthony Fok -. The build scripts are in the subdirectory `debian/'. + A Debian package is also available; see +http://packages.debian.org/lilypond +(http://packages.debian.org/lilypond) or contact Anthony Fok + for more information. The build scripts are in the +subdirectory `debian/'. Windows NT/95 ============= diff --git a/VERSION b/VERSION index 103c9b2621..ce1d30b72f 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=31 -MY_PATCH_LEVEL=jcn1 +PATCH_LEVEL=32 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/debian/changelog b/debian/changelog index 3236080537..293e0963b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,54 @@ +lilypond1.3 (1.3.24-1) frozen unstable; urgency=low + + * New upstream development release with lots of bug fixes. :-) + * [debian/control]: Added missing build dependencies. Thanks to + Roman Hodek for the bug report and solution (closes: Bug#58078). + + -- Anthony Fok Sat, 19 Feb 2000 15:14:31 -0700 + +lilypond1.3 (1.3.17-1) unstable; urgency=low + + * New upstream release. Merry Christmas! + + -- Anthony Fok Fri, 24 Dec 1999 08:59:21 -0700 + +lilypond1.3 (1.3.16-1) unstable; urgency=low + + * New upstream release. + + -- Anthony Fok Wed, 22 Dec 1999 22:12:30 -0700 + +lilypond1.3 (1.3.12-1) unstable; urgency=low + + * New upstream release. + * [debian/rules]: Commented out "$(MAKE) -C Documentation/programmer ps" + temporarily because of error making lilypond-overview.dvi. + + -- Anthony Fok Fri, 17 Dec 1999 00:33:47 -0700 + +lilypond1.3 (1.3.5-1) unstable; urgency=low + + * New upstream release. lilypond1.3 is the developmental branch. + * [debian/rules]: Removed "install-stamp". + * [debian/control]: + - Standards-Version: 3.1.0 + - Added the Build-Depends field. + - Updated dependencies of tetex-{base,bin,extra} packages to + 1.0*-1. + + -- Anthony Fok Sat, 13 Nov 1999 23:25:42 -0700 + +lilypond (1.2.17-1) unstable; urgency=low + + * New upstream release. + * [debian/rules]: + - Reverted to configuring with --disable-optimise. + - The documentation files are now built properly, and both + ps and dvi versions are included. + * Standards-Version: 3.0.1 + + -- Anthony Fok Sat, 30 Oct 1999 06:57:04 -0600 + lilypond (1.2.2-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 0b48d3e3e1..12d811e790 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,24 @@ -Source: lilypond +Source: lilypond1.3 +Build-Depends: debhelper (>= 2.0.71), python-base (>= 1.5.2-4), libguile6-dev, tetex-bin (>= 1.0.5-1), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1), flex (>= 2.5.4a-1), bison (>= 1:1.28-1), texinfo (>= 4.0-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.0.0 +Standards-Version: 3.1.0 -Package: lilypond +Package: lilypond1.3 Architecture: any -Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1) -Recommends: python-base (>= 1.5.2-4), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1) -Conflicts: musixtex-fonts, tetex-base (<< 0.9) -Description: A program for printing sheet music. LilyPond is a music typesetter. It produces beautiful sheet music -using a high level description file as input. LilyPond is part of -the GNU Project. - +Replaces: lilypond +Provides: lilypond +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1) +Recommends: python-base (>= 1.5.2-4), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1) +Conflicts: lilypond, musixtex-fonts +Description: A program for printing sheet music. + LilyPond is a music typesetter. It produces beautiful sheet music + using a high level description file as input. LilyPond is part of + the GNU Project. + . + This is the unstable 1.3 branch of LilyPond. It is not intended for + use with stable projects! . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ diff --git a/debian/control.foka b/debian/control.foka index 3ea6fd643d..12d811e790 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -1,18 +1,24 @@ -Source: lilypond +Source: lilypond1.3 +Build-Depends: debhelper (>= 2.0.71), python-base (>= 1.5.2-4), libguile6-dev, tetex-bin (>= 1.0.5-1), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1), flex (>= 2.5.4a-1), bison (>= 1:1.28-1), texinfo (>= 4.0-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.0.0 +Standards-Version: 3.1.0 -Package: lilypond +Package: lilypond1.3 Architecture: any -Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1) -Recommends: python-base (>= 1.5.2-4), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1) -Conflicts: musixtex-fonts, tetex-base (<< 0.9) +Replaces: lilypond +Provides: lilypond +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1) +Recommends: python-base (>= 1.5.2-4), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1) +Conflicts: lilypond, musixtex-fonts Description: A program for printing sheet music. LilyPond is a music typesetter. It produces beautiful sheet music - using a high level description file as input. LilyPond is part of + using a high level description file as input. LilyPond is part of the GNU Project. + . + This is the unstable 1.3 branch of LilyPond. It is not intended for + use with stable projects! . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ diff --git a/debian/control.in b/debian/control.in index 0b48d3e3e1..12d811e790 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,18 +1,24 @@ -Source: lilypond +Source: lilypond1.3 +Build-Depends: debhelper (>= 2.0.71), python-base (>= 1.5.2-4), libguile6-dev, tetex-bin (>= 1.0.5-1), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1), flex (>= 2.5.4a-1), bison (>= 1:1.28-1), texinfo (>= 4.0-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.0.0 +Standards-Version: 3.1.0 -Package: lilypond +Package: lilypond1.3 Architecture: any -Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1) -Recommends: python-base (>= 1.5.2-4), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1) -Conflicts: musixtex-fonts, tetex-base (<< 0.9) -Description: A program for printing sheet music. LilyPond is a music typesetter. It produces beautiful sheet music -using a high level description file as input. LilyPond is part of -the GNU Project. - +Replaces: lilypond +Provides: lilypond +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1) +Recommends: python-base (>= 1.5.2-4), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1) +Conflicts: lilypond, musixtex-fonts +Description: A program for printing sheet music. + LilyPond is a music typesetter. It produces beautiful sheet music + using a high level description file as input. LilyPond is part of + the GNU Project. + . + This is the unstable 1.3 branch of LilyPond. It is not intended for + use with stable projects! . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ diff --git a/debian/copyright b/debian/copyright index dd39bc69a0..743e63c34d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,14 @@ This package was Debianized by Anthony Fok on Wed, 6 Aug 1997 04:30:28 -0600 +The development branch, lilypond1.3, is packaged separately +on Tue, 9 Nov 1999 22:30:32 -0700 + It was downloaded from - ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.2.2.tar.gz + ftp://ftp.lilypond.org/pub/LilyPond/v1.3/lilypond-1.3.24.tar.gz -It is also available at: - ftp://ftp.lilypond.org/pub/LilyPond/v1.2/lilypond-1.2.2.tar.gz +It is also available at: + ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.3/lilypond-1.3.24.tar.gz For more information about GNU LilyPond, please visit: http://www.cs.uu.nl/~hanwen/lilypond/ @@ -19,7 +22,7 @@ Authors: Copyright: - GNU LilyPond is Copyright (C) 1996-1999 + GNU LilyPond is Copyright (C) 1996-2000 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 0b48d3e3e1..12d811e790 100644 --- a/debian/out/control +++ b/debian/out/control @@ -1,18 +1,24 @@ -Source: lilypond +Source: lilypond1.3 +Build-Depends: debhelper (>= 2.0.71), python-base (>= 1.5.2-4), libguile6-dev, tetex-bin (>= 1.0.5-1), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1), flex (>= 2.5.4a-1), bison (>= 1:1.28-1), texinfo (>= 4.0-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.0.0 +Standards-Version: 3.1.0 -Package: lilypond +Package: lilypond1.3 Architecture: any -Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1) -Recommends: python-base (>= 1.5.2-4), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1) -Conflicts: musixtex-fonts, tetex-base (<< 0.9) -Description: A program for printing sheet music. LilyPond is a music typesetter. It produces beautiful sheet music -using a high level description file as input. LilyPond is part of -the GNU Project. - +Replaces: lilypond +Provides: lilypond +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1) +Recommends: python-base (>= 1.5.2-4), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1) +Conflicts: lilypond, musixtex-fonts +Description: A program for printing sheet music. + LilyPond is a music typesetter. It produces beautiful sheet music + using a high level description file as input. LilyPond is part of + the GNU Project. + . + This is the unstable 1.3 branch of LilyPond. It is not intended for + use with stable projects! . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ diff --git a/debian/rules b/debian/rules index ad265c71ff..a1f112f953 100755 --- a/debian/rules +++ b/debian/rules @@ -8,12 +8,12 @@ # Currently maintained by Anthony Fok # for Debian GNU/Linux. -package = lilypond +package = lilypond1.3 SHELL = /bin/sh r = debian/tmp TMP = `pwd`/debian/tmp -d = usr/doc/$(package) +d = usr/share/doc/$(package) # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -31,16 +31,11 @@ build-stamp: --infodir='$${prefix}/share/info' \ --mandir='$${prefix}/share/man' $(MAKE) all + $(MAKE) -C Documentation +# $(MAKE) -C Documentation/programmer ps + $(MAKE) -C Documentation/user ps $(MAKE) -C Documentation/pictures pngs - # Remove the "-" and the "-k" once the \times segfault - # bug is fixed. (lilypond-1.1.31, 1999-02-17) - # -$(MAKE) -k -C Documentation/tex dvi - -$(MAKE) -C Documentation/tex dvi - -$(MAKE) -C Documentation info - - # $(MAKE) htmldoc - touch build-stamp clean: @@ -56,19 +51,18 @@ clean: find . -user root | xargs -r chown --dereference $$SUDO_USER.$$SUDO_GID; \ fi -install: install-stamp -install-stamp: build-stamp +install: build dh_testdir dh_testroot dh_clean -k - dh_installdirs usr/doc/texmf \ - usr/lib/emacs/site-lisp \ - usr/doc/$(package)/examples \ + dh_installdirs usr/share/doc/texmf \ + usr/share/emacs/site-lisp \ + $(d)/examples \ usr/share/texmf/tex \ usr/share/texmf/fonts/source/public \ usr/share/texmf/fonts/afm/public \ usr/share/texmf/fonts/tfm/public - ln -fs ../lilypond $(r)/usr/doc/texmf/lilypond + ln -fs ../$(package) $(r)/usr/share/doc/texmf/lilypond $(MAKE) prefix=$(TMP)/usr install @@ -77,8 +71,6 @@ install-stamp: build-stamp ln -s ../../../../lilypond/afm $(r)/usr/share/texmf/fonts/afm/public/lilypond ln -s ../../../../lilypond/tfm $(r)/usr/share/texmf/fonts/tfm/public/lilypond - touch install-stamp - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -86,16 +78,17 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - cp -av mudela-mode.el $(r)/usr/lib/emacs/site-lisp - dh_installdocs AIMS ANNOUNCE* NEWS-* DEDICATION \ - BUGS TASKS TODO *.txt \ + cp -av lilypond-mode.el $(r)/usr/share/emacs/site-lisp + dh_installdocs DEDICATION TODO *.txt \ Documentation/pictures/out/*.png \ Documentation/out/*.txt \ - Documentation/tex/*.doc \ - Documentation/tex/out/*.dvi -# Documentation/tex/*.bib + Documentation/*/out/[a-z]*.dvi \ + Documentation/*/out/*.ps + mkdir $(r)/$(d)/bibliography $(r)/$(d)/misc + cp -a Documentation/bibliography/*.bib $(r)/$(d)/bibliography + cp -a Documentation/misc/[ACN]* $(r)/$(d)/misc # dh_installexamples input - cp -aP `find input mutopia \( -name '*.ly' -o -name '*.tex' -o -name 'TODO' \)` \ + cp -aP `find input mutopia \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \)` \ $(r)/$(d)/examples for i in `find $(r)/$(d)/examples/ -type d -name out`; do \ mv -fv $$i/* $$i/..; rmdir $$i; done @@ -104,12 +97,12 @@ binary-arch: build install # dh_installcron # dh_installmanpages # dh_undocumented - dh_installchangelogs -k NEWS + dh_installchangelogs -k CHANGES dh_link dh_strip dh_compress dh_fixperms - dh_suidregister +# dh_suidregister dh_installdeb dh_shlibdeps dh_gencontrol @@ -117,8 +110,5 @@ binary-arch: build install dh_md5sums dh_builddeb -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - binary: binary-indep binary-arch .PHONY: build clean install binary-indep binary-arch binary diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc index a06704b182..7903dd230b 100644 --- a/flower/libc-extension.cc +++ b/flower/libc-extension.cc @@ -76,8 +76,8 @@ void * memmem (void const *haystack, int haystack_len, void const *needle,int needle_len) { - Byte const* haystack_byte_c_l = (Byte const*)haystack; - Byte const* needle_byte_c_l = (Byte const*)needle; + Byte const* haystack_byte_c_l = haystack; + Byte const* needle_byte_c_l = needle; return _memmem (haystack_byte_c_l, haystack_len, needle_byte_c_l, needle_len); } diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index 0175ce9ccc..5a7e44eba3 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -4,7 +4,7 @@ a1\fff\> \!a\pp a\< \!a \property Voice.crescendoText = "cresc." \property Voice.crescendoSpanner = "dashed-line" -a\mf\cresc \endcresc a +a\mf\< a \!a a\< \!a } \paper{ diff --git a/input/test/dyn-line.ly b/input/test/dyn-line.ly index 38f023b5b9..cdc5906302 100644 --- a/input/test/dyn-line.ly +++ b/input/test/dyn-line.ly @@ -6,9 +6,11 @@ a1\fff\> \!c,,\pp a'' a\p % We need this to test if we get two Dynamic line spanners a -% because Dynamic_engraver::do_removal_processing () -% doesn't seem to do its job? -a\f +% because do_removal_processing () +% doesn't seem to post_process elements +d\f + +a } \paper{ diff --git a/input/test/span-dynamic.ly b/input/test/span-dynamic.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lily/crescendo.cc b/lily/crescendo.cc index ca1cf50cd0..36bdcbdbec 100644 --- a/lily/crescendo.cc +++ b/lily/crescendo.cc @@ -22,6 +22,7 @@ Crescendo::Crescendo () + Molecule Crescendo::do_brew_molecule () const { @@ -76,9 +77,27 @@ Crescendo::do_brew_molecule () const } while (flip (&d) != LEFT); + + Molecule m; + + Real pad = 0; + SCM s = get_elt_property ("start-text"); + if (gh_string_p (s)) + { + Molecule start_text (lookup_l ()->text ("italic", + ly_scm2string (s), + paper_l ())); + m.add_molecule (start_text); + + pad = paper_l ()->get_var ("interline") / 2; + + width -= start_text.extent ()[X_AXIS].length (); + width -= pad; + width = width >? 0; + } SCM at; - SCM s = get_elt_property ("spanner"); + s = get_elt_property ("spanner"); Real height; if (gh_string_p (s) && ly_scm2string (s) == "dashed-line") { @@ -106,11 +125,12 @@ Crescendo::do_brew_molecule () const gh_double2scm (continued ? height/2 : 0.0), SCM_UNDEFINED); } - Box b (Interval (0, width), Interval (-2*height, 2*height)); - Molecule m (b, at); - + Molecule span (b, at); + + m.add_at_edge (X_AXIS, RIGHT, span, pad); m.translate_axis (extra_left, X_AXIS); + return m; } diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index c1d9172879..d36142c8e2 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -22,156 +22,94 @@ #include "group-interface.hh" #include "directional-element-interface.hh" #include "staff-symbol-referencer.hh" +#include "translator-group.hh" +/* + Wat mij betreft wel DYN_LINE + */ #define DYN_LINE -#ifdef DYN_LINE +#ifdef DYN_LINE class Dynamic_line_spanner : public Spanner { public: Dynamic_line_spanner (); - void add_element (Score_element*); void add_column (Note_column*); Direction get_default_dir () const; - protected: - virtual void do_add_processing (); - // URG: see Dynamic_engraver::do_removal_processing - friend class Dynamic_engraver; virtual void do_post_processing (); - -private: - void translate_elements (Real); - Real get_extreme_y () const; }; Dynamic_line_spanner::Dynamic_line_spanner () { set_elt_property ("transparent", SCM_BOOL_T); -} - -void -Dynamic_line_spanner::add_element (Score_element* e) -{ - Group_interface gi (this, "elements"); - gi.add_element (e); - //? - Side_position_interface (e).set_axis (Y_AXIS); - add_dependency (e); + side_position (this).set_axis (Y_AXIS); } void Dynamic_line_spanner::add_column (Note_column* n) { - Group_interface gi (this, "note-columns"); - gi.add_element (n); - add_dependency (n); -} + if (!spanned_drul_[LEFT]) + set_bounds (LEFT, n); + set_bounds (RIGHT, n); -/* - Copied (urg: literally!) from slur. - Why not do this once, at post-processing stage? - */ -void -Dynamic_line_spanner::do_add_processing () -{ - Link_array encompass_arr = - Group_interface__extract_elements (this, (Note_column*)0, "note-columns"); - - if (encompass_arr.size ()) - { - set_bounds (LEFT, encompass_arr[0]); - if (encompass_arr.size () > 1) - set_bounds (RIGHT, encompass_arr.top ()); - } -} - -#if 0 -Molecule -Dynamic_line_spanner::do_brew_molecule () const -{ - return Molecule (); -} -#endif - -void -Dynamic_line_spanner::do_post_processing () -{ - translate_elements (get_extreme_y ()); -} - -void -Dynamic_line_spanner::translate_elements (Real dy) -{ - SCM s = get_elt_property ("elements"); - for (; gh_pair_p (s); s = gh_cdr (s)) - { - Score_element* se = unsmob_element (gh_car (s)); - se->translate_axis (dy, Y_AXIS); - } + add_dependency (n); } Direction Dynamic_line_spanner::get_default_dir () const { return DOWN; - //Direction dir = directional_element (this).get (); } -Real -Dynamic_line_spanner::get_extreme_y () const +void +Dynamic_line_spanner::do_post_processing () { - Link_array encompass_arr = - Group_interface__extract_elements (this, (Note_column*)0, "note-columns"); - + Spanner::do_post_processing (); + Direction dir = directional_element (this).get (); + if (!dir) + dir = get_default_dir (); + + /* + Hier is ook vast iets voor? + */ Staff_symbol_referencer_interface si (this); - int stafflines = si.line_count (); - //hurg? - stafflines = stafflines != 0 ? stafflines : 5; - Direction dir = get_default_dir (); + Real above_staff = si.line_count () + 2; - Real staff_space = si.staff_space (); - // burp? when are these available? - staff_space = staff_space != 0 ? staff_space : 5 PT; +#if 0 + // Aargh, nu snap ik waarom ik het niet snap + // zie Staff_symbol_referencer_interface::set_position - // urg: TODO: padding - Real y = (stafflines / 2 + 1) * staff_space; + if (si.position_f () * dir < above_staff) + si.set_position (above_staff * (int)dir); - for (int i = 0; i < encompass_arr.size (); i++) + SCM s = get_elt_property ("padding"); + if (gh_number_p (s)) { - Note_column* column = encompass_arr[i]; - Stem* stem = column->stem_l (); - if (stem) - { - Direction stem_dir = directional_element (stem).get (); - if ((stem_dir == dir) - && !stem->extent (Y_AXIS).empty_b ()) - { - y = y >? (stem->extent (Y_AXIS)[dir]) * dir; - } - else - { - y = y >? (column->extent (Y_AXIS)[dir]) * dir; - } - } + si.set_position (si.position_f () + gh_scm2double (s) * (int) dir); } - - return y * dir; +#else + Real dy = 0; + Real pos = si.position_f () * dir; + if (pos * dir < above_staff) + dy = above_staff; + + SCM s = get_elt_property ("padding"); + if (gh_number_p (s)) + dy += gh_scm2double (s); + + Real half_space = si.staff_space () / 2; + translate_axis (dy*half_space*dir, Y_AXIS); +#endif + } #endif - /* TODO: - * why handle absolute and span requests in one cryptic engraver, - what about Span_dynamic_engraver? - - * hairpin - * text: - - `cresc. -- -- --' - - `cresc. poco a poco -- -- --' + Baseline alignment / character metrics of dynamic symbols. */ /** @@ -179,38 +117,36 @@ Dynamic_line_spanner::get_extreme_y () const */ class Dynamic_engraver : public Engraver { - Text_item * abs_text_p_; - Text_item * cr_text_p_; - Crescendo * to_end_cresc_p_; + Text_item * text_p_; + Crescendo * finished_cresc_p_; Crescendo * cresc_p_; - Span_req * cresc_req_l_; - Array dynamic_req_l_arr_; + Text_script_req* text_req_l_; + Span_req * span_start_req_l_; + Drul_array span_req_l_drul_; #ifdef DYN_LINE - /* - We probably need two of these: line-up above and below staff - */ - Dynamic_line_spanner* spanner_; - Moment last_request_mom_; + Dynamic_line_spanner* line_spanner_; +#else + Spanner* line_spanner_; #endif + Moment last_request_mom_; void typeset_all (); + public: VIRTUAL_COPY_CONS(Translator); - Dynamic_engraver(); + Dynamic_engraver (); protected: - void announce_element (Score_element_info); virtual void do_removal_processing (); virtual void acknowledge_element (Score_element_info); virtual bool do_try_music (Music *req_l); - virtual void do_process_requests(); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - virtual void typeset_element (Score_element*); + virtual void do_process_requests (); + virtual void do_pre_move_processing (); + virtual void do_post_move_processing (); }; ADD_THIS_TRANSLATOR (Dynamic_engraver); @@ -226,230 +162,187 @@ Dynamic_engraver::announce_element (Score_element_info i) Dynamic_engraver::Dynamic_engraver () { - do_post_move_processing(); - abs_text_p_ = 0; - cr_text_p_ = 0; - to_end_cresc_p_ = cresc_p_ = 0; - cresc_req_l_ = 0; -#ifdef DYN_LINE - spanner_ = 0; -#endif + text_p_ = 0; + finished_cresc_p_ = 0; + line_spanner_ = 0; + span_start_req_l_ = 0; + cresc_p_ =0; + + text_req_l_ = 0; + span_req_l_drul_[START] = 0; + span_req_l_drul_[STOP] = 0; } void -Dynamic_engraver::do_post_move_processing() +Dynamic_engraver::do_post_move_processing () { - dynamic_req_l_arr_.clear(); + text_req_l_ = 0; + span_req_l_drul_[START] = 0; + span_req_l_drul_[STOP] = 0; } -/* - ugr - */ bool Dynamic_engraver::do_try_music (Music * m) { - Request * r = dynamic_cast (m); - - if(Text_script_req * d = dynamic_cast (r)) + if (Text_script_req* d = dynamic_cast (m)) { - if (d->style_str_ != "dynamic") - return false; + if (d->style_str_ == "dynamic") + { + text_req_l_ = d; + return true; + } } - else if (Span_req * s = dynamic_cast (r)) + else if (Span_req* s = dynamic_cast (m)) { - if (s-> span_type_str_ != "crescendo" - && s->span_type_str_ != "decrescendo") - return false; + if ((s->span_type_str_ == "crescendo" + || s->span_type_str_ == "decrescendo")) + { + span_req_l_drul_[s->span_dir_] = s; + return true; + } } - else - return false; - -#ifdef DYN_LINE - if (!spanner_) - spanner_ = new Dynamic_line_spanner; - last_request_mom_ = now_mom (); -#endif - - for (int i=0; i < dynamic_req_l_arr_.size (); i++) - if (r->equal_b (dynamic_req_l_arr_[i])) - return true; - - dynamic_req_l_arr_.push (r); - return true; + return false; } - void -Dynamic_engraver::do_process_requests() +Dynamic_engraver::do_process_requests () { - Crescendo* new_cresc_p=0; - - for (int i=0; i < dynamic_req_l_arr_.size(); i++) + if ((span_req_l_drul_[START] || text_req_l_) && !line_spanner_) { - if (Text_script_req *absd = - dynamic_cast ( dynamic_req_l_arr_[i])) - { - if (abs_text_p_) - { - dynamic_req_l_arr_[i]->warning (_("Got a dynamic already. Continuing dazed and confused.")); - continue; - } - - String loud = absd->text_str_; - - abs_text_p_ = new Text_item; - abs_text_p_->set_elt_property ("text", - ly_str02scm (loud.ch_C())); - abs_text_p_->set_elt_property ("style", gh_str02scm ("dynamic")); - abs_text_p_->set_elt_property ("script-priority", - gh_int2scm (100)); - #ifdef DYN_LINE - assert (spanner_); - spanner_->add_element (abs_text_p_); + line_spanner_ = new Dynamic_line_spanner; #else - Side_position_interface (abs_text_p_).set_axis (Y_AXIS); - - if (absd->get_direction ()) - { - abs_text_p_->set_elt_property ("direction", gh_int2scm (absd->get_direction ())); - } - - - /* - UGH UGH - */ - SCM prop = get_property ("dynamicDirection"); - if (!isdir_b (prop)) - { - prop = get_property ("verticalDirection"); - } - - if (isdir_b (prop) && to_dir (prop)) - abs_text_p_->set_elt_property ("direction", prop); - - prop = get_property ("dynamicPadding"); - if (gh_number_p(prop)) - { - abs_text_p_->set_elt_property ("padding", prop); - } + line_spanner_ = new Spanner; + line_spanner_->set_elt_property ("transparent", SCM_BOOL_T); + side_position (line_spanner_).set_axis (Y_AXIS); #endif - announce_element (Score_element_info (abs_text_p_, absd)); - - } - else if (Span_req *span_l - = dynamic_cast (dynamic_req_l_arr_[i])) - { - if (span_l->span_dir_ == STOP) - { - if (!cresc_p_) - { - span_l->warning (_ ("Can't find (de)crescendo to end")); - } - else - { - assert (!to_end_cresc_p_); - to_end_cresc_p_ =cresc_p_; - - cresc_p_ = 0; - } - } - else if (span_l->span_dir_ == START) - { - cresc_req_l_ = span_l; - assert (!new_cresc_p); - new_cresc_p = new Crescendo; - new_cresc_p->set_elt_property - ("grow-direction", - gh_int2scm ((span_l->span_type_str_ == "crescendo") - ? BIGGER : SMALLER)); - - SCM s = get_property (span_l->span_type_str_ + "Text"); - if (gh_string_p (s)) - { - cr_text_p_ = new Text_item; - cr_text_p_->set_elt_property ("text", s); - // urg - cr_text_p_->set_elt_property ("style", gh_str02scm ("italic")); - // ? - cr_text_p_->set_elt_property ("script-priority", - gh_int2scm (100)); - - /* - This doesn't work. - I'd like to have support like this: - | - x| - cresc. - - - - - or - | - x| - ff cresc. - - - - - */ - if (0) //abs_text_p_) - { - Side_position_interface (cr_text_p_).set_axis (X_AXIS); - Side_position_interface (cr_text_p_).add_support (abs_text_p_); - } + announce_element (Score_element_info + (line_spanner_, + text_req_l_ ? text_req_l_ : span_req_l_drul_[START])); -#ifdef DYN_LINE - assert (spanner_); - spanner_->add_element (cr_text_p_); -#endif - - //Side_position_interface (cr_text_p_).set_axis (Y_AXIS); - announce_element (Score_element_info (cr_text_p_, span_l)); - } - - s = get_property (span_l->span_type_str_ + "Spanner"); - if (gh_string_p (s)) //&& ly_scm2string (s) != "hairpin") - { - new_cresc_p->set_elt_property ("spanner", s); - } + } -#ifdef DYN_LINE - assert (spanner_); - spanner_->add_element (new_cresc_p); -#else - // what's the diff between side_position and Side_pos_iface? - side_position (new_cresc_p).set_axis (Y_AXIS); -#endif - announce_element (Score_element_info (new_cresc_p, span_l)); - } + if (span_req_l_drul_[START] || text_req_l_) + last_request_mom_ = now_mom (); + +#ifndef DYN_LINE + if (line_spanner_) + { + /* + Generic property will handle this for a Dynamic_line_spanner + */ + Direction dir = DOWN; + SCM s = get_property ("dynamicDirection"); + if (!isdir_b (s)) + { + s = get_property ("verticalDirection"); } + + if (isdir_b (s) && to_dir (s)) + dir = to_dir (s); + + line_spanner_->set_elt_property ("direction", gh_int2scm ((int)dir)); + + s = get_property ("dynamicPadding"); + Real padding; + if (gh_number_p (s)) + padding = gh_scm2double (s); + else + padding = 2; + line_spanner_->set_elt_property ("padding", gh_double2scm (padding)); + } +#endif + + if (text_req_l_) + { + String loud = text_req_l_->text_str_; + + text_p_ = new Text_item; + text_p_->set_elt_property ("text", + ly_str02scm (loud.ch_C ())); + text_p_->set_elt_property ("style", gh_str02scm ("dynamic")); + text_p_->set_elt_property ("script-priority", + gh_int2scm (100)); + + assert (line_spanner_); + text_p_->set_parent (line_spanner_, Y_AXIS); + announce_element (Score_element_info (text_p_, text_req_l_)); } - if (new_cresc_p) + if (span_req_l_drul_[STOP]) { - if (cresc_p_) + if (!cresc_p_) { - ::warning (_ ("Too many crescendi here")); - - typeset_element (cresc_p_); - + span_req_l_drul_[STOP]->warning + (_ ("can't find start of (de)crescendo")); + } + else + { + assert (!finished_cresc_p_); + cresc_p_->set_bounds(RIGHT, get_staff_info ().musical_pcol_l ()); + finished_cresc_p_ = cresc_p_; cresc_p_ = 0; + span_start_req_l_ = 0; } - - cresc_p_ = new_cresc_p; - cresc_p_->set_bounds(LEFT,get_staff_info().musical_pcol_l ()); + } - // arrragh, brr, urg: we know how wide text is, no? - if (abs_text_p_) + if (span_req_l_drul_[START]) + { + if (span_start_req_l_) { - index_set_cell (cresc_p_->get_elt_property ("dynamic-drul"), - LEFT, SCM_BOOL_T); - if (to_end_cresc_p_) - index_set_cell (to_end_cresc_p_->get_elt_property ("dynamic-drul"), - RIGHT, SCM_BOOL_T); + span_req_l_drul_[START]->warning + (span_start_req_l_->span_dir_ == 1 + ? + _ ("already have a crescendo") + : _ ("already have a decrescendo")); } - } + else + { + span_start_req_l_ = span_req_l_drul_[START]; + cresc_p_ = new Crescendo; + cresc_p_->set_elt_property + ("grow-direction", + gh_int2scm ((span_req_l_drul_[START]->span_type_str_ == "crescendo") + ? BIGGER : SMALLER)); + + SCM s = get_property (span_req_l_drul_[START]->span_type_str_ + "Text"); + if (gh_string_p (s)) + { + cresc_p_->set_elt_property ("start-text", s); + daddy_trans_l_->set_property (span_req_l_drul_[START]->span_type_str_ + + "Text", SCM_UNDEFINED); + } + + s = get_property (span_req_l_drul_[START]->span_type_str_ + "Spanner"); + if (gh_string_p (s)) //&& ly_scm2string (s) != "hairpin") + { + cresc_p_->set_elt_property ("spanner", s); + daddy_trans_l_->set_property (span_req_l_drul_[START]->span_type_str_ + + "Spanner", SCM_UNDEFINED); + } + + cresc_p_->set_bounds(LEFT, get_staff_info ().musical_pcol_l ()); + cresc_p_->set_bounds(RIGHT, get_staff_info ().musical_pcol_l ()); + + // arrragh, brr, urg: we know how wide text is, no? + if (text_p_) + { + index_set_cell (cresc_p_->get_elt_property ("dynamic-drul"), + LEFT, SCM_BOOL_T); + if (finished_cresc_p_) + index_set_cell (finished_cresc_p_->get_elt_property ("dynamic-drul"), + RIGHT, SCM_BOOL_T); + } + assert (line_spanner_); + cresc_p_->set_parent (line_spanner_, Y_AXIS); + announce_element (Score_element_info (cresc_p_, span_req_l_drul_[START])); + } + } } void -Dynamic_engraver::do_pre_move_processing() +Dynamic_engraver::do_pre_move_processing () { typeset_all (); } @@ -460,105 +353,76 @@ Dynamic_engraver::do_removal_processing () if (cresc_p_) { typeset_element (cresc_p_ ); - cresc_req_l_->warning (_ ("unended crescendo")); + span_start_req_l_->warning (_ ("unterminated (de)crescendo")); cresc_p_ =0; } -#ifdef DYN_LINE - if (spanner_) + typeset_all (); + if (line_spanner_) { - // URG urg. We did't get a post_processing call !? - spanner_->do_post_processing (); - typeset_element (spanner_); - spanner_ = 0; - } +#ifndef DYN_LINE + Direction dir = directional_element (line_spanner_).get (); + Real staff_space = Staff_symbol_referencer_interface (line_spanner_).staff_space (); + SCM s = line_spanner_->get_elt_property ("padding"); + line_spanner_->translate_axis (gh_scm2double (s) * staff_space * (int)dir, Y_AXIS); #endif - typeset_all (); + typeset_element (line_spanner_); + line_spanner_ = 0; + } } void Dynamic_engraver::typeset_all () { - if (to_end_cresc_p_) + if (finished_cresc_p_) { - to_end_cresc_p_->set_bounds(RIGHT,get_staff_info().musical_pcol_l ()); - typeset_element (to_end_cresc_p_); - - to_end_cresc_p_ =0; - + finished_cresc_p_->set_bounds (RIGHT, get_staff_info ().musical_pcol_l ()); + typeset_element (finished_cresc_p_); + finished_cresc_p_ =0; } - if (abs_text_p_) + if (text_p_) { - typeset_element (abs_text_p_); - abs_text_p_ = 0; + typeset_element (text_p_); + text_p_ = 0; } - if (cr_text_p_) - { - typeset_element (cr_text_p_); - cr_text_p_ = 0; - } -#ifdef DYN_LINE /* TODO: This should be optionised: * break when group of dynamic requests ends * break now * continue through piece */ - if (spanner_ && last_request_mom_ < now_mom ()) + if (line_spanner_ && last_request_mom_ < now_mom ()) { - typeset_element (spanner_); - spanner_ = 0; - } -#endif -} - -void -Dynamic_engraver::typeset_element (Score_element * e) -{ #ifndef DYN_LINE - side_position(e).add_staff_support (); + Direction dir = directional_element (line_spanner_).get (); + Real staff_space = Staff_symbol_referencer_interface (line_spanner_).staff_space (); + SCM s = line_spanner_->get_elt_property ("padding"); + line_spanner_->translate_axis (gh_scm2double (s) * staff_space * (int)dir, Y_AXIS); #endif - Engraver::typeset_element (e); -} - -#ifdef DYN_LINE - -void -Dynamic_engraver::acknowledge_element (Score_element_info i) -{ - if (spanner_) - { - if (Note_column* n = dynamic_cast (i.elem_l_)) - spanner_->add_column (n); + typeset_element (line_spanner_); + line_spanner_ = 0; } } -#else - void Dynamic_engraver::acknowledge_element (Score_element_info i) { - if (dynamic_cast (i.elem_l_) - || dynamic_cast (i.elem_l_) - ) + if (line_spanner_) { - if (abs_text_p_) - Side_position_interface (abs_text_p_).add_support (i.elem_l_); - - if (cr_text_p_) ///&& !abs_text_p_) + if (Note_column* n = dynamic_cast (i.elem_l_)) { - Side_position_interface (cr_text_p_).set_axis (Y_AXIS); - Side_position_interface (cr_text_p_).add_support (i.elem_l_); + side_position (line_spanner_).add_support (n); +#ifdef DYN_LINE + line_spanner_->add_column (n); +#else + if (!line_spanner_->spanned_drul_[LEFT]) + line_spanner_->set_bounds (LEFT, n); + line_spanner_->set_bounds (RIGHT, n); + + line_spanner_->add_dependency (n); +#endif } - - if (to_end_cresc_p_) - Side_position_interface (to_end_cresc_p_).add_support (i.elem_l_); - - if (cresc_p_) - Side_position_interface(cresc_p_).add_support (i.elem_l_); } } - -#endif diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc index 415852f573..5a64f17922 100644 --- a/lily/span-dynamic-performer.cc +++ b/lily/span-dynamic-performer.cc @@ -32,10 +32,12 @@ protected: virtual void acknowledge_element (Audio_element_info); virtual void do_process_requests (); virtual void do_pre_move_processing (); + virtual void do_post_move_processing (); private: Audio_dynamic* audio_p_; - Drul_array request_drul_; + Span_req* span_start_req_l_; + Drul_array span_req_l_drul_; Array dynamic_tuple_arr_; Array finished_dynamic_tuple_arr_; Direction finished_dir_; @@ -45,7 +47,9 @@ ADD_THIS_TRANSLATOR (Span_dynamic_performer); Span_dynamic_performer::Span_dynamic_performer () { - request_drul_[START] = request_drul_[STOP] = 0; + span_req_l_drul_[START] = 0; + span_req_l_drul_[STOP] = 0; + span_start_req_l_ = 0; audio_p_ = 0; } @@ -55,7 +59,7 @@ Span_dynamic_performer::acknowledge_element (Audio_element_info i) if (Audio_dynamic * d = dynamic_cast (i.elem_l_)) { Audio_dynamic_tuple a = { d, now_mom () }; - if (!request_drul_[START]) + if (!span_req_l_drul_[START]) dynamic_tuple_arr_.clear (); dynamic_tuple_arr_.push (a); if (finished_dynamic_tuple_arr_.size ()) @@ -72,7 +76,18 @@ Span_dynamic_performer::do_process_requests () Real start_volume = finished_dynamic_tuple_arr_[0].audio_l_->volume_i_; Real dv = finished_dynamic_tuple_arr_.top ().audio_l_->volume_i_ - start_volume; - if (!dv) + /* + urg. + Catch and fix the case of: + + | | + x| x| + f cresc. -- -- -- -- -- pp + + Actually, we should provide a non-displayed dynamic/volume setting, + to set volume to 'ff' just before the pp. + */ + if (!dv || sign (dv) != finished_dir_) { // urg. about one volume step dv = (int)finished_dir_ * 13; @@ -92,20 +107,27 @@ Span_dynamic_performer::do_process_requests () finished_dynamic_tuple_arr_.clear (); } - if (request_drul_[STOP]) + if (span_req_l_drul_[STOP]) { - finished_dynamic_tuple_arr_ = dynamic_tuple_arr_; - finished_dir_ = request_drul_[STOP]->span_type_str_ == "crescendo" - ? RIGHT : LEFT; - dynamic_tuple_arr_.clear (); - if (finished_dynamic_tuple_arr_.size ()) - dynamic_tuple_arr_.push (finished_dynamic_tuple_arr_.top ()); - request_drul_[STOP] = 0; - request_drul_[START] = 0; + if (!span_start_req_l_) + { + span_req_l_drul_[STOP]->warning (_ ("can't find start of (de)crescendo")); + } + else + { + span_start_req_l_ = 0; + finished_dynamic_tuple_arr_ = dynamic_tuple_arr_; + finished_dir_ = span_req_l_drul_[STOP]->span_type_str_ == "crescendo" + ? RIGHT : LEFT; + dynamic_tuple_arr_.clear (); + if (finished_dynamic_tuple_arr_.size ()) + dynamic_tuple_arr_.push (finished_dynamic_tuple_arr_.top ()); + } } - if (request_drul_[START]) + if (span_req_l_drul_[START]) { + span_start_req_l_ = span_req_l_drul_[START]; audio_p_ = new Audio_dynamic (0); Audio_element_info info (audio_p_, 0); announce_element (info); @@ -125,24 +147,24 @@ Span_dynamic_performer::do_pre_move_processing () } } +void +Span_dynamic_performer::do_post_move_processing () +{ + span_req_l_drul_[STOP] = 0; + span_req_l_drul_[START] = 0; +} + bool Span_dynamic_performer::do_try_music (Music* r) { if (Span_req * s = dynamic_cast(r)) { - if (s-> span_type_str_ != "crescendo" - && s->span_type_str_ != "decrescendo") - return false; - - Direction d = s->span_dir_; - - if (d == STOP && !request_drul_[START]) + if (s-> span_type_str_ == "crescendo" + || s->span_type_str_ == "decrescendo") { - r->warning (_ ("No (de)crescendo to end")); - return false; + span_req_l_drul_[s->span_dir_] = s; + return true; } - request_drul_[d] = s; - return true; } return false; } diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 64522e734f..0557fce059 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -107,7 +107,9 @@ Staff_symbol_referencer_interface::callback (Dimension_cache const * c) return off; } - +/* + Huh? -- jcn + */ void Staff_symbol_referencer_interface::set_position (Real p) { @@ -115,6 +117,7 @@ Staff_symbol_referencer_interface::set_position (Real p) if (st && elt_l_->common_refpoint(st, Y_AXIS)) { Real oldpos = position_f (); + // Aargh! elt_l_->set_elt_property ("staff-position", gh_double2scm (p - oldpos)); } else diff --git a/ly/engraver.ly b/ly/engraver.ly index fda4b54200..4eb5788468 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -108,15 +108,16 @@ RhythmicStaffContext=\translator{ \accepts "Voice"; }; \translator{\RhythmicStaffContext} -VoiceContext = \translator { +VoiceContext = \translator { \type "Engraver_group_engraver"; + \name Voice; + dynamicPadding = #5.0 Generic_property_list = #generic-voice-properties \consists "Output_property_engraver"; \consists "Dynamic_engraver"; % must come before text_engraver. - \name Voice ; \consists "Property_engraver"; \consists "Breathing_sign_engraver"; diff --git a/ly/spanners.ly b/ly/spanners.ly index b21bcc7165..4b3d6bdb13 100644 --- a/ly/spanners.ly +++ b/ly/spanners.ly @@ -7,6 +7,7 @@ rc = \spanrequest \stop "crescendo" rced = \spanrequest \stop "decrescendo" %% urg, these don't work yet. +%% must set manually xcresc = { %\spanrequest \start "crescendo" \property Voice.crescendoText = "cresc." @@ -20,7 +21,7 @@ xendcresc = { } cresc = \spanrequest \start "crescendo" -endcresc = \spanrequest \stop "crescendo" +endcresc = \spanrequest \stop "crescendo" %crescpoco = \property Voice.crescendoText = "cresc. poco a poco" %decresc = \property Voice.crescendoText = "decr." diff --git a/ly/textscripts.ly b/ly/textscripts.ly index 47cb7d258b..f810130f70 100644 --- a/ly/textscripts.ly +++ b/ly/textscripts.ly @@ -12,9 +12,6 @@ f = \textscript "e" "dynamic" % see feta-din layout ff = \textscript "ff" "dynamic" fff = \textscript "fff" "dynamic" fp = \textscript "fp" "dynamic" -cresc = \textscript "cresc." "italic" -decresc = \textscript "decresc." "italic" -dim = \textscript "dim." "italic" sf = \textscript "sf" "dynamic" sfp = \textscript "sfp" "dynamic" diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index fa4818f2ea..96d4bf36af 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.31 -Entered-date: 09MAR00 +Version: 1.3.32 +Entered-date: 13MAR00 Description: Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.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 - 1000k lilypond-1.3.31.tar.gz + 1000k lilypond-1.3.32.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.31.tar.gz + 1000k lilypond-1.3.32.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index a8e3f0b345..de148ac93b 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.3.31 +Version: 1.3.32 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.31.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.32.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # get Packager from (undocumented?) ~/.rpmmacros! diff --git a/mf/GNUmakefile b/mf/GNUmakefile index e1883dc80c..f0c0a7642b 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -51,3 +51,4 @@ $(outdir)/%.afm $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log localclean: rm -f mfplain.mem mfplain.log mpout.log + rm -f *.tfm *.log diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index e8259e45f2..2f78af2aa7 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -27,6 +27,6 @@ $bassi = \context GrandStaff = bassi_group < \score{ \$bassi \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index 1701fdfcda..232a85cbc5 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -14,6 +14,6 @@ copyright = "public domain"; \score{ \$clarinetti_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index d69be00afe..449279bdb9 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -25,8 +25,10 @@ $clarinetti_staff = \context Staff = clarinetti < \notes \context Staff=clarinetti < \time 4/4; \key F; - \$clarinetto1 - \$clarinetto2 + \context VoiceOne=clarinettoi + \$clarinetto1 + \context VoiceTwo=clarinettoii + \$clarinetto2 > > diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 6e6b0e148a..801427b988 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -22,8 +22,10 @@ clarinetto1 = \notes \relative c { f4-. r r2 | e4-. r r2 | R1 *4 | - bes2\p-"\ \ \ cresc." ( a | - )gis2. a4-.\f | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + bes2\p\< ( a | + )gis2. \!a4-.\f | R1*13 | d1\ff ~ | d4(f, bes)a| @@ -43,21 +45,25 @@ clarinetto1 = \notes \relative c { c2. c4\sf| c4 r r2| R1*5| - a'2.\p-"\ \ \ cresc." ( bes4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + a'2.\p\< ( bes4| a g e)c| c'2.( d4| c2)bes| a2.(bes4| a g e)c| - c'2\ff es,| + \!c'2\ff es,| d1~| d\pp~| d~| d~| d| - bes2.-"cresc."( c4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + bes2.\<( c4| bes a fis)d| - d'2\ff f| + \!d'2\ff f| e1~| e4\p r r2| R1*11| @@ -136,9 +142,11 @@ clarinetto1 = \notes \relative c { )e2. f4\sf(| )e4 r r2| R1*9| - fis2.\p-"\ \ \ cresc."(g4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + fis2.\p\<(g4| fis e cis)a| - a2\ff c| + \!a2\ff c| b1~| b4\pp r r2| R1*5| @@ -154,11 +162,13 @@ clarinetto1 = \notes \relative c { r2 r4 d(| )cis r r2| r r4 r8 cis| - d4-"cresc." r r2| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + d4\< r r2| r r4 r8 d| e4 r r r8 e| f4 r r r8 f| - cis2.\ff()d4| + \!cis2.\ff()d4| cis(d cis)d| cis2.\ff()d4| cis(d cis)d| @@ -186,25 +196,29 @@ clarinetto1 = \notes \relative c { d4 r8 g f4 r8 c| bes4 r r2| R1*11| - f'2.\p-"\ \ \ cresc."(g4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + f'2.\p\<(g4| f e cis)a| a1| - b\f~| + \!b\f~| b| c\f~| c\p| d\f~| - d\p-"\ \ \ cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + d\p\<~| d~| d~| d~| - d4.\ff e8 f4.\sf()e8| + \!d4.\ff e8 f4.\sf()e8| r4 r8 e e4.\sf()e8| r4 r8 fis8 g4.\sf()fis8| r4 r8 fis8 g4.\sf()fis8| r4 r8 fis8 a4.\sf()g8| r4 r8 g8 bes4.\sf()a8| - f4.-"sempre\ \ \ \ \ \ \ "\ff cis8 d4. bes8| + f4.-"sempre"\ff cis8 d4. bes8| a4. bes8 a4. g'8| f4. cis8 d4. bes8| a4. bes8 a4. g'8| @@ -223,9 +237,11 @@ clarinetto1 = \notes \relative c { R1| d4-. d-. r2| d4-. d-. r2| - d4-"dim." r e r| + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + d4\> r e r| R1| - a,4\p r r2| + \!a,4\p r r2| R1| a4 r r2| R1| diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index baacc0aa9c..c63928dc0b 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -51,9 +51,11 @@ clarinetto2 = \notes \relative c { d~| d| %a deux| - bes'2.-"cresc."(c4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + bes'2.\<(c4| bes a fis)d| - d'2\ff f,| + \!d'2\ff f,| e1~| e4\p r r2| R1*11| @@ -121,10 +123,12 @@ clarinetto2 = \notes \relative c { )e2. f4\sf(| )e4 r r2| R1*9| - fis2.\p-"\ \ \ cresc."( g4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + fis2.\p\<( g4| fis e cis)a| %a deux; urg| - a'2\ff c| + \!a'2\ff c| b1~| b4 r r2| R1*5| @@ -167,18 +171,20 @@ clarinetto2 = \notes \relative c { c1\f~| c\p| a1\f| - d,\p-"\ \ \ cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + d,\p\<~| d~| d~| d~| - d4.\ff e8 f4.\sf()e8| + \!d4.\ff e8 f4.\sf()e8| r4 r8 e f4.\sf()e8| r4 r8 fis g4.\sf()fis8| r4 r8 fis g4.\sf()fis8| r4 r8 fis a4.\sf()g8| r4 r8 g bes4.\sf()a8| %a deux; urg copied clarinetto-1(270,273)| - f'4.-"sempre\ \ \ \ \ \ \ "\ff cis8 d4. bes8|| + f'4.-"sempre"\ff cis8 d4. bes8|| a4. bes8 a4. g'8|| f4. cis8 d4. bes8|| a4. bes8 a4. g'8|| @@ -198,9 +204,11 @@ clarinetto2 = \notes \relative c { R1| a4-. c-. r2| bes4-. c-. r2| - bes4-"dim." r a r| + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + bes4\> r a r| R1| - a4\p r r2| + \!a4\p r r2| R1| g4 r r2| R1| diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly index 655e148f3f..6f0efdd471 100644 --- a/mutopia/Coriolan/contrabasso-part.ly +++ b/mutopia/Coriolan/contrabasso-part.ly @@ -15,6 +15,6 @@ copyright = "public domain"; \score{ \$contrabasso_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index f17711f794..0df39bde33 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -37,38 +37,46 @@ contrabasso = \notes \relative c { )as,4 r r r8 as(| )g4 r r r8 g(| )d'4 r r r8 d(| - )es4-"cresc." r r r8 es(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + )es4\< r r r8 es(| )as,4 r r r8 as(| )g4 r r r8 g(| )d'4 r r r8 d(| %60 )es4 r r r8 es(| )as,4 r r r8 as(| - )g2\ff f | + \!)g2\ff f | e c' | f,4\p r r r8 f(| %65 )bes4 r r r8 bes(| )as4 r r r8 as(| )e4 r r r8 e(| - )f4-"cresc." r r r8 f(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + )f4\< r r r8 f(| )bes4 r r r8 bes(| %70 - )as2\ff g | + \!)as2\ff g | fis d' | - g,4\p-"cresc." r r r8 g(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + g,4\p\< r r r8 g(| )c4 r r r8 c(| % ) { s2 s4 \!s8}> | - )b1 | + \!)b1\sf | %75 \skip 1*3; | d4\pp r d r | d r d r | %80 - d r d-"cresc." r | - d r d r | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + d r d\< r | d r d r | d r d r | + d r d \!r | \skip 1*8; | c4 r r2 | c4 r r2 | @@ -120,35 +128,38 @@ contrabasso = \notes \relative c { %180 )e4 r r r8 e(| )b'4 r r r8 b(| - )c4-"cresc." r r r8 c(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + )c4\< r r r8 c(| )f,4 r r r8 f(| )e4 r r r8 e'(| %185 )b4 r r r8 b(| )c4 r r r8 c(| )f,4 r r r8 f(| - )e2\ff d' | + \!)e2\ff d' | cis a | %190 d4\p r r r8 d(| )g,4 r r r8 g(| )f4 r r r8 f(| )cis'4 r r r8 cis(| - )d4-"cresc." r r r8 d(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + )d4\< r r r8 d(| + %195 )g,4 r r r8 g( | - )d2\ff e' | + \!)d2\ff e' | dis b | e4\p r r r8 e(| - % )a4\< r r r8 a(| - %200 - % g1 | - | )a4 r r r8 a(| + %200 )g1 | f | \skip 1*18; | + %220 f4 r r2 | f'4 r r2 | diff --git a/mutopia/Coriolan/coriolan-midi.ly b/mutopia/Coriolan/coriolan-midi.ly new file mode 100644 index 0000000000..3d5c9577c8 --- /dev/null +++ b/mutopia/Coriolan/coriolan-midi.ly @@ -0,0 +1,3 @@ +\midi{ + \tempo 4 = 160; +} diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly new file mode 100644 index 0000000000..e75dd8e970 --- /dev/null +++ b/mutopia/Coriolan/coriolan-paper.ly @@ -0,0 +1,27 @@ +\paper{ + \paper_sixteen + \translator { + \VoiceContext + \name "VoiceOne"; + \consists "Line_number_engraver"; + verticalDirection = #1 + stemVerticalDirection = #1 + dynamicDirection = #-1 + } + \translator { + \VoiceContext + \name "VoiceTwo"; + \consists "Line_number_engraver"; + verticalDirection = #-1 + stemVerticalDirection = #-1 + \remove "Dynamic_engraver"; + %% Aargh: absulute dynamics: + \remove "Text_engraver"; + } + \translator { + \HaraKiriStaffContext + \accepts "VoiceOne"; + \accepts "VoiceTwo"; + } + \translator { \OrchestralScoreContext } +} diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly index 7b8d3cdadd..67df401e15 100644 --- a/mutopia/Coriolan/coriolan-part-paper.ly +++ b/mutopia/Coriolan/coriolan-part-paper.ly @@ -1,9 +1,28 @@ \paper { \translator { \OrchestralPartStaffContext } - \translator { + \translator { \VoiceContext -% noAutoBeam = ##t + \name "VoiceOne"; \consists "Line_number_engraver"; + verticalDirection = #1 + stemVerticalDirection = #1 + dynamicDirection = #-1 + } + \translator { + \VoiceContext + \name "VoiceTwo"; + \consists "Line_number_engraver"; + verticalDirection = #-1 + stemVerticalDirection = #-1 + \remove "Dynamic_engraver"; + %% Aargh: absulute dynamics: + \remove "Text_engraver"; + } + + \translator { + \StaffContext + \accepts "VoiceOne"; + \accepts "VoiceTwo"; } \translator { \ScoreContext skipBars = ##t } } diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index fd852672ae..24f89ce987 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -10,6 +10,7 @@ copyright = "public domain"; \version "1.3.4"; \include "global.ly" +\include "paper16.ly" \include "contrabasso.ly" \include "clarinetti.ly" @@ -25,6 +26,7 @@ copyright = "public domain"; \include "violino-2.ly" \include "violoncello.ly" + legni = \context StaffGroup = legni_group < \$flauti_staff \$oboi_staff @@ -66,19 +68,13 @@ archi = \context StaffGroup = archi_group < \score{ < - \property Score . textStyle = "italic" - + %%? \property Score . textStyle = "italic" \$legni \$ottoni \$timpani_g \$archi > - \paper{ - linewidth = 130.0\mm; - \translator { \VoiceContext noAutoBeaming = "1"; } - \translator { \HaraKiriStaffContext } - \translator { \OrchestralScoreContext } - } - \midi{ \tempo 4 = 160; } + \include "coriolan-paper.ly" + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 8d0a10b2de..b3bd30b812 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -14,7 +14,7 @@ copyright = "public domain"; \score{ \$corni_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index ad9a73051e..f98f981fcf 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -24,8 +24,10 @@ $corni_staff = \context Staff = corni < %\notes \context Voice=corni < \notes \context Staff=corni < \time 4/4; - \$corno1 - \$corno2 + \context VoiceOne=cornoi + \$corno1 + \context VoiceTwo=cornoii + \$corno2 > > diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 207b6ac969..56f44b218a 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -25,11 +25,13 @@ corno1 = \notes \relative c { r4 g-.\f r2 | R1*2 | % `a 2 - r8 f\p-"\ \ \ cresc." f2 e4 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r8 f\p\< f2 e4 | r8 f f2 e4 | f4. e8 f4. e8 | f4. e8 f4. e8 | - f1\ff % ~ | + \!f1\ff % ~ | f4 ( e f )e e4. r8 e4. r8 | e4. r8 e4. r8 | @@ -170,11 +172,13 @@ corno1 = \notes \relative c { e~| e~| e~| - e-"cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + e\<~| e~| e| %a deux| - c\f| + \!c\f| d\p| d\f| e\p| @@ -188,7 +192,7 @@ corno1 = \notes \relative c { e| f| e| - e4.-"sempre\ \ \ \ \ \ \ "\ff e8 e4. e8| + e4.-"sempre"\ff e8 e4. e8| e4. e8 e4. e8| e4. e8 e4. e8| e4. e8 e4. e8| diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index 572a5bd10c..f41c2d0dc3 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -26,11 +26,13 @@ corno2 = \notes \relative c { R1*2 | % `a 2 % urg, yes this is a-deux, but lily doesn't know about I. / a2 yet. - r8 f'\p-"\ \ \ cresc." f2 e4 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r8 f'\p\< f2 e4 | r8 f f2 e4 | f4. e8 f4. e8 | f4. e8 f4. e8 | - d1\ff ~| + \!d1\ff ~| d4(e d)c| d4. r8 c4. r8| e,4. r8 e4. r8| @@ -127,22 +129,26 @@ corno2 = \notes \relative c { e~| e~| e~| - e-"cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + e\<~| e~| e~| e~| e~| e| - e2\ff d'| + \!e2\ff d'| R1*17| %a deux| r4 r8 e,\p e4. e8| r4 r8 e e4. e8| - r4 r8 e-"cresc." e4. e8| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r4 r8 e\< e4. e8| r4 r8 e e4. e8| r4 r8 e e4. e8| r4 r8 e e4. e8| - d'2.\ff c4| + \!d'2.\ff c4| d c d c| d2.\ff c4| d c d c| @@ -183,11 +189,13 @@ corno2 = \notes \relative c { e~| e~| e~| - e-"cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + e\<~| e~| e| %a deux| - c'1\f| + \!c'1\f| d\p| d\f| e\p| @@ -201,7 +209,7 @@ corno2 = \notes \relative c { e|| f|| e|| - e4.-"sempre\ \ \ \ \ \ \ "\ff e8 e4. e8|| + e4.-"sempre"\ff e8 e4. e8|| e4. e8 e4. e8|| e4. e8 e4. e8|| e4. e8 e4. e8|| diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index 17b5ceef51..9f1ccb09ed 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -16,6 +16,6 @@ copyright = "public domain"; \score{ \$fagotti_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index 46df47d628..f6d6995a17 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -22,8 +22,10 @@ $fagotti_staff = \context Staff = fagotti < %\notes \context Voice=fagotti < \notes \context Staff=fagotti < \global - \$fagotto1 - \$fagotto2 + \context VoiceOne=fagottoi + \$fagotto1 + \context VoiceTwo=fagottoii + \$fagotto2 > > diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 965d250d40..0a698b4679 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -24,15 +24,19 @@ fagotto1 = \notes \relative c { R1*5 | r2 r4 g4-.\f | R1*5 | - ges'2\p-"\ \ \ cresc." f2 ~ | - f4 e-.\f r2 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + ges'2\p\< f2 ~ | + f4 \!e-.\f r2 | R1 | f2\p()es | - d1-"cresc." | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + d1\< | d | d2 d | d d | - c1\ff ~ | + \!c1\ff ~ | c4(bes as)g| f4. r8 es4. r8| b'4. r8 c4. r8| @@ -50,19 +54,23 @@ fagotto1 = \notes \relative c { )d4 r r2| R1*9| \clef "tenor"; - g'2.(as4 \p-"\ \ \ cresc."| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + g'2.(as4 \p\<| g f d)bes \clef "bass"; | - bes2\ff as| + \!bes2\ff as| g c~| c1\p~| c~| c~| c~| - c-"cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c\<~| c| - c2\ff bes| + \!c2\ff bes| a d~| d1~| d~| @@ -72,11 +80,13 @@ fagotto1 = \notes \relative c { bes(a bes)g| fis r8 a\pp a4. a8| r4 r8 a a4. a8| - r4 r8 bes-"cresc." bes4. bes8| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r4 r8 bes\< bes4. bes8| r4 r8 bes bes4. bes8| r4 r8 c8 c4. c8| r4 r8 d d4. d8| - es2.\ff()d4| + \!es2.\ff()d4| c(bes c)bes| es2.()d4| c(bes c)bes| @@ -119,14 +129,16 @@ fagotto1 = \notes \relative c { e4 r r2| R1*3| r4 r8 f' es4 r8 bes| - c4-"cresc." r4 r2| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c4\< r4 r2| R1*2| r4 r8 ges' f4 r8 c| des4 r bes2| c1| % 136 a deux - des2\p( c| + \!des2\p( c| bes as| ges f| )es as,| @@ -137,13 +149,15 @@ fagotto1 = \notes \relative c { [g,: bes: c: des:][f,: bes: c: des:]|| [e,: g: bes: des:][c: e: g: c:]|| - c1\p-"\ \ \ cresc." ~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c1\p\< ~| c1~| c1~| c| %%148 copied from cello (from viola)| - [f,8:\ff as: c: des:][es,: g: b: c:]|| + [\!f,8:\ff as: c: des:][es,: g: b: c:]|| [des,: f: a: bes:][c,: es: g: as:]|| %150| % r[des,16 des][e e g g]r8[c,16 c][e e f f]|| @@ -203,7 +217,9 @@ fagotto1 = \notes \relative c { es(d es)c| b r8 d\p d4. d8| r4 r8 d d4. d8| - r4 r8 es-"cresc." es4. es8| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r4 r8 es\< es4. es8| r4 r8 es es4. es8| r4 r8 % \clef "tenor"; % @@ -211,7 +227,7 @@ fagotto1 = \notes \relative c { r4 r8 g g4. g8 % \clef "bass"; % | - f2.\ff()es4| + \!f2.\ff()es4| d(c d)c| f2.\ff()es4| d(c d)c| @@ -243,19 +259,23 @@ fagotto1 = \notes \relative c { es d b)g| g'2.(as4| g2)f| - es2.-"cresc." f4| - es d b g| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + es2.\<( f4| + es d b)g| R1| - c1\f| + \!c1\f| des\p| d\f| es\p| e\f| - as,4.\p-"\ \ \ cresc." as8 g4. g8| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + as,4.\p\< as8 g4. g8| f4. f8 es4. es8| as4. as8 g4. g8| f4. f8 es4. es8| - f4.\ff as8 as2\sf| + \!f4.\ff as8 as2\sf| r4 r8 as as2\sf| r4 r8 bes bes2\sf| r4 r8 bes bes2\sf| @@ -263,7 +283,7 @@ fagotto1 = \notes \relative c { r4 r8 d d2\sf| %% 270 copied from cello | - [c,8-"sempre\ \ \ \ \ \ \ "\ff b c d][es\ff d es c]|| + [c,8-"sempre"\ff b c d][es\ff d es c]|| [b c d c][b c b g]|| [c8 b c d][es d es c]|| [b c d c][b c b g]|| @@ -286,14 +306,18 @@ fagotto1 = \notes \relative c { R1| g,4-. g-. r2| as4-. bes-. r2| - c4-"dim." r d r| + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + c4\> r d r| R1| - c,4\p r r2| + \!c,4\p r r2| R1| g4 r r2| R1| c4\pp r r2| - r r4 g\p-"\ \ \ sempre pi\\`u piano"~| + \property Voice.decrescendoText = "sempre pi\\`u piano" + \property Voice.decrescendoSpanner = "" + r r4 g\p\>~| g1~| g~| g~| @@ -303,7 +327,7 @@ fagotto1 = \notes \relative c { g~| g~| g~| - g\>~| + \!g\>~| g~| g| \!c4\pp r r2| diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index f8e0f33607..fc958dd74a 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -43,32 +43,40 @@ fagotto2 = \notes \relative c { )d4 r r2| R1*9| \clef "tenor"; - g''2.(as4 \p-"\ \ \ cresc."|| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + g''2.(as4 \p\<|| g f d)bes|| \clef "bass"; - g2\ff f| + \!g2\ff f| e c~| c1\p~| c~| c~| c~| - c-"cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c\<~| c| - c2\ff g'| + \!c2\ff g'| fis d| - g,4 \p-"\ \ \ cresc." r r r8 g(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + g,4 \p\< r r r8 g(| )c4 r r r8 c(| - )b1\sf\>| + \!)b1\sf\>| \!c4\p r4 r2| R1*2| r4 r8 fis\pp fis4. fis8| r4 r8 fis fis4. fis8| - r4 r8 g-"cresc." g4. g8| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r4 r8 g\< g4. g8| r4 r8 g g4. g8| r4 r8 a a4. a8| r4 r8 bes bes4. bes8| - c2.\ff()bes4| + \!c2.\ff()bes4| a(g a)g| c2.()bes4| a(g a)g| @@ -122,7 +130,9 @@ fagotto2 = \notes \relative c { e| f| g| - as-"cresc."| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + as\<| g| as| a| @@ -130,7 +140,7 @@ fagotto2 = \notes \relative c { c| %a deux| - des2\p( c|| + \!des2\p( c|| bes as|| ges f|| )es as,|| @@ -181,21 +191,25 @@ fagotto2 = \notes \relative c { g~| g~| g~| - g-"cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + g\<~| g~| g~| g~| g~| g| - e'2\ff d| + \!e'2\ff d| cis a~| a1\p~| a~| a~| a~| - a-"cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + a\<~| a| - f'2\ff e| + \!f'2\ff e| dis b~| b1\p| a\<| @@ -205,13 +219,15 @@ fagotto2 = \notes \relative c { R1*3| r4 r8 b'' b4. b8| r4 r8 b b4. b8| - r4 r8 c-"cresc." c4. c8| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r4 r8 c\< c4. c8| r4 r8 c c4. c8| \clef "tenor"; r4 r8 d d4. d8| r4 r8 es es4. es8| \clef "bass"; - f,2.\ff()es4| + \!f,2.\ff()es4| d(c d)c| f2.\ff()es4| d(c d)c| @@ -253,11 +269,13 @@ fagotto2 = \notes \relative c { g\p| bes\f| %a deux| - as4.\p-"\ \ \ cresc." as8 g4. g8| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + as4.\p\< as8 g4. g8| f4. f8 es4. es8| as4. as8 g4. g8| f4. f8 es4. es8| - f4.\sf f8 f2\sf| + \!f4.\sf f8 f2\sf| r4 r8 f f2\sf| r4 r8 g g2\sf| r4 r8 g g2\sf| @@ -266,7 +284,7 @@ fagotto2 = \notes \relative c { % a deux| %% 270 copied from cello || - [c,8-"sempre\ \ \ \ \ \ \ "\ff b c d][es\ff d es c]||| + [c,8-"sempre"\ff b c d][es\ff d es c]||| [b c d c][b c b g]||| [c8 b c d][es d es c]||| [b c d c][b c b g]||| @@ -289,10 +307,12 @@ fagotto2 = \notes \relative c { R1| es,4-. e-. r2| f4-. g-. r2| - as4-"dim." r b r| + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + as4\> r b r| R1| %a deux| - c,4\p r r2| + \!c,4\p r r2| R1| g4 r r2| R1| diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index cc078a5348..b364324e80 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -17,6 +17,6 @@ copyright = "public domain"; \score{ \$flauti_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index 127427a2f9..efd4afb595 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -21,8 +21,10 @@ $flauti_staff = \context Staff = flauti < %\notes \context Voice=flauti < \notes \context Staff=flauti < \global - \$flauto1 - \$flauto2 + \context VoiceOne=flautoi + \$flauto1 + \context VoiceTwo=flautoii + \$flauto2 > > diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 950efe9c5b..484f5e1337 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -20,18 +20,24 @@ flauto1 = \notes \relative c { g4-. r r2 | b,4-. r r2 | R1 *4 | - r2 g'\p_"\ \ \ cresc." ( | - )fis2. g4-.\f | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r2 g'\p\< ( | + )fis2. \!g4-.\f | R1*5 | - r2 f\p_"\ \ \ cresc." ~ | - f4 e-.\f r2 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r2 f\p\< ~ | + f4 \!e-.\f r2 | R1 | f2()es | - d1-"cresc." | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + d1\< | d1 | d2 d2 | d2 d2 | - f1\ff ~| + \!f1\ff ~| f4(es des)c | b4. r8 c4. r8 | d4. r8 es4. r8 | @@ -57,23 +63,29 @@ flauto1 = \notes \relative c { c~| c~| c~| - c-"cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c\<~| c~| - c2\ff es| + \!c2\ff es| d1~| - d\p-"\ \ \ cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + d\p\<~| d~| d2.()f4| f(es2)d4| d(c2)bes4| bes(a bes)g| - fis\pp r r2| + \!fis\pp r r2| r2 r4 r8 a| bes4 r r2| - r r4 r8 bes-"cresc."| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r r4 r8 bes\<| c4 r r r8 c | d4 r r r8 d| - es2.\ff()d4| + \!es2.\ff()d4| fis(g fis)g| es2.()d4| fis(g fis)g| @@ -115,7 +127,9 @@ flauto1 = \notes \relative c { r4 r8 f' es4 r8 bes| c4 r r2| R1*2| - r4 r8 ges'-"cresc." f4 r8 c| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "" + r4 r8 ges'\< f4 r8 c| des4 r r2| R1*5| f4 r r r8 es| @@ -129,7 +143,7 @@ flauto1 = \notes \relative c { f4 r8 f e4 r8 e| f4 r r2| R1| - des4-.\ff r r2| + \!des4-.\ff r r2| R1*3| d2\sf r| d2\sf r| @@ -148,14 +162,18 @@ flauto1 = \notes \relative c { )d2. es4\sf(| )d r r2| R1*9| - e2.\p-"\ \ \ cresc."(f4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + e2.\p\<(f4| e d b )g| - g2\ff bes| + \!g2\ff bes| a1~a4\p r r2| R1*3| - a1-"cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + a1\<~| a| - a2\ff c| + \!a2\ff c| b a| g2.\p( a4| g fis dis )b| @@ -195,10 +213,12 @@ flauto1 = \notes \relative c { c r8 f8 es4 r8 bes| as4-. des4-. r2| R1*11| - es2.\p-"\ \ \ cresc."(f4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + es2.\p\<(f4| es d b)g| g1| - as\f~| + \!as\f~| as\p| bes\f~| bes\p| @@ -213,7 +233,7 @@ flauto1 = \notes \relative c { c~| c| d| - es4.-"sempre\ \ \ \ \ \ \ "\ff b8 c4. as8| + es4.-"sempre"\ff b8 c4. as8| g4. as8 g4. f'8| es4. b8 c4. as8| g4. as8 g4. f'8| @@ -233,9 +253,11 @@ flauto1 = \notes \relative c { R1| c4-. c4-. r2| c4-. c4-. r2| - c4-"dim." r d r| + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + c4\> r d r| R1| - es4\p r r2| + \!es4\p r r2| R1| d,4 r r2| R1| diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index 517034177c..d4cc025a6d 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -129,18 +129,20 @@ flauto2 = \notes \relative c { bes\f~| bes\p| c1\f~| - c\p-"\ \ \ cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c\p\<~| c~| c~| c~| - c\ff~| + \!c\ff~| c~| c~| c~| c| d| %a deux urg: copied flauto-1(270,277)| - es4.-"sempre\ \ \ \ \ \ \ "\ff b8 c4. as8|| + es4.-"sempre"\ff b8 c4. as8|| g4. as8 g4. f'8|| es4. b8 c4. as8|| g4. as8 g4. f'8|| @@ -162,9 +164,11 @@ flauto2 = \notes \relative c { R1| c4-. g'-. r2| as4-. e-. r2| - f4-"dim." r f r| + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + f4\> r f r| R1| - es4\p r r2| + \!es4\p r r2| R1| b4 r r2| R1| diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index de4cef9e0b..6a08addc60 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -20,18 +20,24 @@ oboe1 = \notes \relative c'' { g4-. r r2 | g4-. r r2 | R1 *4 | - as2\p-"\ \ \ cresc." ( g | - )fis2. g4-.\f | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + as2\p\< ( g | + )fis2. \!g4-.\f | R1*5 | - ges2\p-"\ \ \ cresc." f ~ | - f4 e\f r2 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + ges2\p\< f ~ | + f4 \!e\f r2 | R1 | f2\p()es | - d1-"cresc." | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + d1\< | d | d2 d | d d | - f1\ff ~| + \!f1\ff ~| f4(es des)c| f4. r8 es4. r8| g4. r8 g4. r8| @@ -49,29 +55,37 @@ oboe1 = \notes \relative c'' { )f2. ges4(| )f4 r r2| R1*9| - g2.\p-"\ \ \ cresc."( as4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + g2.\p\<( as4| g f d)bes| - bes'2\ff des| + \!bes'2\ff des| c bes| as4\p r r2| R1*3| - as2.\p-"\ \ \ cresc."( bes4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + as2.\p\<( bes4| as g e)c| - c'2\ff es,| + \!c'2\ff es,| d1~| - d\p-"\ \ \ cresc." ~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + d\p\< ~| d~| - d2.\sf\>()f4| + \!d2.\sf\>()f4| \!f\p( es2)d4| d(c2)bes4| bes(a bes)g| fis\pp r r2| r r4 r8 fis' | g4 r r2| - r r4 r8 g-"cresc."| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r r4 r8 g\<| a4 r r r8 a| bes4 r r r8 bes| - fis2.\ff()g4| + \!fis2.\ff()g4| fis(g fis)g| fis2.()g4| fis(g fis)g| @@ -113,11 +127,13 @@ oboe1 = \notes \relative c'' { des4 r r r8 c| bes4 r8 es f4 r8 f| g4 r8 g e4 r 8 e| - c'1\p-"\ \ \ cresc." ~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c'1\p\< ~| c~| c~| c| - c4\ff r8 c c4 r8 c| + \!c4\ff r8 c c4 r8 c| c4 r8 c c4 r8 c| c4 r8 c c4 r8 c| des4 r8 des c4 r8 c| @@ -142,20 +158,24 @@ oboe1 = \notes \relative c'' { )g2. fis4\sf(| )g4 r r2| R1*5| - e2.\p-"\ \ \ cresc." (f4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + e2.\p\< (f4| e d b)g| - g'2.(a4g2)f| + g'2.(a4 g2)f| e2.( f4| e d b)g| - g'2\ff bes| + \!g'2\ff bes| a1~| a\p~| a~| a~| a| - f2.-"cresc."( g4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + f2.\<( g4| f e cis)a| - a'2\ff c| + \!a'2\ff c| b1\p~| b~| b~| @@ -167,11 +187,13 @@ oboe1 = \notes \relative c'' { es(d es)c| b r r2| r r4 r8 d| - es4-"cresc." r r2| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + es4\< r r2| r r4 r8 es| f4 r r r8 f| g4 r r r8 g| - as2.\ff()g4| + \!as2.\ff()g4| f(es f)es| as2.\ff()g4| f(es f)es| @@ -202,25 +224,29 @@ oboe1 = \notes \relative c'' { es d b)g| g'2.(as4| g2)f| - es2.-"cresc."( f4| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + es2.\<( f4| es d b)g| c1| - es\f| + \!es\f| f\p| f\f| g\p| g\f| - c\p-"\ \ \ cresc."~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c\p\<~| c~| c~| c~| - c\ff~| + \!c\ff~| c~| c~| c~| c| d| - es,4.-"sempre\ \ \ \ \ \ \ "\ff b8 c4. as8| + es,4.-"sempre"\ff b8 c4. as8| g4. as8 g4. f'8| es4. b8 c4. as8| g4. as8 g4. f'8| @@ -232,7 +258,7 @@ oboe1 = \notes \relative c'' { R1| c,1~| c| - b'4 r r2| + b'4-. r r2| R1| c,1~| c| diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index 5ab784437f..dc32f60845 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -76,20 +76,24 @@ oboe2 = \notes \relative c{ bes4 r8 bes bes4 r8 bes| bes4\p r r2| R1*15| - r4 r8 as'-"cresc." ges4 r8 des| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r4 r8 as'\< ges4 r8 des| es4 r8 bes' as4 r8 es| f4 r r2| R1*3| %a deux; urg copied ...| - f4\f r r r8 es| + \!f4\f r r r8 es| des4 r r r8 c| bes4 r8 bes bes4 r8 bes| bes4 r8 bes bes4 r8 bes| - c1\p-"\ \ \ cresc." ~|| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c1\p\< ~|| c~| c~| c| - c4\ff r8 c c4 r8 c| + \!c4\ff r8 c c4 r8 c| c4 r8 c c4 r8 c| c4 r8 c c4 r8 c| des4 r8 des c4 r8 c| @@ -148,18 +152,20 @@ oboe2 = \notes \relative c{ d\f| es\p| e\f| - c\p-"\ \ \ cresc." ~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c\p\< ~| c~| c~| c~| - c\ff~| + \!c\ff~| c~| c~| c~| c| d| %a deux; urg: copied oboe-1(270,274:1)| - es4.-"sempre\ \ \ \ \ \ \ "\ff b8 c4. as8|| + es4.-"sempre"\ff b8 c4. as8|| g4. as8 g4. f'8|| es4. b8 c4. as8|| g4. as8 g4. f'8|| @@ -171,7 +177,7 @@ oboe2 = \notes \relative c{ R1| c,1~| c| - d'4 r r2| + d'4-. r r2| R1| c,1~| c| @@ -179,9 +185,11 @@ oboe2 = \notes \relative c{ R1| c4-. c-. r2| c4-. c-. r2| - c4-"dim." r d r| + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + c4\> r d r| R1| - c4\p r r2| + \!c4\p r r2| R1| b4 r r2| R1| diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index 3d2d699320..7cdaf531c7 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -17,6 +17,6 @@ copyright = "public domain"; \score{ \$oboi_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 1b8d63c1a0..e85361f99f 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -21,8 +21,10 @@ $oboi_staff = \context Staff = oboi < %\notes \context Voice=oboi < \notes \context Staff=oboi < \global - \$oboe1 - \$oboe2 + \context VoiceOne=oboei + \$oboe1 + \context VoiceTwo=oboeii + \$oboe2 > > diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly index 3fe5a4dd84..4c853c9567 100644 --- a/mutopia/Coriolan/timpani-part.ly +++ b/mutopia/Coriolan/timpani-part.ly @@ -15,6 +15,6 @@ copyright = "public domain"; \score{ \$timpani_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 17781ef51d..03d9158132 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -26,11 +26,13 @@ timpani = \notes \relative c { R1*6 | r4 c-.\f r2 | R1*2 | - r2 c4-.\p-"\ \ \ cresc." r | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r2 c4-.\p\< r | r2 c4-. r | r2 c4-. r | c r c r | - c1\ff-\trill | + \!c1\ff-\trill | c8 r g r g r g r| g4 r g r| g r c r | @@ -70,6 +72,7 @@ timpani = \notes \relative c { g1\trill~| g| g4 r8 g g4 r8 g| + g4 r8 g g4 r8 g| g4\p r r2| R1*24| c4\f r8 c c4 r8 c| @@ -114,7 +117,7 @@ timpani = \notes \relative c { c4 r r2| c4 r r2| g4 r r2| - c4-"sempre\ \ \ \ \ \ \ "\ff r c r| + c4-"sempre"\ff r c r| g r r2| c4 r c r| g r r2| @@ -130,9 +133,11 @@ timpani = \notes \relative c { R1| c4-. c-. r2| c4-. c-. r2| - c4-"dim." r g r| + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + c4\> r g r| R1| - c4\p r r2| + \!c4\p r r2| R1| g4 r r2| R1| @@ -148,7 +153,8 @@ $timpani_staff = \context Staff = timpani < \notes< % \global \time 4/4; - \$timpani + \context VoiceOne=timpani + \$timpani > > diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index 049cdb74fb..0a6dd05dda 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -16,6 +16,6 @@ copyright = "public domain"; \score{ \$trombe_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index dbe06e3a03..64ce71f818 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -22,8 +22,10 @@ $trombe_staff = \context Staff = trombe < \notes \context Staff=trombe < % \global \time 4/4; - \$trombo1 - \$trombo2 + \context VoiceOne=tromboi + \$trombo1 + \context VoiceTwo=tromboii + \$trombo2 > > diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 948dea353a..d4b5b418b3 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -24,11 +24,13 @@ trombo1 = \notes \relative c { R1*6 | r4 c-.\f r2 | R1*2 | - r2 c4\p-"\ \ \ cresc." r | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r2 c4\p\< r | r2 c4 r | r2 c4 r | c r c r | - c1\ff ~ | + \!c1\ff ~ | c8 r g r g r g r| g4. r8 g4. r8| g4. r8 c4. r8| @@ -114,17 +116,19 @@ trombo1 = \notes \relative c { c4 r r2| R1*18| e1\f(| - )c\p-"\ \ \ cresc." ~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + )c\p\< ~| c~| c~| c~| - c4.\ff c8 c2~| + \!c4.\ff c8 c2~| c4. c8 c2~| c4. c8 c2~| c4. c8 c2~| c4. c8 c2| r4 r8 d d2| - c4-"sempre\ \ \ \ \ \ \ "\ff r c r| + c4-"sempre"\ff r c r| g r r2| c4 r c r| g r r2| @@ -145,9 +149,11 @@ trombo1 = \notes \relative c { R1| c4-. c-. r2| c4-. c-. r2| - c4-"dim." r g r| + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + c4\> r g r| R1| - g4\p r r2| + \!g4\p r r2| R1 | g4 r r2| R1 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 2ace138db3..8f2be3458a 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -24,11 +24,13 @@ trombo2 = \notes \relative c { R1*6 | r4 c-.\f r2 | R1*2 | - r2 c4\p_"\ \ \ cresc." r | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r2 c4\p\< r | r2 c4 r | r2 c4 r | c r c r | - c1\ff ~ | + \!c1\ff ~ | c8 r g r g r g r| g4. r8 g4. r8| g4. r8 c4. r8| @@ -114,17 +116,19 @@ trombo2 = \notes \relative c { c4 r r2| R1*18| c1\f~| - c\p-"\ \ \ cresc." ~| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c\p\< ~| c~| c~| c~| - c4.\ff c8 c2~| + \!c4.\ff c8 c2~| c4. c8 c2~| c4. c8 c2~| c4. c8 c2~| c4. c8 c2| r4 r8 g'8 g2| - c,4-"sempre\ \ \ \ \ \ \ "\ff r c r|| + c,4-"sempre"\ff r c r|| g r r2| c4 r c r| g r r2| @@ -145,9 +149,11 @@ trombo2 = \notes \relative c { R1| c,4-. c-. r2| c4-. c-. r2| - c4-"dim." r g r| + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + c4\> r g r| R1| - g4\p r r2| + \!g4\p r r2| R1| g4 r r2| R1| diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index df9beb070d..8ce909a15f 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -10,37 +10,60 @@ copyright = "public domain"; \version "1.3.4"; viola1 = \notes \relative c { - c'1\ff ~ | c | f,4-. r r2 | r1 | + c'1\ff ~ | + c | + f,4-. r r2 | + r1 | % copied 3 bars from three back... %5 - c'1 ~ | c | f,4-. r r2 | r1 | - c'1 ~ | c | fis,4-. r r2 | r1 | - g'4-. r r2 | g4-. r r2 | + c'1 ~ | + c | + f,4-. r r2 | + r1 | + c'1 ~ | + c | + fis,4-. r r2 | + r1 | + g'4-. r r2 | + g4-. r r2 | % copied from violino-1... %15 [c,,8-.\p es-.] [es()d] [d-. g-.] g4-"ten." | [c,8-. es-.] [es()d] [d-. g-.] g4-"ten." | [c,8-. es-.] [es()d] [d-. as'-.] [as()g] | [g8-. c-.] [c()b] [b-. f'-.] [f()es] | - es4.-"cresc." es8 d4. d8 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + es4.\< es8 d4. d8 | %20 - c4. c8 b4\f r4 | + c4. c8 \!b4\f r4 | R1 | r4 [des,8\p()c][c-. f-.]f4-"ten." | r4 [des8\p()c][c-. f-.]f4-"ten." | r4 [des8\p()c][c-. ges'-.][ges()f] | %25 - [f-. bes-.][bes()a][a-. es'-.][es()des] | des4.-"cresc." des8 c4. c8 | - bes4 bes4-.\f r2 | + [f-. bes-.][bes()a][a-. es'-.][es()des] | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + des4.\< des8 c4. c8 | + bes4 \!bes4-.\f r2 | R1 % same rhythm as violins... - r8 c-.\p c4. c8-. c4~ | [c8-"cresc." c-.]c2.~ | + r8 c-.\p c4. c8-. c4~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [c8\< c-.]c2.~ | %30 - [c8 c-.]c2.~ | [c8 c-.] c4. c8-. c4~ | [c8 c-.] c4. c8-. c4 | - [c16\ff c c c][c c c c]c2:16 | - %35 + [c8 c-.]c2.~ | + [c8 c-.] c4. c8-. c4~ | + [c8 c-.] c4. c8-. c4 | + [\!c16\ff c c c][c c c c]c2:16 | + %35 [c16 c c c][bes bes bes bes][as as as as][g g g g] | - g2:16 g: | g: g: | c: c: | e: f: | + g2:16 g: | + g: g: | + c: c: | + e: f: | %40 c2\sf [c,8-. es-.][es()d] | c'2\sf [c,8-. es-.][es()d] | @@ -56,43 +79,76 @@ viola1 = \notes \relative c { %50 bes4 r r2 | R1 | - es,4\p r r r8 es(|)as4 r r r8 as (|)g4 r r r8 g(| + es,4\p r r r8 es(| + )as4 r r r8 as (| + )g4 r r r8 g(| %55 - )d4 r r r8 d(|)es4 r-"cresc." r r8 es(|)as4 r r r8 as(| - )g4 r r r8 g(|)d4 r r r8 d(| + )d4 r r r8 d(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + )es4 r\< r r8 es(| + )as4 r r r8 as(| + )g4 r r r8 g(| + )d4 r r r8 d(| %60 - )es4 r r r8 es(|)as4 r r r8 as | bes2:16 as: | g: e: | - f4\p r r r8 f(| + )es4 r r r8 es(| + )as4 r r r8 as | + bes2:16 as: | + g: e: | + \!f4\p r r r8 f(| %65 - )bes4 r r r8 bes(|)as4 r r r8 as(|)e4 r r r8 e(| - )f4-"cresc." r r r8 f(|)bes4 r r r8 bes | + )bes4 r r r8 bes(| + )as4 r r r8 as(| + )e4 r r r8 e(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + )f4\< r r r8 f(| + )bes4 r r r8 bes | %70 - c2:\ff bes: | a: fis: | g4\p-"cresc." r r r8 g(|)c,4 r r r8 c | - [f8\sf(\>as f as][f g d)\!g] | + \!c2:\ff bes: | + a: fis: | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + g4\p\< r r r8 g(| + )c,4 r r r8 c | + [\!f8\sf(\>as f as][f g d)\!g] | %75 - r [es'\p(c)es] r [d(bes)d] | r [c(g)c] r [bes(g)bes] | + r [es'\p(c)es] r [d(bes)d] | + r [c(g)c] r [bes(g)bes] | r [as(g)as] r [bes(g)bes] | [d,-.\pp d'-.] es4. es8-. d4 ~ | [d8 d-.] es4. es8-. d4 ~ | %80 - [d8-"cresc." d-.] es4. es8-. d4 ~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [d8\< d-.] es4. es8-. d4 ~ | [d8 d-.] es4. es8-. d4 ~ | [d8 d-.] es4. es8-. d4 ~ | [d8 d-.] es4. es8-. d4 (| - )fis,2:\ff fis4: g: | + \!)fis,2:\ff fis4: g: | %85 - d2: d: | fis: fis4: g: | c,: d: c: d: | b2: b4: c: | f': es: f: es: | + d2: d: | + fis: fis4: g: | + c,: d: c: d: | + b2: b4: c: | + f': es: f: es: | %90 - b2: b4: c: | d: c: d: c: | + b2: b4: c: | + d: c: d: c: | c,4 r8 c' c4\sf()des | - r r8 c c4\sf()des | - r r8 c c4\sf()des | - r r8 c c4\sf()des | + r r8 c c4\sf()des | + + r r8 c c4\sf()des | + + r r8 c c4\sf()des | + [c16 es es es]es4:[es16 fis fis fis]fis4: | [b,16 d d d]d4:[bes16 e e e]e4: | - [as,16 c c c ]c4:[g16 c c c]c4: | [a16 c c c]c4:[g16 c c c]c4: | + [as,16 c c c ]c4:[g16 c c c]c4: | + [a16 c c c]c4:[g16 c c c]c4: | %100 - [c8 d,]d4. es8-. es4 ~ | [es8 c-.]c4. d8-. d4 | + [c8 d,]d4. es8-. es4 ~ | + [es8 c-.]c4. d8-. d4 | % shared with cello from here on; % except for some abbrevs below... [g8\p bes cis d][es d bes g]| @@ -109,29 +165,43 @@ viola1 = \notes \relative c { [g,16 g bes bes][d d es es][f, f a a][cis cis d d] | [es,8: g: b: c!:][d,: f: a: bes:] | [c,: es: g: a:][cis,: e: g: bes:] | - [d,: g: bes: d:][d,: fis: a: d:] | d2: d: + [d,: g: bes: d:][d,: fis: a: d:] | + d2: d: %115 - | d: d: | d: d: | d: d: | + | + d: d: | + d: d: | + d: d: | % urg, 2 copied from 102 [g,8\p bes cis d][es d bes g]| [fis a cis d][es d a fis] | %120 - [g bes c des][c des bes g]|[f as c des][c des as f]| - [e g b c][b c g e]|[f as b c][b c as f]| + [g bes c des][c des bes g]| + [f as c des][c des as f]| + [e g b c][b c g e]| + [f as b c][b c as f]| [e g b c][b c g e]| %125 - [c e fis g][fis g e c]|[f as b c][des c as f]| - [e g b c][des c g e]|[f as c des][c des as f]| - [g bes d es][d es bes g]|[as-"cresc." c d es][f es c as]| + [c e fis g][fis g e c]| + [f as b c][des c as f]| + [e g b c][des c g e]| + [f as c des][c des as f]| + [g bes d es][d es bes g]| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [as\< c d es][f es c as]| %131 [g bes d es][f es bes g]| % shared with cellos until here % shared with violino-2 from here on - [as as c es][f es c as]|[a c es f][ges f c a]| + [as as c es][f es c as]| + [a c es f][ges f c a]| [bes des f ges][as ges des bes]| %135 - [c es g as][bes as es c]|[des\p f a bes][c, es g as]| - [bes, des f ges][as, c e f]|[ges, bes d es][f, as c des]| + [c es g as][bes as es c]| + [\!des\p f a bes][c, es g as]| + [bes, des f ges][as, c e f]| + [ges, bes d es][f, as c des]| [es, ges bes des][as c es as,]| %140 % shared with cello from here on; @@ -141,7 +211,10 @@ viola1 = \notes \relative c { [g,: bes: c: des:][f,: bes: c: des:]| [e,: g: bes: des:][c,: e: g: c:]| %shared with cello from here on - [f,8\p-"cresc." as c des][es, g b c]|[des, f a bes][c, es g as]| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [f,8\p\< as c des][es, g b c]| + [des, f a bes][c, es g as]| % uhuh, still 'same as cello'; % but now rests for notes that viola cannot reach... %145 @@ -151,19 +224,26 @@ viola1 = \notes \relative c { r[bes des, f][c e g c]| % cello has eight notes; % viola has rest where can't reach - [f,:\ff as: c: des:][es,: g: b: c:]|[des,: f: a: bes:][c,: es: g: as:]| + [\!f,:\ff as: c: des:][es,: g: b: c:]| + [des,: f: a: bes:][c,: es: g: as:]| %150 r[des,16 des][e e g g]r8[c,16 c][e e f f]| r8[des16 des][f f g g][c, c e e][g g c c]| - f,1\ff ~ | f | f'4 r r2 + f,1\ff ~ | + f | + f'4 r r2 R1 %155 - f,1 ~ | f | d'2\sf [g,8-. bes-.][bes()as] | + f,1 ~ | + f | + d'2\sf [g,8-. bes-.][bes()as] | + es'2\sf [g,8-. bes-.][bes()as] | % ugh, should be quoted and transposed... %160 [f8-.\p as-.][as()f][g-. c-.][c()b] | - R1*2 | + R1*2 | + g2\ff [es8-. g-.][g()f] | g2\sf [es8-. g-.][g()f] | %165 @@ -173,19 +253,24 @@ viola1 = \notes \relative c { r4 [e8-. g-.][g()f] r4 | %170 r4 [e8-. g-.][g()f] r4 | - r4 [e8-. g-.][g()f][fis-.fis-.] | + r4 [e8-. g-.][g()f][fis-.fis-.] | + g4 [fis8-.as-.][as()g] r4 | r4 [fis8-.as-.][as()g] r4 | r4 [fis8-.as-.][as()g] r4 | %175 - r4 [fis8-.as-.][as()g] c4\sf(|)b r r2 | R1 + r4 [fis8-.as-.][as()g] c4\sf(| + )b r r2 | + R1 % ugh, should be quoted and transposed c4\p r r r8 c8(| )f4 r r r8 f8(| %180 )e4 r r r8 e8(| )b'4 r r r8 b8(| - )c4 r-"cresc." r r8 c,8(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + )c4 r\< r r8 c,8(| % copied )f4 r r r8 f8(| )e4 r r r8 e8(| @@ -193,17 +278,22 @@ viola1 = \notes \relative c { )b'4 r r r8 b8(| )c4 r r r8 c,8(| )f4 r r r8 f8| - g2:16\ff f: | e: cis: | + \!g2:16\ff f: | + e: cis: | %190 c,4\p r r r8 c8(| )g'4 r r r8 g8(| )f4 r r r8 f8(| - )cis4-"cresc." r r r8 cis8(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + )cis4\< r r r8 cis8(| )d4 r r r8 d8(| %195 )g4 r r r8 g8| % check - [a16\ff a' a a]a4: a2: | fis: dis: | + [\!a16\ff a' a a]a4: a2: | + fis: dis: | + e,4\p r r r8 e8(| )a4\< r r r8 a8(| %200 @@ -217,16 +307,26 @@ viola1 = \notes \relative c { r[c\p(as)c]r[c(a)c] | [b-. g'-.] as4. as8-. g4 ~ | [g8 g-.] as4. as8-. g4 ~ | - [g8 g-.-"cresc."] as4. as8-. g4 ~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [g8 g-.\<] as4. as8-. g4 ~ | [g8 g-.] as4. as8-. g4 ~ | %210 [g8 g-.] as4. as8-. g4 ~ | [g8 g-.] as4. as8-. g4 (| - )b,2:16\ff b4: c: | g'2: g: | + \!)b,2:16\ff b4: c: | + g'2: g: | + %214 - b,2:16\ff b4: c: | g'2: g: | - e2:16\ff e4: f: | b,: c: b: c: | - e2:16\ff e4: f: | b,: c: b: c: | + b,2:16\ff b4: c: | + g'2: g: | + + e2:16\ff e4: f: | + b,: c: b: c: | + + e2:16\ff e4: f: | + b,: c: b: c: | + %220 r4 r8 es8 es4\sf()fes | r4 r8 es8 es4\sf()fes | @@ -241,27 +341,40 @@ viola1 = \notes \relative c { [g8 g]g4. as8 as4 ~ | [as8 as]f4. f8 g4 | %230 - c\p r r2 | r r4 r8 b\f | - c4 r r2 | r r4 r8 b\f | c4 r r2 | + c\p r r2 | + r r4 r8 b\f | + c4 r r2 | + r r4 r8 b\f | + c4 r r2 | R1*3 | [c,16c es es][g g as as][bes bes d d][fis fis g g] | [as, as c c][e e f f][g, g bes bes][d d es es] | %240 f,4 r r2 | R1*11 | - c'4\p-"cresc." r r r8 c8(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c'4\p\< r r r8 c8(| % check slur and oct - )f4 r r r8 f8 | % f,8 (| - es1 | + )f4 r r r8 f8 | + % f,8 (| + es1 | + %255 - ges\f | f\p | as\f | g\p - e2:16\f e: | + \!ges\f | + f\p | + as\f | + g\p + e2:16\f e: | + %260 - [as,8\p-"cresc." f']f4. es8 es4 ~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [as,8\p\< f']f4. es8 es4 ~ | [es8 as]as4. g8 g4 ~ | [g8 f]f4. es8 es4 ~ | [es8 as]as4. g8 g4 | - r r8 d\ff es4.\sf()d8 | + r r8 \!d\ff es4.\sf()d8 | %265 r4 r8 d es4.\sf()d8 | r4 r8 e f4.\sf()e8 | @@ -269,17 +382,38 @@ viola1 = \notes \relative c { r4 r8 e g4.\sf()f8 | r4 r8 f as4.\sf()g8 | %270 - g2:16-"sempre" g:\ff | g: g: | g: g: | g: g: | + g2:16-"sempre" g:\ff | + g: g: | + g: g: | + g: g: | [g8 b, c g][c b c g] | %275 [c b c g][c b c g] | - c,1 ~ | c | f4-. r r2 | R1 | - c1 ~ | c | f4-. r r2 | R1 | - c1 ~ | c | fis4-. f-. r2 | R1 | - es4-. e-. r2 | f4-. g-. r2 | + c,1 ~ | + c | + f4-. r r2 | + R1 | + c1 ~ | + c | + f4-. r r2 | + R1 | + c1 ~ | + c | + fis4-. f-. r2 | + R1 | + es4-. e-. r2 | + f4-. g-. r2 | %290 - as4-"dim." r g r | R1 | c4\p r r2 | R1 | - g4-"pizz." r r2 | R1 | c,4 r r2 | R1*15 | + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + as4\> r g r | + R1 | + \!c4\p r r2 | + R1 | + g4-"pizz." r r2 | + R1 | + c,4 r r2 | + R1*15 | c4\pp r r2 | c4 r r2 | c4 r r2 | diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index 420f81239e..e2dd6f56d3 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -16,19 +16,31 @@ viola2 = \notes \relative c { \context Thread \translator Staff=violai \translator Voice=one - c1 ~ | c | s1*2 | + c1 ~ | + c | + s1*2 | % copied 3 bars from three back... - c ~ | c | s1*2 % | + c ~ | + c | + s1*2 % | % \translator Staff=viola - c ~ | c | s1*2 | - g'4-. r r2 | g4-. r r2 | + c ~ | + c | + s1*2 | + g'4-. r r2 | + g4-. r r2 | %15 s1*14 % same as viola-1, octave lower - r8 c,-.\p c4. c8-. c4~ | [c8-"cresc." c-.]c2.~ | - [c8 c-.]c2.~ | [c8 c-.] c4. c8-. c4~ | [c8 c8-.] c4. c8-. c4 | + r8 c,-.\p c4. c8-. c4~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [c8\< c-.]c2.~ | + [c8 c-.]c2.~ | + [c8 c-.] c4. c8-. c4~ | + [c8 c8-.] c4. c8-. c4 | %35 - [as'16\ff as a as][as as as as]as2:16 | + [\!as'16\ff as a as][as as as as]as2:16 | } % $viola2_staff = \context Staff = viola_2 < diff --git a/mutopia/Coriolan/viola-part.ly b/mutopia/Coriolan/viola-part.ly index f7d22fa737..3e8ccbcbef 100644 --- a/mutopia/Coriolan/viola-part.ly +++ b/mutopia/Coriolan/viola-part.ly @@ -18,16 +18,14 @@ $viola_staff = \context GrandStaff = viola < \$viola2_staff > +\include "coriolan-part-paper.ly" + \score{ \$viola_staff - %%\include "coriolan-part-paper.ly" + \include "coriolan-part-paper.ly" \paper{ - castingalgorithm = \Wordwrap; - \translator { \VoiceContext noAutoBeaming = "1"; } \translator { \HaraKiriStaffContext } - % \translator { \ScoreContext skipBars = 1; } - \translator { \OrchestralScoreContext skipBars = 1; } } - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index 8361806520..1a1dc9deaa 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -15,6 +15,6 @@ copyright = "public domain"; \score{ \$violino1_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index 1b482cb822..3938fc528b 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -10,40 +10,65 @@ copyright = "public domain"; \version "1.3.4"; violino1 = \notes \relative c { - c'1\ff ~ | c | r r2 | R1 | - c1 ~ | c | r r2 | R1 | - c1 ~ | c | r r2 | R1 | - r r2 | r r2 | + c'1\ff ~ | + c | + r r2 | + R1 | + c1 ~ | + c | + r r2 | + R1 | + c1 ~ | + c | + r r2 | + R1 | + r r2 | + r r2 | [c8-.\p es-.] [es()d] [d-. g-.] g4-"ten." | [c,8-. es-.] [es()d] [d-. g-.] g4-"ten." | [c,8-. es-.] [es()d] [d-. as'-.] [as()g] | [g8-. c-.] [c()b] [b-. f'-.] [f()es] | - [es8-.-"cresc." as-.] as4. g8-. g4 ~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [es8-.\< as-.] as4. g8-. g4 ~ | %20 - [g8 fis] fis4 ~ fis g-.\f | - R1 | + [g8 fis] fis4 ~ fis \!g-.\f | + R1 | [bes,,!8\p-. des-.][des()c][c-. f-.]f4-"ten." | [bes,!8\p-. des-.][des()c][c-. f-.]f4-"ten." | [bes,!8\p-. des-.][des()c][c-. ges'-.][ges()f] | %25 [f-. bes-.][bes()a][a-. es'-.][es()des]| - [des-.-"cresc." ges-.] ges4. f8-. f4~ | [f8 e-.]e4-.\f r2 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [des-.\< ges-.] ges4. f8-. f4~ | + [f8 e-.]\!e4-.\f r2 | R1 | %29 - r8 f-.\p f4. es8-. es4~ | [es8-"cresc." d-.]d2.~ | - [d8 d-.]d2.~ | [d8 d-.] d4. d8-. d4~ | [d8 d8-.] d4. d8-. d4 | - [f16\ff f f f][f f f f]f2:16 | + r8 f-.\p f4. es8-. es4~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [es8\< d-.]d2.~ | + [d8 d-.]d2.~ | + [d8 d-.] d4. d8-. d4~ | + [d8 d8-.] d4. d8-. d4 | + [\!f16\ff f f f][f f f f]f2:16 | %35 [f16 f f f][es es es es][des des des des][c c c c] | - b2:16 c: | d!: es: | e: f: | g: as: | + b2:16 c: | + d!: es: | + e: f: | + g: as: | %40 a2\sf [c,,8-. es-.][es()d] | a''2\sf [c,,8-. es-.][es()d] | as''!2\sf [b,,8-. d-.][d()c] | as''2\sf [b,,8-. d-.][d()c] | - g''1\sf | + g''1\sf | + %45 - ges\sf | + ges\sf | + f2. ges4\sf(| )f2. ges4\sf(| )f2. ges4\sf(| @@ -51,26 +76,48 @@ violino1 = \notes \relative c { %50 )f1\>~ | f4 d( bes)\!as | - g2.\p( as4 | g f d ) bes | bes'2.( c4 | + g2.\p( as4 | + g f d ) bes | + bes'2.( c4 | + %55 bes2 )as | - g4 ~ | - ~ | + \property Voice.crescendoText = "cresc." % poco a poco + \property Voice.crescendoSpanner = "dashed-line" + g4 ~ | + ~ | ~ | | %60 - bes'2:16 bes: | bes: bes: | - bes:\ff des: | c: bes: | - as2.\p( bes4 | + bes'2:16 bes: | + bes: bes: | + \!bes:\ff des: | + c: bes: | + as2.\p( bes4 | + %65 - as g e )c | c'2.( des4 | c2 ) bes | - [as16-"cresc." c c c][c c c c] c2:16 | c: c: | + as g e )c | + c'2.( des4 | + c2 ) bes | + + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [as16\< c c c][c c c c] c2:16 | + c: c: | + %70 - c:\ff es: | d: c: | bes2.\p-"cresc."( c4 | bes a fis ) d | - d'\sf\>( as g )\!f | + \!c:\ff es: | + d: c: | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + bes2.\p\<( c4 | + bes a fis ) d | + \!d'\sf\>( as g )\!f | %75 - r8[es\p(c)es]r[d(bes)d] | r[c(g)c]r[bes(g)bes] | - r[a(g)a]r[bes(g)bes]|[fis-.\pp a-.] a4. a8-. a4~| + r8[es\p(c)es]r[d(bes)d] | + r[c(g)c]r[bes(g)bes] | + r[a(g)a]r[bes(g)bes]| + [fis-.\pp a-.] a4. a8-. a4~| [a8 a-.] a4. a8-. a4~| %80 [a8 bes-.] bes4. bes8-. bes4~| @@ -80,12 +127,15 @@ violino1 = \notes \relative c { )es2:16\ff es4: d: | %85 fis: g: fis: g: | - es2: es4: d: | + es2: es4: d: | + fis: g: fis: g: | - as2: as4: g: | + as2: as4: g: | + b: c: b: c: | %90 - as2: as4: g: | + as2: as4: g: | + b: c: b: c: | r8 es as,4\sf~as()g | r8 es' as,4\sf~as()g | @@ -94,65 +144,110 @@ violino1 = \notes \relative c { r8 es' as,4\sf~as()g | r8 es' as,4. fis8 es'4~ | [es8 d] g,4. e8 d'4~ | - [d8 c] f,4. c'8 es,4 ~ | + [d8 c] f,4. c'8 es,4 ~ | + [es8 c'] a4. c8 g4 ~ | %100 - [g8 fis] d,4. es8-. es4~ | + [g8 fis] d,4. es8-. es4~ | + [es8 c-.] c4. d8-. d4 | - g, r8 es'' d4 r8 bes8 | + g, r8 es'' d4 r8 bes8 | + a4 r8 es' d4 r8 a\f | bes4 r8 es8\p d4 r8 bes | %105 - a4 r8 es' d4 r8 a8\f | bes4 r8 es\p d4 r8 a | - g4 r8 c bes4 r8 f | es4 r8 a g4 r8 d | c4 r8 g' fis4 r8 c' | + a4 r8 es' d4 r8 a8\f | + bes4 r8 es\p d4 r8 a | + g4 r8 c bes4 r8 f | + es4 r8 a g4 r8 d | + c4 r8 g' fis4 r8 c' | %110 - bes4\f r8 es' d4 r8 a | - g4 r8 c bes4 r8 f | + bes4\f r8 es' d4 r8 a | + + g4 r8 c bes4 r8 f | + es4 r8 a g4 r8 cis,, | - d4 r8 g' d,4 r8 fis' | - bes,,4. g''8 g2 ~ | + d4 r8 g' d,4 r8 fis' | + + bes,,4. g''8 g2 ~ | + %115 - g4. bes8 bes2 ~ | bes4. g8 g4 r8 bes | bes4 r8 d d4 r8 g | - g4\p r8 es, d4 r8 bes | a4 r8 es' d4 r8 a | + g4. bes8 bes2 ~ | + bes4. g8 g4 r8 bes | + bes4 r8 d d4 r8 g | + + g4\p r8 es, d4 r8 bes | + a4 r8 es' d4 r8 a | + %120 - bes4 r8 es des4 r8 bes | as!4 r8 es' des4 r8 as | g4 r r2 | - r4 r8 es' des4 r8 as | g4 r r2 | + bes4 r8 es des4 r8 bes | + as!4 r8 es' des4 r8 as | + g4 r r2 | + r4 r8 es' des4 r8 as | + g4 r r2 | %125 - r4 r8 c bes4 r8 e, | - as4 r8 des c4 r8 as | + r4 r8 c bes4 r8 e, | + + as4 r8 des c4 r8 as | + g4 r8 des' c4 r8 g | - as4 r8 es' des4 r8 as | + as4 r8 es' des4 r8 as | + bes4 r r2 | %130 - r4 r8 f'8-"cresc." es4 r8 c | bes4 r8 f' es4 r8 bes | - c4 r8 f es4 r8 c | c4 r r2 | r4 r8 as' ges4 r8 des | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r4 r8 f'8\< es4 r8 c | + bes4 r8 f' es4 r8 bes | + c4 r8 f es4 r8 c | + c4 r r2 | + r4 r8 as' ges4 r8 des | %135 - es4 r8 bes' as4 r8 es | f4\p r8 bes as4 r8 es | - des4 r8 ges f4 r8 c | bes4 r8 es des4 r8 as | + es4 r8 bes' as4 r8 es | + \!f4\p r8 bes as4 r8 es | + des4 r8 ges f4 r8 c | + bes4 r8 es des4 r8 as | ges4 r8 des' c4 r8 ges' | %140 - f4\f r8 bes as4 r8 es | des4 r8 ges f4 r8 c | - bes4 r8 e f4 r8 bes, | bes4 r8 g'! es4 r8 bes' | - as4\p r8 des-"cresc." c4 r8 g | + f4\f r8 bes as4 r8 es | + des4 r8 ges f4 r8 c | + bes4 r8 e f4 r8 bes, | + bes4 r8 g'! es4 r8 bes' | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + as4\p r8 des\< c4 r8 g | + %145 - f4 r8 bes as4 r8 es | des4 r8 g f4 r8 c | bes4 r8 f' e4 r8 bes' | - as4\ff r8 des c4 r8 g | f4 r8 bes as4 r8 es | + f4 r8 bes as4 r8 es | + des4 r8 g f4 r8 c | + bes4 r8 f' e4 r8 bes' | + \!as4\ff r8 des c4 r8 g | + f4 r8 bes as4 r8 es | + %150 - des4 r8 g f4 r8 c, | des4 r8 f' c,4 r8 e' | - f,1\ff ~ | f | des''4 r r2 | + des4 r8 g f4 r8 c, | + des4 r8 f' c,4 r8 e' | + + f,1\ff ~ | + f | + des''4 r r2 | %155 R1 | - f,,1 ~ | f | + f,,1 ~ | + f | + [f,8-. as-.][as()g] | [f,8-. as-.][as()g] | %160 [f8-.\p as-.][as()g] [g-. c-.][c()b] | - [b8-. es-.][es()d] [d-. g-.]g4-"ten." | R1 | + [b8-. es-.][es()d] [d-. g-.]g4-"ten." | + R1 | [e,8-. g-.][g()f] | [e,8-. g-.][g()f] | %165 [e-.\p bes'-.][bes()as][g-.des'-.][des()c] | - [bes-. g'-.][g()f][e-. g-.]g4-"ten." | + [bes-. g'-.][g()f][e-. g-.]g4-"ten." | + r2 r4 des'4\ff (| )c2. des4\sf(| )c2. des4\sf(| @@ -164,22 +259,43 @@ violino1 = \notes \relative c { )d2. es4\sf(| %175 )d2. es4\sf(| - )d1\> ~ | d4( b g \!)f - e2.\p( f4 | e d b ) g | + )d1\> ~ | + d4( b g \!)f + e2.\p( f4 | + e d b ) g | %180 - g'2.( a4 | g2 )f | e4 g2-"cresc." g4 ~ | + g'2.( a4 | + g2 )f | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + e4 g2\< g4 ~ | + g g2 g4 ~ | g g2 g4 ~ | %185 g g2 g4 | - [g16 g g g][g g g g]g2:16 | g: g: | g:\ff bes: | a: g: | + [g16 g g g][g g g g]g2:16 | + g: g: | + \!g:\ff bes: | + a: g: | %190 - f2.\p( g4 | f e cis ) a | a'2.( bes4 | a2 ) g | - [f16-"cresc." a a a][a a a a]a2:16 | + f2.\p( g4 | + f e cis ) a | + a'2.( bes4 | + a2 ) g | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [f16\< a a a][a a a a]a2:16 | + %195 - a2 a | a2:16\ff c: | b: a: | g2.\p( a4 | g\< fis dis ) b | + a2 a | + \!a2:16\ff c: | + b: a: | + g2.\p( a4 | + g\< fis dis ) b | %200 - b'1 ~ | \!b + b'1 ~ | + \!b [c8\f\>c,(g)c]r[c(bes)\!c] | r[c\p(as)c]r[c(g)c] | r[c(f,)c']r[c(g)c] | @@ -187,15 +303,21 @@ violino1 = \notes \relative c { r[c(as)c]r[c(a)c] | [b-. d-.]d4. d8-. d4 ~ | [d8-. d-.]d4. d8-. d4 ~ | - [d8-. es-.]es4.-"cresc." es8-. es4 ~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [d8-. es-.]es4.\< es8-. es4 ~ | [es8-. es-.]es4. es8-. es4 ~ | %210 [es8-. f-.]f4. f8-. f4 ~ | [f8-. g-.]g4. g8-. g4 | - as2:16\ff as4: g: | b,: c: b: c: | - as'2:16\ff as4: g: | b,: c: b: c: | - des'2:16\ff des4: c: | e,: f: e: f: | - des'2:16\ff des4: c: | e,: f: e: f: | + \!as2:16\ff as4: g: | + b,: c: b: c: | + as'2:16\ff as4: g: | + b,: c: b: c: | + des'2:16\ff des4: c: | + e,: f: e: f: | + des'2:16\ff des4: c: | + e,: f: e: f: | %220 r8 as des,4\sf ~ des()c | r8 as' des,4\sf ~ des()c | @@ -209,35 +331,57 @@ violino1 = \notes \relative c { [c8 b] g,4. as8 as'4 ~ | [as8 as] f4. f8 g4 | %230 - c,4\p r8 as' g4 r8 es | - d4\p r8 as' g4 r8 d\f | - es4\p r8 as\p g4 r8 es | - d4\p r8 as' g4 r8 d\f | - es4\p r8 as'\p g4 r8 d | + c,4\p r8 as' g4 r8 es | + + d4\p r8 as' g4 r8 d\f | + + es4\p r8 as\p g4 r8 es | + + d4\p r8 as' g4 r8 d\f | + + es4\p r8 as'\p g4 r8 d | + %235 - c4 r8 f es4 r8 bes | - as4 r8 d c4 r8 g | - f4 r8 c' b4 r8 f' | - es4\f r8 as g4 r8 d | - c4\f r8 f es4 r8 bes | + c4 r8 f es4 r8 bes | + + as4 r8 d c4 r8 g | + + f4 r8 c' b4 r8 f' | + + es4\f r8 as g4 r8 d | + + c4\f r8 f es4 r8 bes | + %240 - as4-. des-. r2 | R1*3 | - e2.\p( f4 | e d b ) g | - g'2.( a4 | g2 ) f | + as4-. des-. r2 | + R1*3 | + e2.\p( f4 | + e d b ) g | + g'2.( a4 | + g2 ) f | es4 g2 g4 ~ | g4 g2 g4 ~ | %250 g4 g2 g4 ~ | g4 g2 g4 ~ | - [g16-"cresc." g g g][g g g g]g2:16 | - g: g: | g: g: | as:\f as: | as:\p as: | bes:\f bes: | bes:\p bes: | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [g16\< g g g][g g g g]g2:16 | + g: g: | + g: g: | + \!as:\f as: | + as:\p as: | + bes:\f bes: | + bes:\p bes: | c:\f c: | %260 - r8 c-"cresc." c4. c8 c4 ~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r8 c\< c4. c8 c4 ~ | [c8 c] c4. c8 c4 ~ | [c8 c] c4. c8 c4 ~ | [c8 c] c4. c8 c4 ~ | - c4.\ff ~ | + \!c4.\ff ~ | %265 ~ | ~ | @@ -252,21 +396,57 @@ violino1 = \notes \relative c { es4 r8 b8 c4 r8 b, | %275 c4 r8 b,8 c4 r8 b | - c1 ~ | c | r r2 | R1 - c1 ~ | c | r r2 | R1 - c1 ~ | c | es''4-. b-. r2 | R1 | - c4-. g-. r2 | as4-. e-. r2 | + c1 ~ | + c | + r r2 | + R1 + c1 ~ | + c | + r r2 | + R1 + c1 ~ | + c | + es''4-. b-. r2 | + R1 | + c4-. g-. r2 | + as4-. e-. r2 | + %290 - f4-"dim." r d r | R1 | es!4\p r r2 | R1 | d,4-"pizz." r r2 | + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + f4\> r d r | + R1 | + \!es!4\p r r2 | + R1 | + d,4-"pizz." r r2 | + %295 - R1 | c1^"arco"-"sempre" ~ | c2-"pi\\`u piano" b2 | - c1 ~ | c2 b2 | + R1 | + + \property Voice.decrescendoText = "sempre pi\\`u piano" + \property Voice.decrescendoSpanner = "" + c1^"arco"\> ~ | + c2 b2 | + c1 ~ | + c2 b2 | + %300 - c1 ~ | c | b ~ | b | c ~ | + c1 ~ | + c | + b ~ | + b | + c ~ | + %305 - c | b ~ | b\> ~ | b ~ | \!b | + c | + b ~ | + \!b\> ~ | + b ~ | + b | + %310 - c4\pp r r2 | R1 | + \!c4\pp r r2 | + R1 | c4-"pizz." r r2 | c4 r r2 | c4 r r2 | @@ -278,6 +458,7 @@ $violino1_staff = \context Staff = violino1 < \property Staff.instr = #"Vl. I" \notes< \global - \$violino1 + \context Voice=violinoi + \$violino1 > > diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index 49ce642e33..73ca4ce661 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -15,6 +15,6 @@ copyright = "public domain"; \score{ \$violino2_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index a9c33d5a2c..6134ce7a32 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -10,28 +10,53 @@ copyright = "public domain"; \version "1.3.4"; violino2 = \notes \relative c { - c'1\ff ~ | c | r r2 | R1 | - c1 ~ | c | r r2 | R1 | - c1 ~ | c | r r2 | R1 | + c'1\ff ~ | + c | + r r2 | + R1 | + c1 ~ | + c | + r r2 | + R1 | + c1 ~ | + c | + r r2 | + R1 | %13 - r r2 | r r2 | + r r2 | + r r2 | R1 *3 | r2 [b8-.\p f'-.] [f()es] | - [es8-. as-.] as4.-"cresc." g8-. g4 ~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [es8-. as-.] as4.\< g8-. g4 ~ | %20 - [g8 fis-.] fis4 ~ fis g-.\f | - R1*4 | r2 + [g8 fis-.] fis4 ~ fis \!g-.\f | + R1*4 | + r2 %25 - [a,8-.\p es'-.][es()des] | [des-.-"cresc." ges-.]ges4. f8-. f4~ | - [f8 e-.]e4-.\f r2 | R1 + [a,8-.\p es'-.][es()des] | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [des-.\< ges-.]ges4. f8-. f4~ | + [f8 e-.]\!e4-.\f r2 | + R1 %29 %copied... \transpose c \violino-1(29, 39) - r8 f-.\p f4. es8-. es4~ | [es8-"cresc." d-.]d2.~ | - [d8 d-.]d2.~ | [d8 d-.] d4. d8-. d4~ | [d8 d8-.] d4. d8-. d4 | - [f16\ff f f f][f f f f]f2:16 | + r8 f-.\p f4. es8-. es4~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [es8\< d-.]d2.~ | + [d8 d-.]d2.~ | + [d8 d-.] d4. d8-. d4~ | + [d8 d8-.] d4. d8-. d4 | + [\!f16\ff f f f][f f f f]f2:16 | %35 [f16 f f f][es es es es][des des des des][c c c c] | - b2:16 c: | d!: es: | e: f: | + b2:16 c: | + d!: es: | + e: f: | + | %40 a2\sf [c,8-. es-.][es()d] | @@ -48,22 +73,43 @@ violino2 = \notes \relative c { %50 bes4 r r2 | R1*5 | - g'2.\p-"cresc."( a4 | g f d ) bes | bes'2.( c4 | bes2 )as | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + g'2.\p\<( a4 | + g f d ) bes | + bes'2.( c4 | + bes2 )as | %60 - [g16 bes bes bes][bes bes bes bes]bes2: | + [g16 bes bes bes][bes bes bes bes]bes2: | + %copied... \transpose c, violino-1(61,74) bes: bes: | - bes:\ff des: | c: bes: | - as2.\p( bes4 | + \!bes:\ff des: | + c: bes: | + as2.\p( bes4 | + %65 - as g e )c | c'2.( des4 | c2 ) bes | - [as16-"cresc." c c c][c c c c] c2:16 | c: c: | + as g e )c | + c'2.( des4 | + c2 ) bes | + + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [as16\< c c c][c c c c] c2:16 | + c: c: | + %70 - c:\ff es: | d: c: | bes2.\p-"cresc."( c4 | bes a fis ) d | - d'\sf\>( as g )\!f | + \!c:\ff es: | + d: c: | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + bes2.\p\<( c4 | + bes a fis ) d | + \!d'\sf\>( as g )\!f | %75 % nono, only looks like transpose - r8[c'\p(g)c]r[bes(g)bes] | r[g(es)g]r[g(d)g] | + r8[c'\p(g)c]r[bes(g)bes] | + r[g(es)g]r[g(d)g] | r[g(es)g]r[g(e)g]|r8 fis-.\pp fis4. fis8-. fis4~| % urg, can't copy: \transpose g \violino-1(75,91) % a -> fis @@ -77,11 +123,15 @@ violino2 = \notes \relative c { [g8 a-.] a4. a8-. a4~| [a8 bes-.] bes4. bes8-. bes4| % different - a2:16\ff a4: bes: | c: bes: c: bes: | - a2:16 a4: bes: | c: bes: c: bes: | - b2: b4: c: | f: es: f: es: | + a2:16\ff a4: bes: | + c: bes: c: bes: | + a2:16 a4: bes: | + c: bes: c: bes: | + b2: b4: c: | + f: es: f: es: | %90 - b2: b4: c: | f: es: f: es: | + b2: b4: c: | + f: es: f: es: | % copied: \transpose c, \violino-1(92,95) r8 es as,4\sf~as()g | r8 es' as,4\sf~as()g | @@ -95,124 +145,192 @@ violino2 = \notes \relative c { [c16 a' a a]a4:16[c,16 g' g g]g4:16 | %100 [fis8 d]d4. es8 es4~| - [es8 c-.]c4. d8-. d4 | + [es8 c-.]c4. d8-. d4 | + g,\p r r2 | - r2 r4 r8 | + r2 r4 r8 | + r r2 | %105 - r2 r4 r8 | + r2 r4 r8 | + r r r8 a'\p | g4 r r r8 f | - es4 r r r8 d | - c4 r8 g fis4 r8 c' | + es4 r r r8 d | + + c4 r8 g fis4 r8 c' | + % looks lot like violino-1 110-113 %110 - bes4\f r8 es d4 r8 a | - g4 r8 c bes4 r8 f | + bes4\f r8 es d4 r8 a | + + g4 r8 c bes4 r8 f | + es4 r8 a g4 r8 cis | <[d16 s> ] | | | | | - r r2 | + r r2 | + % copied... urg: *same* as violino-1(119,128) % URG: or is this R1*10?? % should hara-kiri like viola-1/2... - a'4 r8 es' d4 r8 a | + a'4 r8 es' d4 r8 a | + %120 - b4 r8 es des4 r8 bes | as!4 r8 es' des4 r8 as | g4 r r2 | - r4 r8 es' des4 r8 as | g4 r r2 | + b4 r8 es des4 r8 bes | + as!4 r8 es' des4 r8 as | + g4 r r2 | + r4 r8 es' des4 r8 as | + g4 r r2 | %125 - r4 r8 c bes4 r8 e, | - as4 r8 des c4 r8 as | + r4 r8 c bes4 r8 e, | + + as4 r8 des c4 r8 as | + g4 r8 des' c4 r8 g | as4 r8 es' des4 r8 as | R1*3 %131 % copied from viola(131,140) - [as,8 as c es][f es c as]|[a c es f][ges f c a]| + [as,8 as c es][f es c as]| + [a c es f][ges f c a]| [bes des f ges][as ges des bes]| + %135 - [c es g as][bes as es c]|[des\p f a bes][c, es g as]| - % [bes, des f ges][as, c e f]|[ges, bes d es][f, as c des]| + [c es g as][bes as es c]| + [des\p f a bes][c, es g as]| + % urg, copied, but nog ges, f, on violino! [bes, des f ges][as, c e f]|r [bes, d es]r[as, c des]| % [es, ges bes des][as c es as,]| r[bes bes des][as c es ges]| + % copied: \transpose c \violino-1(140,149) %140 - f4\f r8 bes as4 r8 es | des4 r8 ges f4 r8 c | - bes4 r8 e f4 r8 bes, | bes4 r8 g'! es4 r8 bes' | - as4\p r8 des-"cresc." c4 r8 g | + f4\f r8 bes as4 r8 es | + des4 r8 ges f4 r8 c | + bes4 r8 e f4 r8 bes, | + bes4 r8 g'! es4 r8 bes' | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + as4\p r8 des\< c4 r8 g | + %145 - f4 r8 bes as4 r8 es | des4 r8 g f4 r8 c | bes4 r8 f' e4 r8 bes' | - as4\ff r8 des c4 r8 g | f4 r8 bes as4 r8 es | + f4 r8 bes as4 r8 es | + des4 r8 g f4 r8 c | + bes4 r8 f' e4 r8 bes' | + \!as4\ff r8 des c4 r8 g | + f4 r8 bes as4 r8 es | + % copied somewhat from violino-1(150,168) %150 - des4 r8 g f4 r8 c | des4 r8 f' c,4 r8 e' | - f,1\ff ~ | f | r r2 | + des4 r8 g f4 r8 c | + des4 r8 f' c,4 r8 e' | + + f,1\ff ~ | + f | + r r2 | %155 R1 | - f1 ~ | f | + f1 ~ | + f | + [f8-. as-.][as()g] | [f8-. as-.][as()g] | %160 R1 | - [b,8-. es-.][es()d] [d-. g-.]g4-"ten." | R1 | + [b,8-. es-.][es()d] [d-. g-.]g4-"ten." | + R1 | [e8-. g-.][g()f] | [e8-. g-.][g()f] | + %165 R1 - [bes,8-.\p g'-.][g()f][e-. g-.]g4-"ten." | + [bes,8-.\p g'-.][g()f][e-. g-.]g4-"ten." | R1 | % copied \transpose c' viola(168, 175) r4 [e8-.\ff g-.][g()f] r4 | r4 [e8-. g-.][g()f] r4 | + %170 r4 [e8-. g-.][g()f] r4 | - r4 [e8-. g-.][g()f][fis-.fis-.] | + r4 [e8-. g-.][g()f][fis-.fis-.] | g4 [fis8-.as-.][as()g] r4 | r4 [fis8-.as-.][as()g] r4 | r4 [fis8-.as-.][as()g] r4 | + %175 r4 [fis8-.as-.][as()g] es'4\sf(| % copied violino-1(176,201) - )d1\> ~ | d4( b g \!)f - e2.\p( f4 | + )d1\> ~ | + d4( b g \!)f + e2.\p( f4 | e d b ) g | + %180 - g'2.( a4 | g2 )f | - e4 g2-"cresc." g4 ~ | + g'2.( a4 | + g2 )f | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + e4 g2\< g4 ~ | g g2 g4 ~ | g g2 g4 ~ | + %185 g g2 g4 | - [g16 g g g][g g g g]g2:16 | g: g: | g:\ff bes: | a: g: | + [g16 g g g][g g g g]g2:16 | + g: g: | + \!g:\ff bes: | + a: g: | + %190 - f2.\p( g4 | f e cis ) a | a'2.( bes4 | a2 ) g | - [f16-"cresc." a a a][a a a a]a2:16 | + f2.\p( g4 | + f e cis ) a | + a'2.( bes4 | + a2 ) g | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [f16\< a a a][a a a a]a2:16 | + %195 - a2 a | a2:16\ff c: | b: a: | g2.\p( a4 | g\< fis dis ) b | + a2 a | + \!a2:16\ff c: | + b: a: | + g2.\p( a4 | + g\< fis dis ) b | + %200 - b'1 ~ | \!b + b'1 ~ | + \!b % similar violino-1 only until 219 [c8\f\>g(c)g]r[bes(g)\!bes] | r[as\p(f)as]r[g(es)g] | r[f(c)f]r[g(es)g] | + %205 r[as(d,)as']r[a(es)a] | [g-. b-.]b4. b8-. b4 ~ | [b8-. b-.]b4. b8-. b4 ~ | - [b8-. c-.]c4.-"cresc." c8-. c4 ~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [b8-. c-.]c4.\< c8-. c4 ~ | [c8-. c-.]c4. c8-. c4 ~ | + %210 [c8-. d-.]d4. d8-. d4 ~ | [d8-. es-.]es4. es8-. es4 | - as,2:16\ff as4: g: | f: es: f: es: | - as2:16\ff as4: g: | f: es: f: es: | - des'2:16\ff des4: c: | bes: as: bes: as: | - des2:16\ff des4: c: | bes: as: bes: as: | + \!as,2:16\ff as4: g: | + f: es: f: es: | + as2:16\ff as4: g: | + f: es: f: es: | + des'2:16\ff des4: c: | + bes: as: bes: as: | + des2:16\ff des4: c: | + bes: as: bes: as: | + % copied violino-1(220, 223) %220 r8 as des,4\sf ~ des()c | @@ -221,25 +339,34 @@ violino2 = \notes \relative c { r8 as' des,4\sf ~ des()c | % looks lot like viola... [f16 f as as]f4:16[d16 d g g]d4: | + %225 [c16 c g' g]c,4:16[c16 c f f]c4: | [b16 b f' f]b,4:16[c16 c f f]c4: | [d16 d f f]d4:16[c16 c f f]c4:| [d8 g,] g'4. as8 as4 ~ | - [as8 as] f4. f8 g4 | + [as8 as] f4. f8 g4 | + %230 - c,4\p r r2 | - r2 r4 r8 | + c,4\p r r2 | + + r2 r4 r8 | + r r2 | - r2 r4 r8 | + r2 r4 r8 | + r r2 | %235 R1*3 | %copied violino-1(238,243) - es'4\f r8 as g4 r8 d | - c4\f r8 f es4 r8 bes | + es'4\f r8 as g4 r8 d | + + c4\f r8 f es4 r8 bes | + %240 - as4-. des-. r2 | R1*3 | + as4-. des-. r2 | + R1*3 | + %245 [g,8\p( e' c e][g e c )g~] | [g8( d' b d][g d b )g~] | @@ -247,12 +374,14 @@ violino2 = \notes \relative c { [g8( f' d f][g f d )g,~] | [g8( es'! c es][g es c )g~] | [g8( d' b d][g d b )g~] | + %250 [g8( es' c es][g es c )g~] | [g8( f' d f][g f d )g,~] | [g8( es' c es][g es c )g~] | [g8( d' b d][g d b )g~] | [g8( es' c es][g es c )g] | + %255 | [as8\p( f' des f][as f des )as] | @@ -260,44 +389,74 @@ violino2 = \notes \relative c { [bes8\p( g' es g][bes g es )bes] | | %copied viola-1(260, 273) + %260 - [f8\p-"cresc." f']f4. es8 es4 ~ | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [f8\p\< f']f4. es8 es4 ~ | [es8 as]as4. g8 g4 ~ | [g8 f]f4. es8 es4 ~ | [es8 as]as4. g8 g4 | - r r8 d\ff es4.\sf()d8 | + r r8 \!d\ff es4.\sf()d8 | + %265 r4 r8 d es4.\sf()d8 | r4 r8 e f4.\sf()e8 | r4 r8 e f4.\sf()e8 | r4 r8 e g4.\sf()f8 | r4 r8 f as4.\sf()g8 | + %270 - g2:16-"sempre" g:\ff | g: g: | g: g: | g: g: | + g2:16-"sempre" g:\ff | + g: g: | + g: g: | + g: g: | g4. d8 es4. d,8 | + %275 es4 r8 b8 c4 r8 b | - c1 ~ | c | r r2 | R1 - c1 ~ | c | r r2 | R1 - c1 ~ | c | r2 | R1 | - r2 | as4-. r2 | + c1 ~ | + c | + r r2 | + R1 + c1 ~ | + c | + r r2 | + R1 + c1 ~ | + c | + r2 | + R1 | + r2 | + as4-. r2 | + %290 - r g' r | R1 | g4\p r r2 | R1 | b,4-"pizz." r r2 | + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + > r g' r | + R1 | + \!g4\p r r2 | + R1 | + b,4-"pizz." r r2 | + %295 - R1 | c4 r r2 | R1*15 | + R1 | + c4 r r2 | + R1*15 | c4-"pizz." r r2 | c4 r r2 | c4 r r2 | } $violino2_staff = \context Staff = violino2 < - % MIDI hoort geeneens verschil tussen een + % MIDI hoort geeneens verschil tussen een % eerste en tweede viool ;-) \property Staff.midiInstrument = #"violin" \property Staff.instrument = #"Violino II" \property Staff.instr = #"Vl. II" \notes< \global - \$violino2 + \context Voice=violinoii + \$violino2 > > diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly index b5640ad4b9..bdfec72a64 100644 --- a/mutopia/Coriolan/violoncello-part.ly +++ b/mutopia/Coriolan/violoncello-part.ly @@ -15,6 +15,6 @@ copyright = "public domain"; \score{ \$violoncello_staff \include "coriolan-part-paper.ly" - \midi{ \tempo 4 = 160; } + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index ce9b6f179b..d8071553e7 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -12,92 +12,144 @@ copyright = "public domain"; \version "1.3.4"; violoncello = \notes \relative c { - c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 | + c1\ff ~ | + c | + f,4-. r r2 | + r1 | + c'1\ff ~ | + c | + f,4-. r r2 | \property Staff.instr = #"Vc. \& Cb." r1 | - c'1\ff ~ | c | fis,4-. r r2 | r1 | - g4-. r r2 | g4-. r r2 | - c4\p r4 r2 | c4 r4 r2 | c4 r4 r2 | r1 | - c'4.-"cresc." c8 bes4. bes8 | + c'1\ff ~ | + c | + fis,4-. r r2 | + r1 | + g4-. r r2 | + g4-. r r2 | + c4\p r4 r2 | + c4 r4 r2 | + c4 r4 r2 | + r1 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + c'4.\< c8 bes4. bes8 | + %20 - as4. as8 g4\f r4 | + as4. as8 \!g4\f r4 | R1 | % 4 bars same as violino-1... [bes,!8\p-. des-.][des()c][c-. f-.]f4-"ten." | [bes,!8\p-. des-.][des()c][c-. f-.]f4-"ten." | [bes,!8\p-. des-.][des()c][c-. ges'-.][ges()f] | + %25 [f-. bes-.][bes()a][a-. es'-.][es()des]| - bes4.-"cresc." bes8 as4. as8 | g4 g4-.\f r2 | R1 - as4.\p as8 g4. g8 | f2.-"cresc" g4 | f2. g4 | - f4. g8 f4. g8 | - f4. g8 f4. g8 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + bes4.\< bes8 as4. as8 | + g4 \!g4-.\f r2 | + R1 + as4.\p as8 g4. g8 | + f2.-"cresc" g4 | + f2. g4 | + f4. g8 f4. g8 | + f4. g8 f4. g8 | as1\ff ~ | + %35 as4(g f)es| - d4. r8 c4. r8 | b4. r8 c4. r8 | bes4. r8 as4. r8 | g4. r8 f4. r8 | + d4. r8 c4. r8 | + b4. r8 c4. r8 | + bes4. r8 as4. r8 | + g4. r8 f4. r8 | + %40 fis2\sf [c'8-. es-.][es()d] fis,2\sf [c'8-. es-.][es()d] f,!2\sf [b8-. d-.][d()c] f,2\sf [b8-. d-.][d()c] e,2\sf [bes'!8-. des-.][des()c] + %45 es,!2\sf [a!8-. c-.][c()bes] | d,4 [a'!8-. c-.][c()bes] es,4\sf(| )d4 [a'!8-. c-.][c()bes] es,4\sf(| )d4 [a'!8-. c-.][c()bes] es,4\sf(| )d4 [a'!8-. c-.][c()bes] es,4\sf(| + %50 )d4 r r2 | R1 | [bes'8\p(g'es g][bes g es)bes~] | [bes(f'd f][bes f d)bes~] | [bes(g'es g][bes g es)bes~] | + %55 [bes(as'f as][bes as f)bes,~] | - [bes-"cresc."(g'es g][bes g es)bes~] | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [bes\<(g'es g][bes g es)bes~] | [bes(f'd f][bes f d)bes~] | [bes(g'es g][bes g es)bes~] | [bes(as'f as][bes as f)bes,~] | + %60 [bes(g'es g][bes g es)bes~] | [bes(f'd f][bes f d)as] | - g2\ff f | e c | + \!g2\ff f | + e c | [f8\p(as'f as][c as f)c~] | [c(g'e g][c g e)c~] | [c(as'f as][c as f)c~] | [c(bes'g bes][c bes g)c,~] | [c(as'f as][c as f)c~] | [c(g'e g][c g e)bes] | + %70 - as2\ff g | fis d | - [g8\p-"cresc."(bes' g bes][d bes g)d~] | + as2\ff g | + fis d | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [g8\p\<(bes' g bes][d bes g)d~] | [d8(a' fis a][d a fis)d] | - [f!8\sf\>(as f as][f g d)\!g] | + [\!f!8\sf\>(as f as][f g d)\!g] | + %75 - c,4\p r d r | es r d r | c r cis r | + c,4\p r d r | + es r d r | + c r cis r | d\pp r8 d d4. d8 | r4 r8 d d4. d8 | + %80 - r4 r8 d d4.-"cresc." d8 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + r4 r8 d d4.\< d8 | r4 r8 d d4. d8 | r4 r8 d d4. d8 | r4 r8 d d4. d8 | - c'2.\ff()bes4 | a(g a)g| - c2.()bes4 | a(g a)g| - f!2.()es4 | d(c d)c| + \!c'2.\ff()bes4 | + a(g a)g| + c2.()bes4 | + a(g a)g| + f!2.()es4 | + d(c d)c| + %90 - f2.()es4 | d(c d)c| + f2.()es4 | + d(c d)c| c r8 c' c4\sf()des| r r8 c c4\sf()des| r r8 c c4\sf()des| + %95 r r8 c c4\sf()des| c,4. c'8 c,4. c'8 | b,4. b'8 bes,4. bes'8 | as,4. as'8 g,4. g'8 | fis,4. fis'8 es4. es8 | + %100 d4 r8 d es4 r8 es | c4 r8 c d4 r8 d | @@ -106,6 +158,7 @@ violoncello = \notes \relative c { [g8\p bes cis d][es d bes g]| [fis a cis d][es d a fis\f] | [g bes cis\p d][es d bes g] + %105 [fis a cis d][es d a fis\f] | [g bes cis\p d][f, a cis d] | @@ -114,6 +167,7 @@ violoncello = \notes \relative c { [c, es g a][bes, d fis g] | % r[c, es g][d fis a d] | [a, c es g][d fis a d] | + %110 % cello has eighth notes here... % [g,16 g bes bes][d d es es][f, f a a][cis cis d d] | @@ -121,8 +175,9 @@ violoncello = \notes \relative c { [g,:8 bes d es][f, a cis d] | [es,8: g: b: c!:][d,: f: a: bes:] | [c,: es: g: a:][cis,: e: g: bes:] | - [d,: g: bes: d:][d,: fis: a: d:] | + [d,: g: bes: d:][d,: fis: a: d:] | g,,2 ~ g4. g8 | + %115 g2 ~ g4. g8 | g4. g8 g4 r8 g | @@ -130,18 +185,36 @@ violoncello = \notes \relative c { % urg, 2 copied from 102 [g'8\p bes cis d][es d bes g]| [fis a cis d][es d a fis] | + %120 - [g bes c des][c des bes g]|[f as c des][c des as f]| - [e g b c][b c g e]|[f as b c][b c as f]| + [g bes c des][c des bes g]| + [f as c des][c des as f]| [e g b c][b c g e]| + [f as b c][b c as f]| + [e g b c][b c g e]| + %125 - [c e fis g][fis g e c]|[f as b c][des c as f]| - [e g b c][des c g e]|[f as c des][c des as f]| - [g bes d es][d es bes g]|[as-"cresc." c d es][f es c as]| + [c e fis g][fis g e c]| + [f as b c][des c as f]| + [e g b c][des c g e]| + [f as c des][c des as f]| + [g bes d es][d es bes g]| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [as\< c d es][f es c as]| + %131 [g bes d es][f es bes g]| % shared with viola until here - as1 ( | a | bes | )c | des2\p( c | bes as | ges f | )es [as,8 c es as] | + as1 ( | + a | + bes | + )c | + \!des2\p( c | + bes as | + ges f | + )es [as,8 c es as] | + %140 % copied from viola-1 (140,152) % except cello has eighth notes @@ -151,7 +224,9 @@ violoncello = \notes \relative c { [g,: bes: c: des:][f,: bes: c: des:]| [e,: g: bes: des:][c: e: g: c:]| %shared with cello from here on - [f,8\p-"cresc." as c des][es, g b c]| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [f,8\p\< as c des][es, g b c]| [des, f a bes][c, es g as]| % uhuh, still 'same as cello'; % but now rests for notes that viola cannot reach... @@ -163,161 +238,247 @@ violoncello = \notes \relative c { [g, bes des f][c e g c]| % cello has eight notes; % viola has rest where can't reach - [f,:\ff as: c: des:][es,: g: b: c:]| + [\!f,:\ff as: c: des:][es,: g: b: c:]| [des,: f: a: bes:][c,: es: g: as:]| + %150 % r[des,16 des][e e g g]r8[c,16 c][e e f f]| [bes, des e g][as, c e f]| % r8[des16 des][f f g g][c, c e e][g g c c]| [bes, des f g][c, e g c]| - f,1\ff ~ | f | bes,4-. r r2 + f,1\ff ~ | + f | + bes,4-. r r2 + %155 R1 | - f'1\ff ~ | f | + f'1\ff ~ | + f | b,2\sf [f'8-. as-.][as()g] | b,2\sf [f'8-. as-.][as()g] | + %160 R1*3 | bes,!2\ff [e8-. g-.][g()f] | bes,2\sf [e8-. g-.][g()f] | + %165 R1*2 | r2 r4 bes,\ff(| )as4 [e'8-. g-.][g()f] bes,4\sf(| )as4 [e'8-. g-.][g()f] bes,4\sf(| + %170 )as4 [e'8-. g-.][g()f] bes,4\sf(| )as4 [e'8-. g-.][g()f][fis-. fis-.] | g4 [fis8-. as-.][as()g] c,4\sf(| )b4 [fis'8-. as-.][as()g] c,4\sf(| )b4 [fis'8-. as-.][as()g] c,4\sf(| + %175 )b4 [fis'8-. as-.][as()g] c,4\sf(| - )b4 r r2 | R1 | + )b4 r r2 | + R1 | [g8\p(e' c d][g e c )g~] | [g(d' b d][g d b )g~] | + %180 [g(e' c d][g e c )g~] | [g(f' d f][g f d )g,~] | - [g-"cresc."(e' c d][g e c )g~] | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [g\<(e' c d][g e c )g~] | [g(d' b d][g d b )g~] | + %185 [g(e' c d][g e c )g~] | [g(f' d f][g f d )g,~] | [g(e' c d][g e c )g~] | [g(d' b d][g d b )g(] | + %190 - )e2\ff d' | cis a ~ | + \!)e2\ff d' | + cis a ~ | [a8( f' d f][a f d )a!~] | [a( e' cis e][a e c )a!~] | [a8( f' d f][a f d )a!~] | [a( g' e g][a g e )a,!~] | + %195 - [a8-"cresc."( f' d f][a f d )a!~] | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + [a8\<( f' d f][a f d )a!~] | [a( e' cis e][a e c )g] | - f2\ff e | dis b'~ | + \!f2\ff e | + dis b'~ | [b8\p( g' e g][b g e )b!~] | + %200 [b8\<( fis' dis fis ][b fis dis )b!~] | [b8\p( g' e g][e g e )g] | [f(g f g][f g f)\!g] | - es!4\fp r e r | - f r g r | + es!4\fp r e r | + f r g r | + %205 - as r g r | - f r fis r | - g r g r | - g r g r | - g r g-"cresc." r | + as r g r | + f r fis r | + g r g r | + g r g r | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + g r g\< r | + %210 - g r g r | - g r g r | - g r g r | - f2.\ff()es4 | + g r g r | + g r g r | + g r g r | + \!f2.\ff()es4 | d( c d )c | + %215 - f2.\ff()es4 | + f2.\ff()es4 | d( c d )c | - bes2.\ff()as4 | + bes2.\ff()as4 | g( f g )f | - bes2.\ff()as4 | + bes2.\ff()as4 | + %220 g( f g )f | r4 r8 f' f4\sf()ges | r4 r8 f f4\sf()ges | r4 r8 f f4\sf()ges | r4 r8 f f4\sf()ges | + %225 f4. f'8 f,4. f'8 | e,4. e'8 es,4. es'8 | d,4. d'8 c,4. c'8 | b,4. b'8 as,4. as'8 | g,4 r8 g as4 r8 as | + %230 f4 r8 f g4 r8 g | [c8\p es fis g][as g es c]| [b d fis g][as g d b\f]| [c es fis\p g][as g es c]| [b d fis g][as g d b\f]| + %235 [c es g\p as][bes, d fis g]| [as, c e f!][g, bes d es]| [f, as c d][es g b c]| [d, f as c][g, b d g]| [c,\f e g as][bes, d fis g]| + %240 [as, c e f!][g, bes d es]| - f4 r r2 | - R1*3 | + f4 r r2 | + R1*3 | c4\p r r r8 c(| + %245 )f4 r r r8 f(| )e4 r r r8 e(| )b4 r r r8 b(| )c4 r r r8 c(| )f4 r r r8 f(| + %250 )es4 r r r8 es(| )b4 r r r8 b(| - )c4-"cresc." r r r8 c(| + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + )c4\< r r r8 c(| )f4 r r r8 f,(| - )es1 | + )es1 | + %255 - ges\f | - f\p | - as\f | - g!\p | + \!ges\f | + f\p | + as\f | + g!\p | bes\f | + %260 - as4.\p-"cresc." as'8 g4. g8 | + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = "dashed-line" + as4.\p\< as'8 g4. g8 | f4. f8 es4. es8 | - as4. as8 g4. g8 | + as4. as8 g4. g8 | f4. f8 es4. es8 | - f,4.\ff f'8 f2\sf | + \!f,4.\ff f'8 f2\sf | + %265 - f,4. f'8 f2\sf | - g,4. g'8 g2\sf | - g,4. g'8 g2\sf | - as,4. as'8 as2\sf | - a,4. a'8 a2\sf | + f,4. f'8 f2\sf | + g,4. g'8 g2\sf | + g,4. g'8 g2\sf | + as,4. as'8 as2\sf | + a,4. a'8 a2\sf | + %270 - [c,8-"sempre\ \ \ \ \ \ \ "\ff b c d][es\ff d es c]| + [c,8-"sempre"\ff b c d][es\ff d es c]| [b c d c][b c b g]| [c8 b c d][es d es c]| [b c d c][b c b g]| [c b c g][c b c g]| + %275 [c b c g][c b c g]| - c1 ~ | c | f4-. r r2 | R1 | - c1 ~ | c | f4-. r r2 | R1 | - c1 ~ | c | fis4-. f-. r2 | R1 - es4-. e-. r2 | f,4-. g-. r2 | as4-"dim." r b r | R1 | c4 r r2 R1 | - g4-"pizz." r r2 | R1 | c4 r r2 | - [c8-.-"arco" es-.][es()d][d-. as'-.][as()g] | R1 - \times 2/3 { c,4-"sempre pi\\`u piano" ( es c ~ } \times 2/3 { c as' )g } | - r2 r4 c,( | es2. ) d4 | r2 r4 d( | as'2. )g4 ~ | g1 ( | + c1 ~ | + c | + f4-. r r2 | + R1 | + + %280 + c1 ~ | + c | + f4-. r r2 | + R1 | + c1 ~ | + + %285 + c | + fis4-. f-. r2 | + R1| + es4-. e-. r2 | + f,4-. g-. r2 | + + %290 + \property Voice.decrescendoText = "dim." + \property Voice.decrescendoSpanner = "dashed-line" + as4\> r b r | + R1 | + \!c4\p r r2| + R1 | + g4-"pizz." r r2 | + + %295 + R1 | + c4 r r2 | + [c8-.-"arco" es-.][es()d][d-. as'-.][as()g] | + R1 + \property Voice.decrescendoText = "sempre pi\\`u piano" + \property Voice.decrescendoSpanner = "" + \times 2/3 { c,4\> ( es c ~ } \times 2/3 { c as' )g } | + + %300 + r2 r4 c,( | + es2. ) d4 | + r2 r4 d( | + as'2. )g4 ~ | + g1 ( | + %305 - es | )d( | )as'\> ~ | as ~ | as2.()\!g4 | c,\pp r r2 | R1 | + es | + )d( | + \!)as'\> ~ | + as ~ | + as2.()g4 | + + %310 + \!c,\pp r r2 | + R1 | c4-"pizz." r r2 | c4 r r2 | c4 r r2 | diff --git a/scm/generic-property.scm b/scm/generic-property.scm index db27072dbc..7ddd22dff2 100644 --- a/scm/generic-property.scm +++ b/scm/generic-property.scm @@ -59,6 +59,13 @@ (list 'dynamicPadding number? 'padding) ))) +(define generic-dynamic-line-spanner-properties + (cons "Dynamic_line_spanner" (list + (list 'dynamicDirection dir? 'direction) + (list 'verticalDirection dir? 'direction) + (list 'dynamicPadding number? 'padding) + ))) + (define generic-bar-properties (cons "Staff_bar" (list (list 'barSize number? 'bar-size)) @@ -146,6 +153,8 @@ (list generic-stem-properties generic-breathing-sign-properties + generic-crescendo-properties + generic-dynamic-line-spanner-properties generic-tie-properties generic-tie-column-properties generic-tuplet-spanner-properties @@ -154,7 +163,6 @@ generic-beam-properties generic-text-properties generic-note-column-properties - generic-crescendo-properties generic-script-properties generic-All-properties )) -- 2.39.2