From 9cf00174c8273860064dc7ccb51beddcdd7105eb Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 22 Mar 2001 01:21:03 +0100 Subject: [PATCH] release: 1.3.141 ============ * po update. * Renamed remaining mudela -> lilypond (except for old change logs). * Dropped Solo-Cello-Suite II and gnossienne-4 from ./mutopia, as they're now accessible throug the ports. * Fixed compilation of lots of examples. * Convert-ly: added and fixed some conversions. * Doco updates. * Ly2dvi: don't hang compilation process: run latex in batchmode. * Some ly2dvi updates. * Junked cruft from makefiles. * Added message about make help at end of configure. * Some documentation updates. * Convert-ly: added some missing rules. * Ly2dvi: changed footer (and header) macros to match mutopia headers again. * Convert-ly: always insert or update version number. New option: --assume-old will apply all conversions if version cannot be determined. * Small documentation fixes. * Removed default (font-shape . italic) settings from TextScript and TextSpanner. * Moved ports section of mutopia to mutopia/ports. Fixed make bootstrapping. Added sync target, synced with www.mutopiaproject.org. * Bugfix: ly2dvi sets footers, headers, tagline. Pagenumbering on by default. 1.3.140.h --- CHANGES | 41 +- Documentation/user/refman.itely | 3 + Documentation/user/tutorial.itely | 2 +- GNUmakefile.in | 3 +- VERSION | 4 +- configure | 9 + input/denneboom.ly | 1 + input/just-friends.ly | 6 +- input/praeludium-fuga-E.ly | 6 +- input/test/bar-break.ly | 0 input/test/caps.ly | 13 + input/test/font.ly | 0 input/test/harmonics.ly | 0 input/test/part-combine-mmrest.ly | 0 input/test/top-staff-volta.ly | 0 input/test/transposition.ly | 23 +- input/test/updown.ly | 10 +- input/tricks/boxed-molecule.ly | 58 +++ input/tutorial/wss.ly | 0 input/twinkle-pop.ly | 2 +- lily/hairpin.cc | 1 + lily/include/slur.hh | 2 +- lily/include/spanner.hh | 3 + lily/local-key-item.cc | 2 +- lily/main.cc | 2 +- lily/molecule.cc | 13 + lily/slur.cc | 17 - lily/spanner.cc | 18 + lily/tie.cc | 21 - ly/property.ly | 4 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- midi2ly/include/mudela-column.hh | 0 midi2ly/include/mudela-item.hh | 0 midi2ly/include/mudela-score.hh | 0 midi2ly/include/mudela-staff.hh | 0 midi2ly/include/mudela-stream.hh | 0 midi2ly/include/mudela-voice.hh | 0 midi2ly/mudela-column.cc | 0 midi2ly/mudela-item.cc | 0 midi2ly/mudela-score.cc | 0 midi2ly/mudela-staff.cc | 0 midi2ly/mudela-stream.cc | 0 midi2ly/mudela-voice.cc | 0 mutopia/BachJS/BWV1042/GNUmakefile | 0 .../BWV1042/concerto-in-e-major/GNUmakefile | 0 mutopia/BachJS/BWV772/GNUmakefile | 0 .../BWV772/bach-invention-01/GNUmakefile | 0 mutopia/BachJS/GNUmakefile | 0 mutopia/E.Satie/gnossienne-4.ly | 0 .../J.S.Bach/Solo-Cello-Suites/GNUmakefile | 0 .../Solo-Cello-Suites/allemande-cello.ly | 0 .../Solo-Cello-Suites/allemande-urtext.ly | 0 .../Solo-Cello-Suites/allemande-viola.ly | 0 .../Solo-Cello-Suites/courante-cello.ly | 0 .../Solo-Cello-Suites/courante-urtext.ly | 0 .../Solo-Cello-Suites/courante-viola.ly | 0 .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 0 .../Solo-Cello-Suites/gigue-urtext.ly | 0 .../J.S.Bach/Solo-Cello-Suites/gigue-viola.ly | 0 mutopia/J.S.Bach/Solo-Cello-Suites/header.ly | 0 .../Solo-Cello-Suites/menuetto-cello.ly | 0 .../Solo-Cello-Suites/menuetto-urtext.ly | 0 .../Solo-Cello-Suites/menuetto-viola.ly | 0 .../Solo-Cello-Suites/prelude-cello.ly | 0 .../Solo-Cello-Suites/prelude-urtext.ly | 0 .../Solo-Cello-Suites/prelude-viola.ly | 0 .../Solo-Cello-Suites/sarabande-cello.ly | 0 .../Solo-Cello-Suites/sarabande-urtext.ly | 0 .../Solo-Cello-Suites/sarabande-viola.ly | 0 .../J.S.Bach/Solo-Cello-Suites/scsii-cello.ly | 0 .../J.S.Bach/Solo-Cello-Suites/scsii-viola.ly | 0 .../Solo-Cello-Suites/solo-cello-suite-ii.ly | 0 mutopia/mutopia.make | 0 .../BeethovenLv/O62/Coriolan/bassi-part.ly | 14 - .../mutopia/BeethovenLv/O62/Coriolan/bassi.ly | 56 -- .../O62/Coriolan/clarinetti-part.ly | 15 - .../BeethovenLv/O62/Coriolan/clarinetti.ly | 22 - .../BeethovenLv/O62/Coriolan/clarinetto-1.ly | 240 --------- .../BeethovenLv/O62/Coriolan/clarinetto-2.ly | 205 -------- .../BeethovenLv/O62/Coriolan/contrabasso.ly | 401 --------------- .../BeethovenLv/O62/Coriolan/coriolan-midi.ly | 4 - .../O62/Coriolan/coriolan-paper.ly | 66 --- .../O62/Coriolan/coriolan-part-paper.ly | 64 --- .../BeethovenLv/O62/Coriolan/coriolan.ly | 66 --- .../BeethovenLv/O62/Coriolan/corni-part.ly | 16 - .../mutopia/BeethovenLv/O62/Coriolan/corni.ly | 21 - .../BeethovenLv/O62/Coriolan/corno-1.ly | 205 -------- .../BeethovenLv/O62/Coriolan/corno-2.ly | 219 -------- .../BeethovenLv/O62/Coriolan/fagotti-part.ly | 15 - .../BeethovenLv/O62/Coriolan/fagotti.ly | 19 - .../BeethovenLv/O62/Coriolan/fagotto-1.ly | 348 ------------- .../BeethovenLv/O62/Coriolan/fagotto-2.ly | 330 ------------ .../BeethovenLv/O62/Coriolan/flauti-part.ly | 15 - .../BeethovenLv/O62/Coriolan/flauti.ly | 16 - .../BeethovenLv/O62/Coriolan/flauto-1.ly | 260 ---------- .../BeethovenLv/O62/Coriolan/flauto-2.ly | 172 ------- .../BeethovenLv/O62/Coriolan/global.ly | 29 -- .../BeethovenLv/O62/Coriolan/header.ly | 192 ------- .../BeethovenLv/O62/Coriolan/instruments.ly | 14 - .../mutopia/BeethovenLv/O62/Coriolan/music.ly | 20 - .../BeethovenLv/O62/Coriolan/oboe-1.ly | 271 ---------- .../BeethovenLv/O62/Coriolan/oboe-2.ly | 182 ------- .../BeethovenLv/O62/Coriolan/oboi-part.ly | 15 - .../mutopia/BeethovenLv/O62/Coriolan/oboi.ly | 15 - .../BeethovenLv/O62/Coriolan/timpani-part.ly | 15 - .../BeethovenLv/O62/Coriolan/timpani.ly | 149 ------ .../BeethovenLv/O62/Coriolan/trombe-part.ly | 15 - .../BeethovenLv/O62/Coriolan/trombe.ly | 21 - .../BeethovenLv/O62/Coriolan/trombo-1.ly | 155 ------ .../BeethovenLv/O62/Coriolan/trombo-2.ly | 154 ------ .../BeethovenLv/O62/Coriolan/viola-1.ly | 408 --------------- .../BeethovenLv/O62/Coriolan/viola-2.ly | 400 --------------- .../BeethovenLv/O62/Coriolan/viole-part.ly | 15 - .../mutopia/BeethovenLv/O62/Coriolan/viole.ly | 56 -- .../O62/Coriolan/violino-1-part.ly | 15 - .../BeethovenLv/O62/Coriolan/violino-1.ly | 449 ---------------- .../O62/Coriolan/violino-2-part.ly | 15 - .../BeethovenLv/O62/Coriolan/violino-2.ly | 438 ---------------- .../BeethovenLv/O62/Coriolan/violoncello.ly | 478 ------------------ scm/font.scm | 9 + scm/grob-description.scm | 9 +- scripts/convert-ly.py | 1 + stepmake/bin/add-html-footer.py | 10 +- stepmake/stepmake/yolily-debian-rules.make | 0 stepmake/stepmake/yolily-debian-targets.make | 0 stepmake/stepmake/yolily-debian-vars.make | 0 stepmake/stepmake/yolily-topdoc-rules.make | 0 stepmake/stepmake/yolily-topdoc-targets.make | 0 stepmake/stepmake/yolily-topdoc-vars.make | 0 stepmake/stepmake/yolily-toplevel-rules.make | 0 .../stepmake/yolily-toplevel-targets.make | 0 stepmake/stepmake/yolily-toplevel-vars.make | 0 tex/mudela-book.tex | 0 tex/p.tex | 0 135 files changed, 202 insertions(+), 6413 deletions(-) delete mode 100644 input/test/bar-break.ly create mode 100644 input/test/caps.ly delete mode 100644 input/test/font.ly delete mode 100644 input/test/harmonics.ly delete mode 100644 input/test/part-combine-mmrest.ly delete mode 100644 input/test/top-staff-volta.ly create mode 100644 input/tricks/boxed-molecule.ly delete mode 100644 input/tutorial/wss.ly delete mode 100644 midi2ly/include/mudela-column.hh delete mode 100644 midi2ly/include/mudela-item.hh delete mode 100644 midi2ly/include/mudela-score.hh delete mode 100644 midi2ly/include/mudela-staff.hh delete mode 100644 midi2ly/include/mudela-stream.hh delete mode 100644 midi2ly/include/mudela-voice.hh delete mode 100644 midi2ly/mudela-column.cc delete mode 100644 midi2ly/mudela-item.cc delete mode 100644 midi2ly/mudela-score.cc delete mode 100644 midi2ly/mudela-staff.cc delete mode 100644 midi2ly/mudela-stream.cc delete mode 100644 midi2ly/mudela-voice.cc delete mode 100644 mutopia/BachJS/BWV1042/GNUmakefile delete mode 100644 mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile delete mode 100644 mutopia/BachJS/BWV772/GNUmakefile delete mode 100644 mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile delete mode 100644 mutopia/BachJS/GNUmakefile delete mode 100644 mutopia/E.Satie/gnossienne-4.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/header.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/scsii-cello.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly delete mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly delete mode 100644 mutopia/mutopia.make delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/bassi-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/bassi.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/clarinetti-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/clarinetti.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/clarinetto-1.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/clarinetto-2.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/contrabasso.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-midi.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-paper.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-part-paper.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/coriolan.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/corni-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/corni.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/corno-1.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/corno-2.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/fagotti-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/fagotti.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/fagotto-1.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/fagotto-2.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/flauti-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/flauti.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/flauto-1.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/flauto-2.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/global.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/header.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/instruments.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/music.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/oboe-1.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/oboe-2.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/oboi-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/oboi.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/timpani-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/timpani.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/trombe-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/trombe.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/trombo-1.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/trombo-2.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/viola-1.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/viola-2.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/viole-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/viole.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/violino-1-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/violino-1.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/violino-2-part.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/violino-2.ly delete mode 100644 ports/mutopia/BeethovenLv/O62/Coriolan/violoncello.ly delete mode 100644 stepmake/stepmake/yolily-debian-rules.make delete mode 100644 stepmake/stepmake/yolily-debian-targets.make delete mode 100644 stepmake/stepmake/yolily-debian-vars.make delete mode 100644 stepmake/stepmake/yolily-topdoc-rules.make delete mode 100644 stepmake/stepmake/yolily-topdoc-targets.make delete mode 100644 stepmake/stepmake/yolily-topdoc-vars.make delete mode 100644 stepmake/stepmake/yolily-toplevel-rules.make delete mode 100644 stepmake/stepmake/yolily-toplevel-targets.make delete mode 100644 stepmake/stepmake/yolily-toplevel-vars.make delete mode 100644 tex/mudela-book.tex delete mode 100644 tex/p.tex diff --git a/CHANGES b/CHANGES index e4883696d7..9d254b09da 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,3 @@ -1.3.140.jcn7 -============ - -* Ports: grep for '\score' in .lys if main .ly file can't be found. - 1.3.140.jcn6 ============ @@ -21,23 +16,14 @@ they're now accessible throug the ports. * Ly2dvi: don't hang compilation process: run latex in batchmode. -1.3.140.jcn4 -============ - * Some ly2dvi updates. * Junked cruft from makefiles. -1.3.140.jcn4 -============ - * Added message about make help at end of configure. * Some documentation updates. -1.3.140.jcn3 -============ - * Convert-ly: added some missing rules. * Ly2dvi: changed footer (and header) macros to match mutopia headers again. @@ -46,24 +32,35 @@ they're now accessible throug the ports. --assume-old will apply all conversions if version cannot be determined. -1.3.140.jcn2 -============ - * Small documentation fixes. * Removed default (font-shape . italic) settings from TextScript and TextSpanner. -1.3.140.jcn1 -============ - * Moved ports section of mutopia to mutopia/ports. Fixed make bootstrapping. Added sync target, synced with www.mutopiaproject.org. -1.3.139.jcn6 +* Bugfix: ly2dvi sets footers, headers, tagline. Pagenumbering on by default. + +1.3.140.hwn1 ============ -* Bugfix: ly2dvi sets footers, headers, tagline. Pagenumbering on by default. +* input/trick/boxed-molecule.ly : show how to draw boxes around grobs. + +* added font-shape caps, input/test/caps. + +* Added minimum-length for hairpin. Unified Tie::set_spacing_rods and +Slur::set_spacing_rods into Spanner::set_spacing_rods + +* Small doco fixes. + +1.3.140.mb1 +=========== + +* Bugfix: Some more examples in input/test/ work again. + +* bugfix: cautionary accidentals + 1.3.140 ======= diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 96efdb7c4e..3ec6395039 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -2614,6 +2614,9 @@ and @var{grobname} are strings and @var{value} is a Scheme expression. @refbugs LilyPond will hang or crash if @var{value} contains cyclic references. +The backend is not very strict in type-checking grob properties. If you +@code{\revert} properties that are expected to be set by default, +LilyPond may crash. diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index e225639dc9..04265373c0 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1138,7 +1138,7 @@ oboes = \notes \relative c'' \context Voice = oboe { } hoomPah = \repeat unfold 8 - \notes \transpose c' { c8 \stemDown c'8 \stemUp } + \notes \transpose c' { \stemUp c8 \stemBoth \stemDown c'8 \stemBoth } bassvoices = \notes \relative c' { c4 g8. b,16 diff --git a/GNUmakefile.in b/GNUmakefile.in index ec97235ef7..646742c443 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -79,7 +79,6 @@ top-web: find `find Documentation input mutopia *.png index.html -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' | tar -czf $(outdir)/web.tar.gz -T - #WWW: local-WWW -WWW: web: local-web @@ -95,3 +94,5 @@ top-WWW-clean: $(SHELL) $(buildscript-dir)/clean-fonts.sh + +WWW: diff --git a/VERSION b/VERSION index 4dda1bc0c7..e2374e6412 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=140 -MY_PATCH_LEVEL=jcn7 +PATCH_LEVEL=141 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/configure b/configure index 6aa2c3149c..9ebc5b08f3 100755 --- a/configure +++ b/configure @@ -3984,3 +3984,12 @@ fi fi +cat < \context Staff = pedal { - \praeludium_pedal \breakmusic \fugaII_pedal } + \praeludiumPedal \breakmusic \fugaIIPedal } > \paper { diff --git a/input/test/bar-break.ly b/input/test/bar-break.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/input/test/caps.ly b/input/test/caps.ly new file mode 100644 index 0000000000..fc2ec02d08 --- /dev/null +++ b/input/test/caps.ly @@ -0,0 +1,13 @@ +\header { +texidoc = " Small caps is available as font-shape caps. + + "; } +shapeSC = \property Lyrics.LyricText \override #'font-shape = #'caps + shapeNorm = \property Lyrics.LyricText \revert #'font-shape + +\score { < + \notes \relative c'' { c4 c4 c8 c8 } +\lyrics \context Lyrics { + what4 is4 \shapeSC Bud8 -- dha?8 }> +\paper { linewidth = -1.;} + } diff --git a/input/test/font.ly b/input/test/font.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/input/test/harmonics.ly b/input/test/harmonics.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/input/test/part-combine-mmrest.ly b/input/test/part-combine-mmrest.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/input/test/top-staff-volta.ly b/input/test/top-staff-volta.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/input/test/transposition.ly b/input/test/transposition.ly index ee8388b370..e0948ac178 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -12,6 +12,12 @@ As you can see in output = the example file "test.ly" there are a few problems The solution gis=as etc. would concern both note and key transposistion Eric + +- Note that transpose eses of fis-major = as-major +- Note also that key signatures specified with \property keySignature + are not transposed! + + /Mats B, March 21, 2001 %} \header{ @@ -39,12 +45,15 @@ vTwo = \notes \transpose d' { \vOne } vThree = \notes \relative c''{ \clef"violin"; - \keysignature fis cis; +% \keysignature fis cis; + \property Staff.keySignature = #'((0 . 1)(3 . 1)) \time 2/4 ; d4 d | - \keysignature bes es fis; +% \keysignature bes es fis; + \property Staff.keySignature = #'((3 . 1)(2 . -1)(6 . -1)) fis4 fis | - \keysignature fis cis gis dis ais eis; +% \keysignature fis cis gis dis ais eis; + \property Staff.keySignature = #'((2 . -1)(5 . -1)(1 . 1)(4 . 1)(0 . 1)(3 . 1)) cis4 ais4 | } @@ -52,10 +61,10 @@ vFour = \notes \transpose d' \vThree \score { \context StaffGroup < - \vOne - \vTwo - \vThree - \vFour + \context Staff=vOne \vOne + \context Staff=vTwo \vTwo + \context Staff=vThree \vThree + \context Staff=vFour \vFour > \paper { linewidth= 130.\mm; } } diff --git a/input/test/updown.ly b/input/test/updown.ly index 2e0a473fdc..55869799b8 100644 --- a/input/test/updown.ly +++ b/input/test/updown.ly @@ -1,16 +1,12 @@ \score { \context Voice \notes\relative c { - % this used to work: + % this used to work (long time ago): % <{\voiceOne e} % {\voiceTwo c}> % now we need: - \context Staff - <{\voiceOne e} - {\voiceTwo c}> - - - ; + <\context Voice=one {\voiceOne e} + \context Voice=two {\voiceTwo c}> } \paper { } diff --git a/input/tricks/boxed-molecule.ly b/input/tricks/boxed-molecule.ly new file mode 100644 index 0000000000..1dc8cb0fd3 --- /dev/null +++ b/input/tricks/boxed-molecule.ly @@ -0,0 +1,58 @@ +\header { + +texidoc = "overriding the molecule callback can also be used to draw a + box around arbitrary grobs. + + TODO: check whether the corners are really correct. + + "; +} +#(define (box-molecule xext yext) + (ly-make-molecule + (list 'filledbox (- (car xext)) (cdr xext) + (- (car yext)) (cdr yext)) + xext yext) +) + +#(define (widen-interval iv amount) + (cons (- (car iv) amount) + (+ (cdr iv) amount)) +) + +#(define (make-molecule-boxer callback) + (define (molecule-boxer grob) + (let* + ( + (mol (callback grob)) + (box-padding 0.1) + (x-ext (widen-interval (ly-get-molecule-extent mol 0) box-padding)) + (y-ext (widen-interval (ly-get-molecule-extent mol 1) box-padding)) + (rule-thick 0.1) + (x-rule (box-molecule (widen-interval x-ext rule-thick) + (cons 0 rule-thick))) + (y-rule (box-molecule (cons 0 rule-thick) y-ext)) + ) + + (set! mol (ly-combine-molecule-at-edge mol 0 1 y-rule (* 0.5 box-padding))) + (set! mol (ly-combine-molecule-at-edge mol 0 -1 y-rule (* 0.5 box-padding))) + (set! mol (ly-combine-molecule-at-edge mol 1 1 x-rule 0.0)) + (set! mol (ly-combine-molecule-at-edge mol 1 -1 x-rule 0.0)) + + mol + )) + molecule-boxer + ) + + + \score { \notes { + + \property Voice.TextScript \override #'molecule-callback = + #(make-molecule-boxer Text_item::brew_molecule) + + c'4^"foo" + +\property Voice.Stem \override #'molecule-callback = + #(make-molecule-boxer Stem::brew_molecule) + + c''8 + }} diff --git a/input/tutorial/wss.ly b/input/tutorial/wss.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index f95be9930c..43be947cc8 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -33,7 +33,7 @@ acc = \chords { } text = \lyrics{ - \property Lyrics.LyricText \set #'font-style = #'italic + \property Lyrics . LyricText \set #'font-style = #'italic Ah!4 vous dir -- ai -- je ma man2 Ce4 qui cau -- se mon tour -- ment2 diff --git a/lily/hairpin.cc b/lily/hairpin.cc index a42dea8a11..23de3362d4 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -93,3 +93,4 @@ Hairpin::brew_molecule (SCM smob) } + diff --git a/lily/include/slur.hh b/lily/include/slur.hh index f4e28b7947..7313ee7e6c 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -22,7 +22,7 @@ public: static Bezier get_curve (Grob *me); static Direction get_default_dir (Grob *me); DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); - DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM )); + DECLARE_SCHEME_CALLBACK (height, (SCM,SCM)); private: static Real get_first_notecolumn_y (Grob *me, Direction dir); diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh index 03cb986634..8f94e79bd8 100644 --- a/lily/include/spanner.hh +++ b/lily/include/spanner.hh @@ -33,6 +33,8 @@ class Spanner : public Grob { Drul_array spanned_drul_; public: + DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM )); + Link_array broken_into_l_arr_; // todo: move to somewhere else. @@ -54,6 +56,7 @@ public: virtual SCM do_derived_mark (); protected: void set_my_columns (); + VIRTUAL_COPY_CONS (Grob); virtual void do_break_processing (); virtual Line_of_score*line_l () const; diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc index 634a4b7b3f..bc49391582 100644 --- a/lily/local-key-item.cc +++ b/lily/local-key-item.cc @@ -61,7 +61,7 @@ Local_key_item::add_pitch (Grob*me, Pitch p, bool cautionary, bool natural, Molecule Local_key_item::parenthesize (Grob*me, Molecule m) { - Molecule open = Font_interface::get_default_font (me)->find_by_name (String ("accidentals- (")); + Molecule open = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-(")); Molecule close = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-)")); m.add_at_edge (X_AXIS, LEFT, Molecule (open), 0); m.add_at_edge (X_AXIS, RIGHT, Molecule (close), 0); diff --git a/lily/main.cc b/lily/main.cc index 5e359af4c1..75c9ea84d8 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -328,7 +328,7 @@ main_prog (int, char**) all_fonts_global_p = new All_font_metrics (global_path.str ()); init_scheme_code_string += ")"; - gh_eval_str (init_scheme_code_string.ch_C()); + gh_eval_str ((char *)init_scheme_code_string.ch_C()); int p=0; const char *arg ; diff --git a/lily/molecule.cc b/lily/molecule.cc index 9ea0eb0a6a..5f1ced7f49 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -201,9 +201,22 @@ Molecule::ly_molecule_combined_at_edge (SCM first, SCM axis, SCM direction, } +SCM +make_molecule (SCM expr, SCM xext, SCM yext) +{ + /* + TODO: typechecking. + */ + Box b (ly_scm2interval (xext), ly_scm2interval(yext)); + Molecule m (b, expr); + return m.smobbed_copy (); +} + + static void molecule_init () { + scm_make_gsubr ("ly-make-molecule", 3, 0, 0, (Scheme_function_unknown) make_molecule); scm_make_gsubr ("ly-combine-molecule-at-edge", 5 , 0, 0, (Scheme_function_unknown) Molecule::ly_molecule_combined_at_edge); scm_make_gsubr ("ly-set-molecule-extent!", 3 , 0, 0, (Scheme_function_unknown) Molecule::ly_set_molecule_extent_x); scm_make_gsubr ("ly-get-molecule-extent", 2 , 0, 0, (Scheme_function_unknown) Molecule::ly_get_molecule_extent); diff --git a/lily/slur.cc b/lily/slur.cc index 316774e37d..3e2743385b 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -479,23 +479,6 @@ Slur::get_encompass_offset_arr (Grob *me) } -MAKE_SCHEME_CALLBACK (Slur,set_spacing_rods,1); -SCM -Slur::set_spacing_rods (SCM smob) -{ - Grob*me = unsmob_grob (smob); - - Rod r; - Spanner*sp = dynamic_cast (me); - r.item_l_drul_[LEFT] = sp->get_bound (LEFT); - r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT); - r.distance_f_ = - gh_scm2double (me->get_grob_property ("minimum-length")) - * 1.0; - - r.add_to_cols (); - return SCM_UNSPECIFIED; -} /* diff --git a/lily/spanner.cc b/lily/spanner.cc index b51c332d5f..0fba92f847 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -381,3 +381,21 @@ extend_spanner_over_elements (Grob*s) sp->set_bound (RIGHT, p2); } + +MAKE_SCHEME_CALLBACK (Spanner,set_spacing_rods,1); +SCM +Spanner::set_spacing_rods (SCM smob) +{ + Grob*me = unsmob_grob (smob); + + Rod r; + Spanner*sp = dynamic_cast (me); + r.item_l_drul_[LEFT] = sp->get_bound (LEFT); + r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT); + r.distance_f_ = + gh_scm2double (me->get_grob_property ("minimum-length")) + * 1.0; + + r.add_to_cols (); + return SCM_UNSPECIFIED; +} diff --git a/lily/tie.cc b/lily/tie.cc index d465ae8b66..58ef8d549b 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -278,27 +278,6 @@ Tie::get_control_points (SCM smob) return controls; } -MAKE_SCHEME_CALLBACK (Tie,set_spacing_rods,1); - -/* - TODO: set minimum distances for begin/end of line - */ -SCM -Tie::set_spacing_rods (SCM smob) -{ - Grob*me = unsmob_grob (smob); - Spanner*sp = dynamic_cast (me); - Rod r; - - r.item_l_drul_ [LEFT]=sp->get_bound (LEFT); - r.item_l_drul_ [RIGHT]=sp->get_bound (RIGHT); - - r.distance_f_ - = gh_scm2double (me->get_grob_property ("minimum-length")) - * 1.0; - r.add_to_cols (); - return SCM_UNSPECIFIED; -} MAKE_SCHEME_CALLBACK (Tie,brew_molecule,1); SCM diff --git a/ly/property.ly b/ly/property.ly index 5a413798b6..ea608e9874 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -126,8 +126,8 @@ autoBeamOn = \property Voice.noAutoBeaming = ##f emptyText = \property Voice.textNonEmpty = ##f fatText = \property Voice.textNonEmpty = ##t -showStaffSwitch = \property Thread.followThread = ##t -hideStaffSwitch = \property Thread.followThread = ##f +showStaffSwitch = \property PianoStaff.followVoice = ##t +hideStaffSwitch = \property PianoStaff.followVoice = ##f % To remove a Volta bracet or some other graphical object, diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 8fbb605e0a..dac8402f06 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.140 -Entered-date: 19MAR01 +Version: 1.3.141 +Entered-date: 22MAR01 Description: @BLURB@ 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.140.tar.gz + 1000k lilypond-1.3.141.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.140.tar.gz + 1000k lilypond-1.3.141.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index d67cd24b4c..a75b14238b 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.3.140 +Version: 1.3.141 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.140.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.141.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif diff --git a/midi2ly/include/mudela-column.hh b/midi2ly/include/mudela-column.hh deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/include/mudela-item.hh b/midi2ly/include/mudela-item.hh deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/include/mudela-score.hh b/midi2ly/include/mudela-score.hh deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/include/mudela-staff.hh b/midi2ly/include/mudela-staff.hh deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/include/mudela-stream.hh b/midi2ly/include/mudela-stream.hh deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/include/mudela-voice.hh b/midi2ly/include/mudela-voice.hh deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/mudela-column.cc b/midi2ly/mudela-column.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/mudela-item.cc b/midi2ly/mudela-item.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/mudela-score.cc b/midi2ly/mudela-score.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/mudela-staff.cc b/midi2ly/mudela-staff.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/mudela-stream.cc b/midi2ly/mudela-stream.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/midi2ly/mudela-voice.cc b/midi2ly/mudela-voice.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/BachJS/BWV1042/GNUmakefile b/mutopia/BachJS/BWV1042/GNUmakefile deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile b/mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/BachJS/BWV772/GNUmakefile b/mutopia/BachJS/BWV772/GNUmakefile deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile b/mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/BachJS/GNUmakefile b/mutopia/BachJS/GNUmakefile deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile b/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-cello.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/mutopia.make b/mutopia/mutopia.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/bassi-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/bassi-part.ly deleted file mode 100644 index b46724270a..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/bassi-part.ly +++ /dev/null @@ -1,14 +0,0 @@ -\version "1.3.141"; - -instrument = "Violoncello and Contrabass" - -\include "header.ly" -\include "global.ly" -\include "bassi.ly" - -\score{ - \bassiGroup - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/bassi.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/bassi.ly deleted file mode 100644 index 97211610bb..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/bassi.ly +++ /dev/null @@ -1,56 +0,0 @@ -\version "1.3.141"; - -\include "violoncello.ly" -\include "contrabasso.ly" - -%{ -bassiGroup = \context PianoStaff = bassi_group \notes < - \staffCombinePianoStaffProperties - \context Staff=oneBassi { - \property Staff.midiInstrument = #"cello" - \property Staff.instrument = #'(lines - "Violoncello" " e" "Contrabasso") - - \property Staff.instr = #"Vc." - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - \global - } - \context Staff=twoBassi { - \property Staff.midiInstrument = #"contrabass" - \property Staff.instrument = #"Contrabasso" - \property Staff.instr = #"Cb." - \property Staff.transposing = #-12 - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - \global - } - \context Staff=oneBassi \partcombine Staff - \context Voice=oneBassi \violoncello - \context Voice=twoBassi \contrabasso -> -%} - -bassiGroup = \context PianoStaff = bassi_group \notes < - \context Staff=violoncelloStaff < - \property Staff.midiInstrument = #"cello" - \property Staff.instrument = #"Violoncello " - \property Staff.instr = #"Vc. " - \clef "bass"; - \global - \violoncello - > - \context Staff=contrabassoStaff < - \property Staff.midiInstrument = #"contrabass" - \property Staff.instrument = #"Contrabasso " - \property Staff.instr = #"Cb. " - \property Staff.transposing = #-12 - \clef "bass"; - \global - \contrabasso - > -> diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetti-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetti-part.ly deleted file mode 100644 index f560ed6b4e..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetti-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.141"; - -instrument = "Clarinet" - -\include "header.ly" -\include "global.ly" -\include "clarinetti.ly" - -\score{ - \clarinettiStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetti.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetti.ly deleted file mode 100644 index 9b8be580a4..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetti.ly +++ /dev/null @@ -1,22 +0,0 @@ - -\version "1.3.141"; - -\include "clarinetto-1.ly" -\include "clarinetto-2.ly" - -clarinettiStaff = \context Staff = clarinetti < - \property Staff.midiInstrument = #"clarinet" - - \property Staff.instrument = #`("Clarinetti in B" ,text-flat) - - \property Staff.instr = #`(lines "Cl." (rows "(B" ,text-flat ")")) - \property Staff.transposing = #-2 - - \Time - \notes { \key f \major; } - \End - \context Voice=one \partcombine Voice - \context Thread=one \clarinettoI - \context Thread=two \clarinettoII -> - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetto-1.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetto-1.ly deleted file mode 100644 index c73f508a47..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetto-1.ly +++ /dev/null @@ -1,240 +0,0 @@ - -\version "1.3.141"; - -clarinettoI = \notes \relative c { - R1 *2| - d''4-.\ff r r2| - R1 *3| - e4-. r r2| - R1 *3| - f4-. r r2| - R1| - f4-. r r2| - e4-. r r2| - R1 *4| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes2\p\< ( a| - )gis2. \!a4-.\f| - R1*13| - d1\ff ~| - d4(f, bes)a| - a'4. r8 a4. r8| - g4. r8 d4. r8| - d4. r8 bes4. r8| - c4. r8 d4. r8| - f2\sf r| - f\sf r| - e\sf r| - e\sf r| - es1\sf| - d\sf| - c2. c4\sf| - c2. c4\sf| - c2. c4\sf| - c2. c4\sf| - c4 r r2| - R1*5| - \property Voice.crescendoText = #'(lines " " "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,| - d1~| - d\pp~| - d~| - d~| - d| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes2.\<( c4| - bes a fis)d| - \!d'2\ff f| - e1~| - e4\p r r2| - R1*11| - f2.\ff()e4| - d(c d)c| - f2.()e4| - d(c d)c| - bes2.()a4| - g(f g)f| - bes2.()a4| - g(f g)f| - r r8 bes bes4\sf()c| - r r8 bes bes4\sf()c| - r r8 bes bes4\sf()c| - r r8 bes bes4\sf()c| - bes2 b| - e a,| - d1~| - d| - d4 r f r| - d r e r| - a,\p r r2| - r r4 r8 e'\f| - e4 r r2| - r r4 r8 e| - e4 r r2| - R1*3| - c4\f r b r| - a r g r| - f r a r8 c| - c4 r8 e e4 r8 e| - e1~| - e| - e4. e8 e4 r8 e| - e4 r8 e e4 r8 e| - e4\p r r2| - R1*3| - r4 r8 es d4 r8 a| - bes4 r r2| - r4 r8 es d4 r8 a| - fis4 r r2| - R1*3| - r4 r8 g'8 f4 r8 c| - d4 r r2| - R1*2| - r4 r8 as'-"cresc" g4 r8 d| - es4 r r2| - R1*5| - g,4 r r r8 f| - es4 r r r8 d| - c4 r8 c' c4 r8 c| - c4 r8 c c4 r8 c| - R1*4| - bes4\ff r8 es d4 r8 a| - g4 r8 c bes4 r8 f| - es4 r8 a g4 r8 bes| - a4 r8 a a4 r8 a| - g4 r r2| - R1| - es'4-.\ff r r2| - R1*3| - e2\sf r| - e\sf r| - R1*3| - a,2\ff r| - a\ff r| - R1*2| - r2 r4 es'\ff(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e4 r r2| - R1*9| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - fis2.\p\<(g4| - fis e cis)a| - \!a2\ff c| - b1~| - b4\pp r r2| - R1*5| - b2\ff d| - cis1~| - cis\p~| - cis~| - cis~| - cis| - d2.\f(\>c4| - \!c\p bes2)a4| - R1| - r2 r4 d(| - )cis r r2| - r r4 r8 cis| - \property Voice.crescendoText = #'(lines " " "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| - cis(d cis)d| - cis2.\ff()d4| - cis(d cis)d| - es2.()d4| - c(bes c)bes| - es2.()d4| - c(bes c)bes| - r2 es4\sf()d| - r2 es4\sf()d| - r2 es4\sf()d| - r2 es4\sf()d| - es2 cis| - d b| - cis d| - e d| - cis4 r bes r| - g r a r| - d,\p r r2| - r r4 r8 a'\f| - a4 r r2| - r r4 r8 a\f| - a4 r r2| - R1*3| - f'4\f r8 bes a4 r8 e| - d4 r8 g f4 r8 c| - bes4 r r2| - R1*11| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - f'2.\p\<(g4| - f e cis)a| - a1| - \!bes\f~| - bes| - c\f~| - c\p| - d\f~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d\p\<~| - d~| - d~| - d~| - \!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| - a4. bes8 a4. g'8| - f4. cis8 d4. bes8| - a4. bes8 a4. g'8| - f4 r8 e f4 r8 cis| - d4 r8 cis d4 r8 cis| - d1~| - d| - d4-. r r2| - R1| - d1~ d| - e4-. r r2| - R1| - d1~| - d| - f4-. e-. r2| - R1| - d4-. d-. r2| - d4-. d-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - d4\> r e r| - R1| - \!a,4\p r r2| - R1| - a4 r r2| - R1| - d,4\pp r r2| - R1*18| -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetto-2.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetto-2.ly deleted file mode 100644 index 9f736516f2..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/clarinetto-2.ly +++ /dev/null @@ -1,205 +0,0 @@ - -\version "1.3.141"; - -clarinettoII = \notes \relative c { - R1*2 bes''4-.\ff r r2| - R1*3| - cis4-. r r2| - R1 *3| - d4-. r r2| - R1| - d4-. r r2| - cis4-. r r2| - R1 *5| - r2 r4 cis,4-.| - R1*13| - g'1\ff ~| - g4( f g)f| - a4. r8 a4. r8| - e'4. r8 a,4. r8| - a4. r8 g4. r8| - a4. r8 bes4. r8| - d2\sf r| - d\sf r| - cis\sf r| - cis\sf r| - c1\sf| - b| - g2. as4\sf| - g2. as4\sf| - g2. as4\sf| - g2. as4\sf| - g4 r r2| - R1*11| - c2\ff es,| - d1~| - d\p~| - d~| - d~| - d| - %a deux| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes'2.\<(c4| - bes a fis)d| - \!d'2\ff f,| - e1~| - e4\p r r2| - R1*11| - f2.\ff()e4| - d'(c d)c| - f,2.()e4| - d'(c d)c| - R1*4| - r4 r8 f, f4\sf()a| - r4 r8 f f4\sf()a| - r4 r8 f f4\sf()a| - r4 r8 f f4\sf()a| - bes2 gis| - a fis| - g f| - b a| - gis4 r f r| - d r e r| - a,\p r r2| - r r4 r8 b'\f| - c4 r r2| - r r4 r8 b\f| - c4 r r2| - R1*3| - %a deux; urg| - c4\f r b r| - a r g r| - f r a r8 a| - a4 r8 e e4 r8 e| - c'1~| - c| - c4. c8 c4 r8 c| - c4 r8 c c4 r8 c| - c4\p r r2| - R1*21| - %a deux; urg| - g4\f r r r8 f| - es4 r r r8 d| - c4 r8 fis g4 r8 g| - a4 r8 a a4 r8 a| - R1*4| - %a deux| - bes4\ff r8 es d4 r8 a| - g4 r8 c bes4 r8 f| - es4 r8 a g4 r8 g| - g4 r8 g fis4 r8 fis| - g4 r r2| - R1| - c4-.\ff r r2| - R1*3| - g2\sf r| - g\sf r| - R1*3| - fis2\ff r| - fis\sf r| - R1*2| - r2 r4 es4\ff(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e4 r r2| - R1*9| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - fis2.\p\<( g4| - fis e cis)a| - %a deux; urg| - \!a'2\ff c| - b1~| - b4 r r2| - R1*5| - b2\ff d| - cis1~| - cis4\p r r2| - R1*13| - e,2.\ff()f4| - g(f g)f| - e2.\ff()f4| - g(f g)f| - es2.()d4| - c(bes c)bes| - es2.()d4| - c(bes c)bes| - r2 es'4\sf()d| - r2 es4\sf()d| - r2 es4\sf()d| - r2 es4\sf()d| - bes2 a~| - a g~| - g bes~| - bes g| - %a deux; urg| - g4 r bes r| - g r a r| - d,\p r r2| - r r4 r8 e\f| - f4 r r2| - r r4 r8 e\f| - f4 r r2| - R1*3| - f4\f r8 bes a4 r8 e| - d4 r8 g f4 r8 c| - bes4 r r2| - R1*14| - bes'1\f~| - bes4\p r r2| - %a deux; urg| - c1\f~| - c\p| - a1\f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d,\p\<~| - d~| - d~| - d~| - \!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| - a4. bes8 a4. g'8| - f4. cis8 d4. bes8| - a4. bes8 a4. g'8| - f4 r8 cis d4 r8 e,| - f4 r8 e f4 r8 e| - d1~| - d| - bes'4-. r r2| - R1| - d,1~| - d| - cis'4-. r r2| - R1| - d,1~| - d| - d'4-. cis-. r2| - R1| - a4-. c-. r2| - bes4-. c-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - bes4\> r a r| - R1| - \!a4\p r r2| - R1| - g4 r r2| - R1| - d4\pp r r2| - R1*18| -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/contrabasso.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/contrabasso.ly deleted file mode 100644 index f4b7aa04e8..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/contrabasso.ly +++ /dev/null @@ -1,401 +0,0 @@ - -\version "1.3.141"; - -contrabasso = \notes \relative c { - % copied 21 from cello - c1\ff~| - c| - f,4-. r r2| - R1| - c'1~| - c| - f,4-. r r2| - R1| - c'1~| - 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 = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c'4.\< c8 bes4. bes8| - - %20 - as4. as8 \!g4\f r4| - R1| - - bes,4\p r4 r2| - bes4 r4 r2| - bes4 r4 r2| - %25 - R1| - - % copied 14 from cello - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes'4.\< 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| - %40 - fis2\sf r| - fis2\sf r| - f2\sf r| - f2\sf r| - e2\sf r| - %45 - es2\sf r| - des2. es4\sf| - d2. es4\sf| - d2. es4\sf| - d2. es4\sf| - % 50 - d4 r r2| - R1 - es'4\p r r r8 es(| - )as,4 r r r8 as(| - )g4 r r r8 g(| - )d'4 r r r8 d(| - \property Voice.crescendoText = #'(lines " " "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| - 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(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )f4\< r r r8 f(| - )bes4 r r r8 bes(| - %70 - \!)as2\ff g| - fis d'| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g,4\p\< r r r8 g(| - )c4 r r r8 c(| - % ) { s2 s4 \!s8}>| - \!)b1\sf| - %75 - % copied 3 from cello - c4\p r d r| - es r d r| - c r cis r| - d4\pp r d r| - d r d r| - %80 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d r d\< r| - d r d r| - d r d r| - d r d r| - % copied 8 from cello - \!c'2.\ff()bes4| - %85 - a(g a)g| - c2.()bes4| - a(g a)g| - f2.()es4| - d(c d)c| - %90 - f2.()es4| - d(c d)c| - c4 r r2| - c4 r r2| - c4 r r2| - %95 - c4 r r2| - % copied 6 from cello| - c4. 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| - g,4\p r r2| - r2 r4 r8 fis\f| - %105 - g4 r r2| - r2 r4 r8 fis\f| - g4 r r2| - R1*3| - % copied 8 from cello - %110 - [g'8: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:]| - g,,2 ~ g4. g8| - %115 - g2 ~ g4. g8| - g4. g8 g4 r8 g| - g4. g8 g4 r8 g| - g4\p r r2| - % urg, this is *rest*, not skip: - % need own staff for rests, mustn't collapse to one cello staff - %120 - 1 - R1*21| - % copied 4 frorm cello - [des'8\f f a bes][c, es g as]| - [bes,8:8 des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c: e: g: c:]| - f,4\p r r2| - R1*3| - % copied 10 from cello| - [f8:\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 - %155 - R1| - f'1\ff ~| - f| - b,2\sf r| - b2\sf r| - %160 - R1*3| - bes2\ff r| - bes2\sf r| - R1*2| - r2 r4 bes\ff(| - )as2. bes4\sf(| - )as2. bes4\sf(| - )as2. bes4\sf(| - )as2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b4 r r2| - R1| - c4\p r r r8 c(| - )f,4 r r r8 f(| - %180 - )e4 r r r8 e(| - )b'4 r r r8 b(| - \property Voice.crescendoText = #'(lines " " "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'| - 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(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )d4\< r r r8 d(| - - %195 - )g,4 r r r8 g(| - \!)d2\ff e'| - dis b| - e4\p r r r8 es(| - )a,4 r r r8 a(| - )g1| - - %200 - f| - % copied 18 from cello - es'4\fp r e r| - f r g r| - as r g r| - f r fis r| - - %205 - g r g r| - g r g r| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g r g\< r| - g r g r| - - %210 - g r g r| - g r g r| - \!f2.\ff()es4| - d( c d )c| - f2.\ff()es4| - - %215 - d( c d )c| - bes2.\ff()as4| - g( f g )f| - bes2.\ff()as4| - g( f g )f| - - %220 - f4 r r2| - f'4 r r2| - f4 r r2| - f4 r r2| - % copied 6 from cello| - 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| - c4\p r r2| - r2 r4 r8 b\f| - c4 r r2| - r2 r4 r8 b\f| - %235 - c4 r r2| - R1*3| - - %copied 59 from cello - [c8\f es g as][bes, d fis g]| - - %240 - [as, c e f][g, bes d es]| - 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(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c4\< r r r8 c(| - )f4 r r r8 f,(| - )es1| - - %255 - \!ges\f| - f\p| - as\f| - g\p| - bes\f| - - %260 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as4.\p\< as'8 g4. g8| - f4. f8 es4. es8| - as4. as8 g4. g8| - f4. f8 es4. es8| - \!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| - b,4. b'8 b2\sf| - - %270 - [c,8-"sempre"\ff b c d][es 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| - f,4-. r r2| - R1| - - %280 - c'1 ~| - c| - f,4-. r r2| - R1| - c'1 ~| - - %285 - c| - fis4-. f-. r2| - R1| - es4-. e-. r2| - f,4-. g-. r2| - - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - as4\> r b r| - R1| - \!c4\p r r2| - R1| - g4-#'((font-shape . upright) "pizz.") r r2| - - %295 - R1| - c4 r r2| - r2 r4 g| - c r r2| - r2 r4 g| - - %300 - c r r2| - R1| - g4 r r2| - R1| - c4 r r2| - - %305 - R1| - g4 r r2| - R1*3| - - %310 - c4\pp r r2| - R1| - c4 r r2| - c4 r r2| - c4 r r2| -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-midi.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-midi.ly deleted file mode 100644 index 53856a450f..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-midi.ly +++ /dev/null @@ -1,4 +0,0 @@ -\version "1.3.141" -\midi{ - \tempo 4 = 150; -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-paper.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-paper.ly deleted file mode 100644 index 5882cf47f6..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-paper.ly +++ /dev/null @@ -1,66 +0,0 @@ -\version "1.3.141" -\paper { - \paperSixteen - - % Fine for my a4 laserprinter: - %textheight = 285.0\mm; - %linewidth = 190.0\mm; - - % Mandatory Mutopia settings: - textheight = 270.0\mm; - linewidth = 180.0\mm; - indent = 30.\mm; - - \translator { - \ThreadContext - \consists "Rest_engraver"; - - % Set value for engraver at thread level, - % to override the default that is set in ScoreContext - % for added engraver at Voice level - %%% devNullThread = #'() - } - \translator { - \VoiceContext - \remove "Rest_engraver"; - - % The staff combine (bassi part) needs a - % thread_devnull_engraver here. Why? - % Instead of maintaining two separate hierarchies, - % we switch add it, but switch it off immediately. - % --> move to Score level to be able to override - % The staff combine part switches it on. - - %% devNullThread = #'never - %%%\consists "Thread_devnull_engraver"; - - % While adds brings back rests of second voice, - % it prints some on the bar lines and it is messy - % because collisions don't work. Also, it increases - % memory usage from 91M RSS, to 116M. - \consists "Multi_measure_rest_engraver"; - \consists "Bar_engraver"; - } - \translator { - \HaraKiriStaffContext - - \consists "Mark_engraver"; - MultiMeasureRest \override #'minimum-width = #6 - \remove "Multi_measure_rest_engraver"; - \remove "Bar_engraver"; - } - \translator { - \OrchestralScoreContext - % skipBars = ##t - - soloText = #"I." - soloIIText = #"II." - % By default, turn off the Thread_devnull_engraver - % at Voice level - %%%devNullThread = #'never - - TimeSignature \override #'style = #'C - BarNumber \override #'padding = #3 - RestCollision \override #'maximum-rest-count = #1 - } -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-part-paper.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-part-paper.ly deleted file mode 100644 index 1250688b1c..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan-part-paper.ly +++ /dev/null @@ -1,64 +0,0 @@ -\version "1.3.141" -\paper { - %\paperSixteen - - % Fine for my a4 laserprinter: - %textheight = 285.0\mm; - %linewidth = 190.0\mm; - - % Mandatory Mutopia settings: - textheight = 270.0\mm; - linewidth = 180.0\mm; - - \translator { - \ThreadContext - \consists "Rest_engraver"; - - % Set value for engraver at thread level, - % to override the default that is set in ScoreContext - % for added engraver at Voice level - %%%devNullThread = #'() - } - \translator { - \VoiceContext - \remove "Rest_engraver"; - - % The staff combine (bassi part) needs a - % thread_devnull_engraver here. - % Instead of maintaining two separate hierarchies, - % we switch add it, but switch it off immediately. - % --> move to Score level to be able to override - % The staff combine part switches it on. - - %% devNullThread = #'never - %%%\consists "Thread_devnull_engraver"; - - \consists "Multi_measure_rest_engraver"; - \consists "Bar_engraver"; - } - % We need the HaraKiri staff for Staff Combining, - % but we better remove the Instrument_name_engraver. - \translator { - \HaraKiriStaffContext - - \consists "Mark_engraver"; - \remove "Instrument_name_engraver"; - - \remove "Multi_measure_rest_engraver"; - \remove "Bar_engraver"; - } - \translator { - \OrchestralScoreContext - skipBars = ##t - - soloText = #"I." - soloIIText = #"II." - % By default, turn off the Thread_devnull_engraver - % at Voice level - %%%devNullThread = #'never - - TimeSignature \override #'style = #'C - BarNumber \override #'padding = #3 - RestCollision \override #'maximum-rest-count = #1 - } -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan.ly deleted file mode 100644 index 69a0f2bfa1..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/coriolan.ly +++ /dev/null @@ -1,66 +0,0 @@ -\version "1.3.141"; - -instrument = "Orchestra" -% instrument = "" - -\include "header.ly" -\include "global.ly" - -\include "paper16.ly" - -\include "bassi.ly" -\include "clarinetti.ly" -\include "corni.ly" -\include "fagotti.ly" -\include "flauti.ly" -\include "oboi.ly" -\include "timpani.ly" -\include "trombe.ly" -\include "viole.ly" -\include "violino-1.ly" -\include "violino-2.ly" - - -legniGroup = \context StaffGroup = legni_group < - \flautiStaff - \oboiStaff - \clarinettiStaff - \fagottiStaff -> - -ottoniGroup = \context StaffGroup = otonni_group < - \corniStaff - \trombeStaff -> - -timpaniGroup = \context StaffGroup = timpani_group < - \timpaniStaff - % Force a staff bracket (?) - \context Staff = timpany \End -> - -violiniGroup = \context GrandStaff = violini_group < - \violinoIStaff - \violinoIIStaff -> - -archiGroup = \context StaffGroup = archi_group < - \violiniGroup - \violeGroup - \bassiGroup -> - - -\score{ - < - \legniGroup - \ottoniGroup - \timpaniGroup - \archiGroup - > - \header{ - instrument = ""; - } - \include "coriolan-paper.ly" - \include "coriolan-midi.ly" -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/corni-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/corni-part.ly deleted file mode 100644 index d451da4e92..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/corni-part.ly +++ /dev/null @@ -1,16 +0,0 @@ - -\version "1.3.141"; - -instrument = "French Horn" - -\include "header.ly" -\include "global.ly" -\include "corni.ly" - -\score{ - \corniStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/corni.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/corni.ly deleted file mode 100644 index 86bb724161..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/corni.ly +++ /dev/null @@ -1,21 +0,0 @@ - -\version "1.3.141"; - -\include "corno-1.ly" -\include "corno-2.ly" - -corniStaff = \context Staff = corni < - \property Staff.midiInstrument = #"french horn" - - \property Staff.instrument = #`(rows "Corni in E" ,text-flat) - - \property Staff.instr = #`(lines "Cor." (rows "(E" ,text-flat ")")) - \property Staff.transposing = #3 - \Time - \notes { \key c \major; } - \End - \context Voice=one \partcombine Voice - \context Thread=one \cornoI - \context Thread=two \cornoII -> - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/corno-1.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/corno-1.ly deleted file mode 100644 index fb43604860..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/corno-1.ly +++ /dev/null @@ -1,205 +0,0 @@ - -\version "1.3.141"; - -cornoI = \notes \relative c { - R1*2| - f''4-.\ff r r2| - R1*3| - f4-. r r2| - R1*3| - c4-. r r2| - R1| - e4-. r r2| - e4-. r r2| - R1*5| - r2 r4 e4-.\f| - R1*6| - r4 g-.\f r2| - R1*2| - % `a 2 - \property Voice.crescendoText = #'(lines " " "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 % ~| - f4 ( e f )e - e4. r8 e4. r8| - e4. r8 e4. r8| - e4. r8 d4. r8| - g4. r8 f4. r8 - c2 \sf r2 - c2 \sf r2 - R1*2 - e1\sf - c1\sf - g2. g4\sf - g2. g4\sf - g2. g4\sf - g2. g4\sf - g r4 r2| - R1| - g\p~| - g~| - g~| - g~| - g~| - g~| - g~| - g~| - g~| - g| - g2\ff d'2 e1| - R1*20| - c2. \ff e4| - r4 e r e c2. e4 r4 e r e| - f2. e4| - e e e e| - f2. e4| - e e e e| - r4 r8 c8 c2\sf| - r4 r8 c8 c2\sf| - r4 r8 c8 c2\sf| - r4 r8 c8 c2\sf | - c4 r4 c r| -| - e4 r e r| - r2 e4 r| - r2 e4 r| -| - R1*4 | - e4\f r4 r2 R1| - e4\f r4 r2| - R1*3| - e4\f r8 e e4 r8 e| -| - e4 r8 e e4 r8 e| -| - e4 r8 e g4 r8 g| -| - g4 r8 g8 r2| - g1~| - g| - g4. g8 g4 r8 g| -| - g4 r8 g8 g4 r8 g8| - g4\p r4 r2| - R1*21| - d4\f r4 r2| - g4 r r2| - g4 r8 g g4 r8 g| -| - g4 r8 g g4 r8 g| -| - f4\p r4 r2| -| - R1*3| - f4 r e r| - d r c r| - g' r f r| - e r e r| - d r r2| -| - R1| - d4-.\ff r4 r2| - R1*3| - f2\sf r2 f2 \sf r2| - R1*3| - e2\ff r2 e \sf r2| - R1*3| - d2.\ff r4| - d2. r4| - d2. r4| - d2. r4| - e2. r4| - e2. r4| - e2. r4| - e2. r4| - e4 r4 r2| - R1*11| - e2 d2| - R1*17| - r4 r8 e,8 e4. e8| - r4 r8 e8 e4. e8| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 e8\< e4. e8| - r4 r8 e8 e4. e8| - r4 r8 e8 e4. e8| - r4 r8 e8 e4. e8| - \!f'2.\ff e4| - d e d e| - f2. e4| - d e d e| - g2. f4| - g f g f | - g2. f4| - g f g f | - r4 r8 f f2| - r4 r8 f f2| - r4 r8 f f2| - r4 r8 f f2 | - f2 e~| - e d~| - d1 ~ d1| - d4 r4 f r| - d r e r| - R1| - r2 r4 r8 e\f| - e4 r4 r2| - r2 r4 r8 e8| - e4 r r2| - R1*3| - %a deux| - c4\f r e r| - d r c r| - d r r2| - R1| - e1\p~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e\<~| - e~| - e| - %a deux| - \!c\f| - d\p| - d\f| - e\p| - e\f| - d4\p r r2| - R1*3| - %a deux| - d\ff| - d| - e| - e| - f| - e| - e4.-"sempre"\ff e8 e4. e8| - e4. e8 e4. e8| - e4. e8 e4. e8| - e4. e8 e4. e8| - e4 r8 e e4 r8 e| - e4 r8 e e4 r8 e| - R1*2| - d4-. r r2| - R1*3| - f4-. r r2| - R1*5| - %a deux| - e4-. e-. r2| - d4-. e-. r2| - R1*25| -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/corno-2.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/corno-2.ly deleted file mode 100644 index d460dc2e42..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/corno-2.ly +++ /dev/null @@ -1,219 +0,0 @@ - -\version "1.3.141"; - -cornoII = \notes \relative c { - R1*2| - d''4-.\ff r r2| - R1*3| - d4-. r r2| - R1*3| - c4-. r r2| - R1| - e,4-. r r2| - e4-. r r2| - R1*5| - r2 r4 e4-.\f| - R1*6| - r4 g-.\f r2| - R1*2| - % `a 2 - % urg, yes this is a-deux, but lily doesn't know about I. / a2 yet. - \property Voice.crescendoText = #'(lines " " "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 ~| - d4(e d)c| - d4. r8 c4. r8| - e,4. r8 e4. r8| - e'4. r8 d4. r8| - e,4. r8 d'4. r8| - c2\sf r| - c\sf r| - R1*2| - e1\sf| - c,\sf| - g2. g4\sf| - g2. g4\sf| - g2. g4\sf| - g2. g4\sf| - g4 r r2| - R1| - g1\p~| - g1~| - g1~| - g1~| - g1~| - g1~| - g1~| - g1~| - g1~| - g1| - g2\ff d''| - e1| - R1*20| - c2.\ff e,4| - r e r e| - c'2. e,4| - r e r e| - d'2. c4| - d c d c| - d2. c4| - d c d c| - %a deux| - r r8 c c2\sf| - r4 r8 c c2\sf| - r4 r8 c c2\sf| - r4 r8 c c2\sf| - c4 r c r| - e, r e r| - r2 c'4 r| - r2 c4 r| - R1*4| - e,4\f r r2| - R1| - e4\f r r2| - R1*3| - e4\f r8 e e4 r8 e| - e4 r8 e e4 r8 e| - e'4 r8 e e4 r8 e| - e4 r8 e r2| - e1~| - e~| - e4. e8 e4 r8 e| - e4. e8 e4 r8 e| - e4\p r r2| - R1*21| - d4\f r r2| - g,4 r r2| - g4 r8 g g4 r8 g| - g4 r8 g e'4 r8 e| - d4\p r r2| - R1*3| - d4\ff r c r| - d r c r| - g r d' r| - d r e r| - d4 r r2| - R1| - g,4-.\ff r r2| - R1*3| - d'2\sf r| - d2\sf r| - R1*3| - e2\ff r| - e2\sf r| - R1*3| - %a deux| - d2.\ff r4| - d2. r4| - d2. r4| - d2. r4| - e2. r4| - e2. r4| - e2. r4| - e2. r4| - e4 r r2| - R1| - e,1\p~| - e~| - e~| - e~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e\<~| - e~| - e~| - e~| - e~| - e| - \!e2\ff d'| - R1*17| - %a deux| - r4 r8 e,\p e4. e8| - r4 r8 e e4. e8| - \property Voice.crescendoText = #'(lines " " "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 c d c| - d2.\ff c4| - d c d c| - g2. d'4| - g, d' g, d'| - g,2. d'4| - g, d' g, d'| - r4 r8 d d4\sf()es| - r4 r8 d d4\sf()es| - r4 r8 d d4\sf()es| - r4 r8 d d4\sf()es| - d2 d| - %a deux| - e d~| - d1~| - d| - %a deux| - d4 r f r| - d r e r| - R1| - r2 r4 r8 e,\f| - e4 r r2| - r2 r4 r8 e\f| - e4 r r2| - R1*3| - %a deux| - c'4\f r e r| - d r c r| - d r r2| - R1| - e,1\p~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e\<~| - e~| - e| - %a deux| - \!c'1\f| - d\p| - d\f| - e\p| - e\f| - d4\p r r2| - R1*3| - %a deux; urg: copied corno| - d\ff| - d| - e| - e| - f| - e| - e4.-"sempre"\ff e8 e4. e8| - e4. e8 e4. e8| - e4. e8 e4. e8| - e4. e8 e4. e8| - e4 r8 e, e4 r8 e| - e4 r8 e e4 r8 e| - R1*2| - d'4-. r r2| - R1*3| - d4-. r r2| - R1*5| - %a deux| - e4-. e-. r2| - d4-. e-. r2| - R1*25| -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/fagotti-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/fagotti-part.ly deleted file mode 100644 index 3169f6eebe..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/fagotti-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.141"; - -instrument = "Bassoon" - -\include "header.ly" -\include "global.ly" -\include "fagotti.ly" - -\score{ - \fagottiStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/fagotti.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/fagotti.ly deleted file mode 100644 index b932036ada..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/fagotti.ly +++ /dev/null @@ -1,19 +0,0 @@ - -\version "1.3.141"; - -\include "fagotto-1.ly" -\include "fagotto-2.ly" - -fagottiStaff = \context Staff = fagotti < - \property Staff.midiInstrument = #"bassoon" - \property Staff.instrument = #"Fagotti" - \property Staff.instr = #"Fg." - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - \global - \context Voice=one \partcombine Voice - \context Thread=one \fagottoI - \context Thread=two \fagottoII -> - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/fagotto-1.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/fagotto-1.ly deleted file mode 100644 index 3d1023ccbb..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/fagotto-1.ly +++ /dev/null @@ -1,348 +0,0 @@ - -\version "1.3.141"; - -fagottoI = \notes \relative c { - R1*2| - as'4-.\ff r r2| - R1 *3| - as4-. r r2| - R1*3| - a4-. r r2| - R1| - c4-. r r2| - b4-. r r2| - R1*5| - r2 r4 g4-.\f| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - ges'2\p\< f2 ~| - f4 \!e-.\f r2| - R1| - f2\p()es| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d1\<| - d| - d2 d| - d d| - \!c1\ff ~| - c4(bes as)g| - f4. r8 es4. r8| - b'4. r8 c4. r8| - bes4. r8 as4. r8| - g4. r8 f4. r8| - fis2\sf r| - fis\sf r| - f\sf r| - f\sf r| - e1\sf es\sf| - d2. es4\sf| - d2. es4\sf| - d2. es4\sf| - d2. es4\sf| - d4 r r2| - R1*9| - - \clef "tenor"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #2 - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g'2.(as4 \p\<| - g f d)bes - - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - | - \!bes2\ff as| - g c~| - c1\p~| - c~| - c~| - c~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\<~| - c| - \!c2\ff bes| - a d~| - d1~| - d~| - d2.()f4| - f(es2)d4| - d(c2)bes4| - bes(a bes)g| - fis r8 a\pp a4. a8| - r4 r8 a a4. a8| - \property Voice.crescendoText = #'(lines " " "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| - c(bes c)bes| - es2.()d4| - c(bes c)bes| - d2.()es4| - d( c d)c| - d2.()es4| - d( c d)c| - r r8 c c4\sf()des| - r r8 c c4\sf()des| - r r8 c c4\sf()des| - r r8 c c4\sf()des| - es1| - d2 des| - c1~| - c| - d4 r es r| - c r d r| - g,4\p r r2| - R1*7| - - %% 110| - % copied from cello, copied from viola| - [g8 bes d es][f, a cis d]| - [es,8:8 g: b: c:][d,: f: a: bes:]| - [c,: es: g: a:][cis,: e: g: bes:]| - [d,: g: bes: d:][d,: fis: a: d:]| - g,2 ~ g4. g8| - %115| - g2 ~ g4. g8| - g4. g8 g4 r8 g| - g4 r8 g g4 r8 g| - - g4\p r r2| - - - R1*3| - r4 r8 des' c4 r8 g| - as4 r r2| - r4 r8 des c4 r8 g| - e4 r r2| - R1*3| - r4 r8 f' es4 r8 bes| - \property Voice.crescendoText = #'(lines " " "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| - bes as| - ges f| - )es as,| - - %% 140 copied from cello (from viola)| - [des8\f f a bes][c, es g as]| - [bes,8:8 des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c: e: g: c:]| - - \property Voice.crescendoText = #'(lines " " "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:]| - [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| - des'4 r r2| - R1| - f,1~| - f| - b2\sf r| - b2\sf r| - R1*3| - bes2\ff r| - bes\sf r| - R1*2| - r2 r4 e,4\ff(| - )f2. e4\sf(| - )f2. e4\sf(| - )f2. e4\sf(| - )f2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g4 r r2| - R1| - g,1\p~| - g~| - g~| - g| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e''2.(\()bes4| - \!bes\p(as2)g4| - g'4(f2)es4| - es(d es)c| - b r8 d\p d4. d8| - r4 r8 d d4. d8| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 es\< es4. es8| - r4 r8 es es4. es8| - r4 r8 - - \clef "tenor"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #2 - - - f f4. f8| - r4 r8 g g4. g8 % - - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - - | - \!f2.\ff()es4| - d(c d)c| - f2.\ff()es4| - d(c d)c| - bes2.()as4| - g(f g)f| - bes2.()as4| - g(f g)f| - r r8 des' des4\sf()es| - r r8 des des4\sf()es| - r r8 des des4\sf()es| - r r8 des des4\sf()es| - des2 b| - c a| - b c| - d c| - g4 r as r| - f r g r| - c,4 r r2| - R1*7| - - %%238 copied from cello from viola| - [c8\f es g as][bes, d fis g]| - [as, c e f][g, bes d es]| - - f4 r r2| - - R1*7| - es'2.\p(f4| - es d b)g| - g'2.(as4| - g2)f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es2.\<( f4| - es d b)g| - R1| - \!c1\f| - des\p| - d\f| - es\p| - e\f| - \property Voice.crescendoText = #'(lines " " "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| - r4 r8 as as2\sf| - r4 r8 bes bes2\sf| - r4 r8 bes bes2\sf| - r4 r8 c c2\sf| - r4 r8 d d2\sf| - - %% 270 copied from cello| - [c,8-"sempre"\ff b c d][es 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| - es'4-. d-. r2| - R1| - g,4-. g-. r2| - as4-. bes-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r d r| - R1| - \!c,4\p r r2| - R1| - g4 r r2| - R1| - c4\pp r r2| - \property Voice.decrescendoText = #'(lines " " "sempre pi\\`u piano" " ") - % urg, "" is assumed to be hairpin... - %\property Voice.decrescendoSpanner = #"" - \property Voice.decrescendoSpanner = #'dashed-line - r r4 g\p\>~| - g1~| - g~| - g~| - g~| - g~| - g~| - g~| - g~| - g~| - \!g\>~| - g~| - g| - \!c4\pp r r2| - R1*4| -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/fagotto-2.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/fagotto-2.ly deleted file mode 100644 index 285d95b405..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/fagotto-2.ly +++ /dev/null @@ -1,330 +0,0 @@ - -\version "1.3.141"; - -fagottoII = \notes \relative c { - R1*2| - f4-.\ff r r2| - R1*3| - f4-. r r2| - R1*3| - fis4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - R1*5| - r2 r4 g,4-.| - R1*6| - r4 g'\f r2| - R1*6| - as1\ff ~| - as4(g f)es| - d4. r8 c4. r8| - b4. r8 c4. r8| - bes4. r8 as4. r8| - g4. r8 f4. r8| - fis2\sf r| - fis\sf r| - f\sf r| - f\sf r| - e1\sf| - es\sf| - d2. es4\sf| - d2. es4\sf| - d2. es4\sf| - d2. es4\sf| - d4 r r2| - R1*9| - - \clef "tenor"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #2 - - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g''2.(as4 \p\<| - g f d)bes| - - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - \!g2\ff f| - e c~| - c1\p~| - c~| - c~| - c~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\<~| - c| - \!c2\ff g'| - fis d| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g,4 \p\< r r r8 g(| - )c4 r r r8 c(| - \!)b1\sf\>| - \!c4\p r4 r2| - R1*2| - r4 r8 fis\pp fis4. fis8| - r4 r8 fis fis4. fis8| - \property Voice.crescendoText = #'(lines " " "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| - a(g a)g| - c2.()bes4| - a(g a)g| - b2.()c4| - d,(c d)c| - b'2.()c4| - d,(c d)c| - r4 r8 c'8 c4\sf()des| - r4 r8 c8 c4\sf()des| - r4 r8 c8 c4\sf()des| - r4 r8 c8 c4\sf()des| - c1| - b2 bes| - as g| - fis es| - d4 r es r| - c r d r| - g1\p| - fis| - g\fp| - fis| - g2\fp(f| - es d| - c bes| - )a d| - - %a deux| - %% 110| - % copied from cello, copied from viola| - [g8 bes d es][f, a cis d]| - [es,8:8 g: b: c:][d,: f: a: bes:]| - [c,: es: g: a:][cis,: e: g: bes:]| - [d,: g: bes: d:][d,: fis: a: d:]| - g,,2 ~ g4. g8| - %115| - g2 ~ g4. g8| - g4. g8 g4 r8 g| - g4 r8 g g4 r8 g| - - g'1\p| - - - fis| - g| - f| - e| - f| - e| - c| - f| - e| - f| - g| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as\<| - g| - as| - a| - bes| - c| - - %a deux| - \!des2\p( c| - bes as| - ges f| - )es as,| - - %% 140 copied from cello (from viola)| - [des8\f f a bes][c, es g as]| - [bes,8:8 des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c: e: g: c:]| - - f,4\p r r2| - R1*3| - - % a deux| - %%148 copied from cello (from viola)| - [f8:\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| - R1| - f'1\ff~| - f| - b,2\sf r| - b\sf r| - R1*3| - bes2\ff r| - bes2\sf r| - R1*2| - r2 r4 bes\ff(| - )as2. bes4\sf(| - )as2. bes4\sf(| - )as2. bes4\sf(| - )as2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b4 r r2| - R1| - % a deux| - g1\p~| - g~| - g~| - g~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g\<~| - g~| - g~| - g~| - g~| - g| - \!e'2\ff d| - cis a~| - a1\p~| - a~| - a~| - a~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - a\<~| - a| - \!f'2\ff e| - dis b~| - b1\p| - a\<| - g| - f| - \!es4\f r r2| - R1*3| - r4 r8 b'' b4. b8| - r4 r8 b b4. b8| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 c\< c4. c8| - r4 r8 c c4. c8| - - r4 r8 - \clef "tenor"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #2 - d d4. d8| - r4 r8 es es4. es8| - - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - \!f,2.\ff()es4| - d(c d)c| - f2.\ff()es4| - d(c d)c| - bes2.()as4| - g(f g)f| - bes2.()as4| - g(f g)f| - f4 r r2| - f4 r r2| - f4 r r2| - f4 r r2| - f'2 f| - e es| - d c| - b' as| - % a deux| - g4 r as r| - f r g r| - c,1\p| - b| - c| - b| - c2\fp( bes| - as g| - f es'| - )d g,| - - %a deux| - %%238 copied from cello from viola| - [c8\f es g as][bes, d fis g]| - [as, c e f][g, bes d es]| - - f4 r r2| - - R1*14| - ges\f| - f\p| - as\f| - g\p| - bes\f| - %a deux| - \property Voice.crescendoText = #'(lines " " "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| - r4 r8 f f2\sf| - r4 r8 g g2\sf| - r4 r8 g g2\sf| - r4 r8 as as2\sf| - r4 r8 b b2\sf| - - % a deux| - %% 270 copied from cello| - [c,8-"sempre"\ff b c d][es 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]| - - % a deux| - c1~| - c| - f,4-. r r2| - R1| - c'1~| - c| - f,4-. r r2| - R1| - c'1~| - c| - c'4-. b-. r2| - R1| - es,4-. e-. r2| - f4-. g-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - as4\> r b r| - R1| - %a deux| - \!c,4\p r r2| - R1| - g4 r r2| - R1| - c4\pp r r2| - R1*18| -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/flauti-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/flauti-part.ly deleted file mode 100644 index 729a56f4a3..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/flauti-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.141"; - -instrument = "Flute" - -\include "header.ly" -\include "global.ly" -\include "flauti.ly" - -\score{ - \flautiStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/flauti.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/flauti.ly deleted file mode 100644 index 90d999e78f..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/flauti.ly +++ /dev/null @@ -1,16 +0,0 @@ - -\version "1.3.141"; - -\include "flauto-1.ly" -\include "flauto-2.ly" - -flautiStaff = \notes \context Staff = flauti < - \property Staff.midiInstrument = #"flute" - \property Staff.instrument = #"Flauti" - \property Staff.instr = #"Fl." - \global - \context Voice=one \partcombine Voice - \context Thread=one \flautoI - \context Thread=two \flautoII -> - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/flauto-1.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/flauto-1.ly deleted file mode 100644 index 90d8e66ce1..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/flauto-1.ly +++ /dev/null @@ -1,260 +0,0 @@ - -\version "1.3.141"; - -flautoI = \notes \relative c { - R1 *2| - c'''4-.\ff r r2| - R1 *3| - d4-. r r2| - R1 *3| - es4-. r r2| - R1| - g4-. r r2| - b,4-. r r2| - R1 *4| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r2 g'\p\< (| - )fis2. \!g4-.\f| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r2 f\p\< ~| - f4 \!e-.\f r2| - R1| - f2\p()es| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d1\<| - d1| - d2 d2| - d2 d2| - \!f1\ff ~| - f4(es des)c| - b4. r8 c4. r8| - d4. r8 es4. r8| - e4. r8 f4. r8| - g4. r8 as4. r8| - a2\sf r| - a\sf r| - as\sf r| - as\sf r| - g1\sf| - ges\sf| - f2. ges4\sf| - f2. ges4\sf| - f2. ges4\sf| - f2. ges4\sf| - f4 r r2| - R1*9| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g2.\p\<(f4| - as g d)bes - \!bes2\ff des| - c1~| - c\p~| - c~| - c~| - c~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\<~| - c~| - \!c2\ff es| - d1~| - \property Voice.crescendoText = #'(lines " " "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| - r2 r4 r8 a| - bes4 r r2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r r4 r8 bes\<| - c4 r r r8 c| - d4 r r r8 d| - \!es2.\ff()d4| - fis(g fis)g| - es2.()d4| - fis(g fis)g| - as2.()g4| - b,(c b)c| - as'2.()g4| - b,(c b)c| - r2 es\sf| - r es\sf| - r es\sf| - r es\sf| - es1| - d2 des| - c1~| - c| - c4 r es r| - c r d r| - g,\p r r2| - r r4 r8 a\sf| - bes4 r r2| - r r4 r8 a\f| - bes4 r r2| - R1*3| - bes,4\f r8 es' d4 r 8 a| - g4 r8 c bes4 r8 f| - es4 r8 a g4 r8 g'| - g4 r8 g fis4 r8 fis| - g1~| - g~| - g4 r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g4\p r r2| - R1*3| - r4 r8 des\p c4 r8 g| - as4 r r2| - r4 r8 des c4 r8 g| - e4 r r2| - R1*3| - r4 r8 f' es4 r8 bes| - c4 r r2| - R1*2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 ges'\< f4 r8 c| - \!des4 r r2| - R1*5| - f4 r r r8 es| - des4 r r r8 c| - bes4 r8 e f4 r8 f| - g4 r8 g e4 r8 e| - R1*4| - as,4\ff r8 des8 c4 r8 g| - f4 r8 bes as4 r8 es| - des4 r8 g f4 r8 f'| - f4 r8 f e4 r8 e| - f4 r r2| - R1| - des4-.\ff r r2| - R1*3| - d2\sf r| - d2\sf r| - R1*3| - d2\ff r| - d2\sf r| - R1*2| - r2 r4 des4\ff(| - )c2. des4\sf(| - )c2. des4\sf(| - )c2. des4\sf(| - )c2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d r r2| - R1*9| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e2.\p\<(f4| - e d b )g| - \!g2\ff bes| - a1~a4\p r r2| - R1*3| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - a1\<~| - a| - \!a2\ff c| - b a| - g2.\p( a4| - g fis dis )b| - g'1~| - g| - g4\f r r2| - R1| - r4 f'2\p()es4| - es(d es)d| - b r r2| - R1*5| - as2.\ff()g4| - b(c b)c| - as2.\ff()g4| - b(c b)c| - des2.()c4| - e(f e)f| - des2.()c4| - e(f e)f| - r2 des4\sf()c| - r2 des4\sf()c| - r2 des4\sf()c| - r2 des4\sf()c| - des2 b| - c2 f~| - f f~| - f1| - f4 r as r| - f r g r| - c,\p r r2| - r r4 r8 d\f| - es4 r r2| - r r4 r8 d\f| - es4 r r2| - R1*3| - es4\f r d r| - c r8 f8 es4 r8 bes| - as4-. des4-. r2| - R1*11| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es2.\p\<(f4| - es d b)g| - g1| - \!as\f~| - as\p| - bes\f~| - bes\p| - c1\f~| - c\p~| - c~| - c~| - c~| - c\ff~| - c~| - c~| - c~| - c| - d| - es4.-"sempre"\ff b8 c4. as8| - g4. as8 g4. f'8| - es4. b8 c4. as8| - g4. as8 g4. f'8| - es4 r8 b c4 r8 b| - c4 r8 b c4 r8 b| - c4 r r2| - R1| - c4-. r r2| - R1| - c,~| - c| - d'4 r r2 - R1 - c,~| - c| - es'4-. b-. r2| - R1| - c4-. c4-. r2| - c4-. c4-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r d r| - R1| - \!es4\p r r2| - R1| - d,4 r r2| - R1| - c4\pp r r2| - R1*18 -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/flauto-2.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/flauto-2.ly deleted file mode 100644 index 6539fcdfda..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/flauto-2.ly +++ /dev/null @@ -1,172 +0,0 @@ - -\version "1.3.141"; - -flautoII = \notes \relative c { - R1 *2| - as'''4-.\ff r r2| - R1 *3| - b4-. r r2| - R1 *3| - c4-. r r2| - R1| - es4-. r r2| - d,4-. r r2| - R1 *4| - r2 r2| - r2 r4 b'4-.| - R1*6| - r4 c r2| - R1*6| - c1 ~| - c4( es, des)c| - g'4. r8 g4. r8| - d4. r8 es4. r8| - c'4. r8 c4. r8| - c4. r8 c4. r8| - a2\sf r| - a\sf r| - as\sf r| - as\sf r| - g1\sf| - ges\sf| - f4 bes2.~| - bes4 bes2.~| - bes4 bes2.~| - bes4 bes2.~| - bes4 r r2| - R1*33| - a2.\ff()bes4| - c(bes c)bes| - a2.()bes4| - c(bes c)bes| - b2.()c4| - f,(es f)es| - b'2.()c4| - f,(es f)es| - r2 c'4\sf()bes| - r2 c4\sf()bes| - r2 c4\sf()bes| - r2 c4\sf()bes| - R1| - r2 g2| - as2 c,~| - c1| - c4 r es r| - c r d r| - es,\p r r2| - r r4 r8 d'\f| - d4 r r2| - r r4 r8 d\f| - d4 r r2| - R1*3| - bes4\f r8 es d4 r8 a| - g4 r8 c bes4 r8 f| - es4 r8 a g4 r8 bes'| - bes4 r8 bes a4 r8 a| - bes1~| - bes~| - bes4 r8 bes bes4 r8 bes| - bes4 r8 bes bes4 r8 bes| - bes4\p r4 r2| - R1*21| - f4\f r r r8 es| - des4 r r r8 c| - bes4 r8 bes' bes4 r8 bes| - bes4 r8 bes bes4 r8 bes| - R1*4| - as4\ff r8 des c4 r8 g| - f4 r8 bes as4 r8 es| - des4 r8 g f4 r8 as| - g4 r8 g g4 r8 g| - as4 r r2| - R1| - f4\ff r r2| - R1*3| - d'2\sf r| - d2\sf r| - R1*3| - des2\ff r| - des2\sf r| - R1*35| - e,1(| - )d| - c4\f r r2| - R1*9| - d2.\ff()es4| - b(c b)c| - d2.\ff()es4| - b(c b)c| - g'2.()as4| - bes( as bes)as| - g2.()as4| - bes( as bes)as| - % 220 a deux?| - R1*5| - r2 a| - b c| - d c| - b4 r as r| - f r g r| - c,\p r r2| - r r4 r8 g'\f| - g4 r r2| - r r4 r8 g\f| - g4 r r2| - R1*3| - es4\f r d r| - c r8 f es4 r8 bes| - as4 des r2| - R1*14| - %a deux| - as'1\f~| - as\p| - bes\f~| - bes\p| - c1\f~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\p\<~| - c~| - c~| - c~| - \!c\ff~| - c~| - c~| - c~| - c| - d| - %a deux urg: copied flauto-1(270,277)| - es4.-"sempre"\ff b8 c4. as8| - g4. as8 g4. f'8| - es4. b8 c4. as8| - g4. as8 g4. f'8| - es4 r8 b c4 r8 b| - c4 r8 b c4 r8 b| - c4 r r2| - R1| - as4-. r r2| - R1| - %a deux| - c,1~| - c| - b'4-. r r2| - R1| - %a deux| - c,1~| - c| - es4-. d-. r2| - R1| - c4-. g'-. r2| - as4-. e-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - f4\> r f r| - R1| - \!es4\p r r2| - R1| - b4 r r2| - R1| - c4\pp r r2| - R1*18| -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/global.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/global.ly deleted file mode 100644 index d7fd49b0b7..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/global.ly +++ /dev/null @@ -1,29 +0,0 @@ - -\version "1.3.141"; - -Time = \time 4/4; -Key = \notes { \key es \major; } -End = { \skip 1*314; \bar "|."; } - -global = \notes { - \Time - \Key - \End -} - -staffCombinePianoStaffProperties = { - \property PianoStaff.devNullThread = #'() - \property PianoStaff.soloADue = ##t - \property PianoStaff.soloText = #"" - \property PianoStaff.soloIIText = #"" - % This is non-conventional, but currently it is - % the only way to tell the difference. - \property PianoStaff.aDueText = #"a2" - \property PianoStaff.splitInterval = #'(1 . 0) - \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) - \property PianoStaff.noDirection = ##t -} - -#(set! point-and-click line-column-location) -#(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/header.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/header.ly deleted file mode 100644 index 66b0e52b74..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/header.ly +++ /dev/null @@ -1,192 +0,0 @@ -% Ugh, we need to override some LaTeX titling stuff -\header { - title = "Ouvertüre\\vrule width0pt height 0pt depth 1ex"; - subtitle = "\\normalsize Zu Heinrich Joseph v. Collins Trauerspiel\\vrule width0pt height 0pt depth 1ex"; - subsubtitle = "\\Large\\bf Coriolan"; - opus = "Op. 62"; - piece = "\\hspace*{30mm}\\normalfont\\large Allegro con brio"; - composer = "Ludwig van Beethoven (1770-1827)"; - enteredby = "JCN"; - instrument = \instrument; - - % mutopia headers. - mutopiatitle = "Ouverture Coriolan"; - mutopiacomposer = "L.v.Beethoven (1770-1827)"; - mutopiaopus = "O62"; - mutopiainstrument = \instrument; - date = "1807"; - - source = "Six Great Overtuers in Full Score, Ludwig van Beethoven; Dover - Publications INC, New York (1985). Unabridged republication of - Beethoven's Werke, Ouverturen fuer Orchester: No. 18-21, 26-27; - Breitkopf and Haertel, Leipzig, n.d. \times 1862 { [-1865]."; - - %{ - - i. Six Great Overtuers in Full Score, Ludwig van Beethoven; Dover - Publications INC, New York (1985). Free of copyright and - copyright marks. Reprint. Originally published: Breitkopf and - Haertel, n.d. \times 1862 { [-1865] (Ludwig van Beethoven's Werke; Ser 3) - No. 18-21, 26-27. - M1004.B4097 - ISBN 0-486-24789-9 - - Differences of Mutopia score - - The printed output of this Mutopia score exhibits a number of - differences to the original source i. These differences fall into - two catogaries: changes made by the editor (enteredby), and - automatic changes made by the GNU LilyPond typesetting mechanism. - - a. Changes by the editor - - 1. The old notation of dotted quarter notes on the fourth beat - are modernised to a quarter note, a tie, and an eight note, - ie: - - \partial 4; c4. -> c4 ~ | c8 - - GNU LilyPond 1.3.136 can not handle the old notation. When - this old notation will be supported, it should be fairly - straightforward to find and change these instances. It would - be advisable, however, to keep the current, modern printout, - and document this as a change in b. - - 2. Notes are entered by their name, no efforts were made to - force the printing of reminder accidentals to mimic the - original edition, see b.2,3. - - 3. Empty staffs are removed through the Hara-kiri-staff - mechanism. This change can be undone very easily. - - 4. Margins are changed to Mutopia dictated values. This change - can be undone very easily, however, see b.7. - - b. Automatic changes by the GNU LilyPond typesetting mechanism - - 1. Bar lines are not connected between staff groups. - - 2. Accidentals are not repeated within one bar, in - - \key es\major; b2 b - - only the first b gets an accidental. Note that not in all - cases these accidentals are consistently repeated, however, - they are printed in most cases where the two notes are - more than one note apart. - - 3. Reminder accidentals are not printed, in - - \key es\major; b1 | bes - - no flat is printed with the bes. - - 4. Stem.default-neutral-direction and - Beam.default-neutral-direction are 1 (up). - - 5. Beam-dir-algorithm is 'majority. - - 6. The part combiner prints "I.", "II." and "`a 2." strings - where appropriate. - - 7. Line breaks are calculated. - - 8. GNU LilyPond has bugs that affect the Coriolan, see test - sources in input/bugs/*.ly. - - - Other editions. - - ii. Edition Eulenburg No.626 Coriolan, Overture for Orchestra - Op. 62; Ernst Eulenburg LTD, (not dated). Edited 1936 by - dr. Max Unger from and following score autograph and original - published parts, ie, Stimmen-Drucke N.Simrock Bonn (most - probably from 1807) and Industriekontor Vienna (1807). - - iii. Beethoven's Werke -- Ouverturen fuer Orchester; Breitkopf - u. Haertel, Leipzig (not dated, but very old and worn). - - iv. Beethoven Werke II,1 -- Ouverturen und Wellingtons Sieg; - G. Henle Verlag, Muenchen (1974). Veroeffentlichung des - Beethovenhauses in Bonn. Die ausgabe wurde durch die - Unterstuetzung des Landes Nordrhein-Westfalen ermoeglicht. - - - Background. - - From Overture Coriolan is no Urtext edition available, although - there are Urtext editions of Beethoven's symphonies. - - Edition Eulenburg is the ``first after many years'' that tries to - stay as close to the original text as possible. During the 1900s, - it was customary for editors not to respect the original text and - make any changes they thought necessary. Unger made corrections for - a few ``small and obvious'' inaccuracies. Together with Breitkopf - and Haertel, this is the only score edition to abbreviate (LilyPond - source notation) - - [es16 es g g] [b b c c] - - using the notation - - [es8:16 g: b: c:] - - editions of individual parts by Breitkopf and Haertel use this - common practice abbreviation too. - - Edition Beethoven's Werke by Breitkopf and Haertel comes without any - commentary, copyright mark or date. There are no significant - differences with ed. Unger. The copy was very old and worn, but is - probably younger than ed. Unger. - - Edition Beethoven Werke by G. Henle was a new study based upon the - three main sources, the score autograph, the published parts - Stimmen-Drucke N.Simrock Bonn (most probably from 1807) and - Industriekontor Vienna (1807). They reinforce the assumptions made - by Unger that both published parts were first prints, noting that - both must have worked from a different copy of the autograph (and - not from the autograph itself), and that Simrock's is a bit closer - to the original autograph. This edition is supposed to deviate from - the autograph only in using `modernised notation' for the following - cases (GNU LilyPond source notation), as described by the foreword. - - a. Use dots instead of ties for sustaining of notes when there's no - measure break: - - c4 ~ c8 -> c4. - - We very much doubt this, as the 1862 edition already has this, - but in contrast, has a different change, see i.a.1 above. - - b. Don't repeat accidentals within the same measure: - - \key es \major; b4 c b! c | -> \key es \major; b4 c b c - - We think that also other changes may have been made, see i.b.3 - above. - - c. Start slurring from first tied note, not from second: - - c4 ~ c8 ( d ) e -> c4 ( ~ c8 d ) e - - From these deviations, the third is the only one unique to this - edition, but these are easy to spot and mostly parenthesed; the - other two deviations are standard modern day music notation practice - and thus common to all editions. - - %} - - style = "Classical"; - copyright = "Public Domain"; - maintainer = "Jan Nieuwenhuizen"; - maintainer_email = "janneke@gnu.org"; - lastupdated = "2001/Mar/18"; - mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small - \\\\This music is part of the Mutopia project, - \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset - and placed in the public domain by " + \maintainer + - ".\\\\Unrestricted modification and redistribution is permitted - and encouraged---copy this music and share it.}"; - tagline = \mutopiapublicdomain; - footer = "pre-Mutopia-2001/03/18-57"; -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/instruments.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/instruments.ly deleted file mode 100644 index 66080beedc..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/instruments.ly +++ /dev/null @@ -1,14 +0,0 @@ -\version "1.3.141" -flauti.ly -oboi.ly -clarinetti.ly -fagotti.ly -corni.ly -trombe.ly -timpani.ly -violino-1.ly -violino-2.ly -viola-1.ly -viola-2.ly -violoncello.ly -contrabasso.ly diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/music.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/music.ly deleted file mode 100644 index 4314fc1e34..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/music.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "1.3.141" -flauto-1.ly -flauto-2.ly -oboe-1.ly -oboe-2.ly -clarinetto-1.ly -clarinetto-2.ly -fagotto-1.ly -fagotto-2.ly -corno-1.ly -corno-2.ly -trombo-1.ly -trombo-2.ly -timpani.ly -violino-1.ly -violino-2.ly -viola-1.ly -viola-2.ly -violoncello.ly -contrabasso.ly diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/oboe-1.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/oboe-1.ly deleted file mode 100644 index 8b1104dc88..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/oboe-1.ly +++ /dev/null @@ -1,271 +0,0 @@ - -\version "1.3.141"; - -oboeI = \notes \relative c'' { - R1*2| - as'4-.\ff r r2| - R1*3| - as4-. r r2| - R1*3| - a4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - R1 *4| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as2\p\< ( g| - )fis2. \!g4-.\f| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - ges2\p\< f ~| - f4 \!e\f r2| - R1| - f2\p()es| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d1\<| - d| - d2 d| - d d| - \!f1\ff ~| - f4(es des)c| - f4. r8 es4. r8| - g4. r8 g4. r8| - g4. r8 f4. r8| - g4. r8 as4. r8| - a2\sf r| - a\sf r| - as\sf r| - as\sf r| - g1\sf| - ges\sf| - f2. ges4| - f2. ges4| - f2. ges4| - f2. ges4| - f4 r r2| - R1*9| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g2.\p\<( as4| - g f d)bes| - \!bes'2\ff des| - c bes| - as4\p r r2| - R1*3| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as2.\p\<( bes4| - as g e)c| - \!c'2\ff es,| - d1~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d\p\< ~| - d~| - \!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| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r r4 r8 g\<| - a4 r r r8 a| - bes4 r r r8 bes| - \!fis2.\ff()g4| - fis(g fis)g| - fis2.()g4| - fis(g fis)g| - as2.()g4| - b,(c b)c| - as'2.()g4| - b,(c b)c| - r2 as'4\sf()g| - r2 as4\sf()g| - r2 as4\sf()g| - r2 as4\sf()g| - as2 fis| - g e| - f es| - a g| - fis4 r es r| - c r d r| - g,\p r r2| - r r4 r8 a'\f| - bes4 r r2| - r r4 r8 a\f| - bes4 r r2| - R1*3| - bes4\f r a r| - g r f r| - es r g r8 bes| - bes4 r8 bes a4 r8 a| - g1~| - g~| - g4. g8 g4 r8 g| - g4 r8 g g4 r8 g| - g4\p r r2| - R1*15| - r4 r8 as-"cresc" ges4 r8 des| - es4 r8 bes' as4 r8 es| - f4 r r2| - R1*3| - f4\f r r r8 es| - des4 r r r8 c| - bes4 r8 es f4 r8 f| - g4 r8 g e4 r 8 e| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c'1\p\< ~| - c~| - c~| - 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| - f,4 r r2| - R1| - f4-.\ff r r2| - R1*3| - as2\sf r| - as2\sf r| - R1*3| - g2\ff r| - g2\sf r| - R1*2| - r2 r4 e\ff(| - )f2. e4\sf(| - )f2. e4\sf(| - )f2. e4\sf(| - )f2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g4 r r2| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e2.\p\< (f4| - e d b)g| - g'2.(a4 g2)f| - e2.( f4| - e d b)g| - \!g'2\ff bes| - a1~| - a\p~| - a~| - a~| - a| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - f2.\<( g4| - f e cis)a| - \!a'2\ff c| - b1~| - b\p~| - b~| - b~| - b| - c2.\f\>()bes4| - \!bes\p(as2)g4| - g4(f2)es4| - es(d es)c| - b r r2| - r r4 r8 d| - \property Voice.crescendoText = #'(lines " " "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| - f(es f)es| - as2.\ff()g4| - f(es f)es| - e2.()f4| - e(f e)f| - e2.()f4| - e(f e)f| - r2 as| - r as\sf| - r as\sf| - r as\sf| - as g~| - g f~| - f1~| - f| - f4 r as r| - f r g r| - c,\p r r2| - r r4 r8 g'\f| - g4 r r2 r r4 r8 g\f| - g4 r r2| - R1*3| - c4\f r8 c c4 r8 c| - c4\f r8 c c4 r8 d| - as4 r r2| - R1*7| - es2.\p( f4| - es d b)g| - g'2.(as4| - g2)f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es2.\<( f4| - es d b)g| - c1| - \!es\f| - f\p| - f\f| - g\p| - g\f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\p\<~| - c~| - c~| - c~| - \!c\ff~| - c~| - c~| - c~| - c| - d| - es,4.-"sempre"\ff b8 c4. as8| - g4. as8 g4. f'8| - es4. b8 c4. as8| - g4. as8 g4. f'8| - es4 r8 b'8 c4 r8 d,| - es4 r8 g g4 r8 g| - c,1~| - c| - as'4-. r r2| - R1| - c,1~| - c| - b'4-. r r2| - R1| - c,1~| - c| - c'4-. b-. r2| - R1| - c4-. g-. r2| - as4-. e-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - f4\> r f r| - R1| - \!es4\p r r2| - R1| - d4 r r2| - R1| - c4\pp r r2| - R1*18| -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/oboe-2.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/oboe-2.ly deleted file mode 100644 index 378c96d34b..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/oboe-2.ly +++ /dev/null @@ -1,182 +0,0 @@ - -\version "1.3.141"; - -oboeII = \notes \relative c{ - R1*2| - f''4-.\ff r r2| - R1*3| - f4-. r r2| - R1*3| - es4-. r r2| - R1| - es4-. r r2| - b4-. r r2| - R1*5| - r2 r4 b4-.| - R1*6| - r4 bes\f r2| - R1*6| - c1\ff ~| - c4( es des)c| - b4. r8 c4. r8| - d4. r8 es4. r8| - e4. r8 c4. r8| - e4. r8 f4. r8| - es2\sf r| - es2\sf r| - d2\sf r| - d2\sf r| - R1*2| - bes2. bes4\sf| - bes2. bes4\sf| - bes2. bes4\sf| - bes2. bes4\sf| - bes4 r r2| - R1*33| - es2.\ff()d4| - c(bes c)bes| - es2.()d4| - c(bes c)bes| - R1*4| - r2 es\sf| - r es\sf| - r es\sf| - r es\sf| - es1| - d2 des| - c1~| - c| - %a deux; urg: copied oboe-1(100:2,102)| - c4 r es r| - c r d r| - g,\p r r2| - r r4 r8 d'\f| - d4 r r2| - r r4 r8 d\f| - d4 r r2| - R1*3| - %a deux; urg: copied oboe-1(110,111)| - bes'4\f r a r| - g r f r| - es r g r8 g| - g4 r8 g fis4 r8 fis| - bes,1~| - bes~| - bes4. bes8 bes4 r8 bes| - bes4 r8 bes bes4 r8 bes| - bes4\p r r2| - R1*21| - %a deux; urg copied ...| - \!f'4\f r r r8 es| - des4 r r r8 c| - bes4 r8 bes bes4 r8 bes| - bes4 r8 bes bes4 r8 bes| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c1\p\< ~| - c~| - c~| - 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| - f,4 r r2| - R1| - des'4\ff r r2| - R1*3| - f2\sf r| - f2\sf r| - R1*3| - e2\ff r| - e2\sf r| - R1*23| - g,2\ff bes| - a1~| - a\p~| - a~| - a~| - a~| - R1*2| - a2\ff c| - b1~| - b4\p r r2| - R1*13| - d2.\ff()es4| - b(c b)c| - d2.\ff()es4| - b(c b)c| - g2.()as4| - bes(as bes)as| - g2.()as4| - bes(as bes)as| - %a deux; urg copied oboe-1(220,230)| - r2 as'| - r as\sf| - r as\sf| - r as\sf| - as g~| - g f~| - f1~| - f| - f4 r as r| - f r g r| - c,\p r r2| - r r4 r8 d\f| - es4 r r2| - r r4 r8 d\f| - es4 r r2| - R1*3| - c4\f r8 c c4 r8 c| - c4 r8 c c4 r8 bes| - as4 r r2| - R1*14| - c1\f| - des\p| - d\f| - es\p| - e\f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\p\< ~| - c~| - c~| - c~| - \!c\ff~| - c~| - c~| - c~| - c| - d| - %a deux; urg: copied oboe-1(270,274:1)| - es4.-"sempre"\ff b8 c4. as8| - g4. as8 g4. f'8| - es4. b8 c4. as8| - g4. as8 g4. f'8| - es4 r8 d es4 r8 b| - c4 r8 d es4 r8 d| - c,1~| - c| - f'4-. r r2| - R1| - c,1~| - c| - d'4-. r r2| - R1| - c,1~| - c| - es'4-. d-. r2| - R1| - c4-. c-. r2| - c4-. c-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r d r| - R1| - \!c4\p r r2| - R1| - b4 r r2| - R1| - c4\pp r r2| - R1*18| -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/oboi-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/oboi-part.ly deleted file mode 100644 index f3c6240521..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/oboi-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.141"; - -instrument = "Oboe" - -\include "header.ly" -\include "global.ly" -\include "oboi.ly" - -\score{ - \oboiStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/oboi.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/oboi.ly deleted file mode 100644 index ba1cc2e52e..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/oboi.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.141"; - -\include "oboe-1.ly" -\include "oboe-2.ly" - -oboiStaff = \context Staff = oboi < - \property Staff.midiInstrument = #"oboe" - \property Staff.instrument = #"Oboi" - \property Staff.instr = #"Ob." - \global - \context Voice=one \partcombine Voice - \context Thread=one \oboeI - \context Thread=two \oboeII -> diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/timpani-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/timpani-part.ly deleted file mode 100644 index 1622749f0f..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/timpani-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.141"; - -instrument = "Timpani" - -\include "header.ly" -\include "global.ly" -\include "timpani.ly" - -\score{ - \timpaniStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/timpani.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/timpani.ly deleted file mode 100644 index 29e94fd018..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/timpani.ly +++ /dev/null @@ -1,149 +0,0 @@ - -\version "1.3.141"; - -timpani = \notes \relative c { - R1*2| - c4-.\ff r r2| - R1*3| - c4-. r r2| - R1*3| - c4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - R1*5| - r2 r4 g4-.| - R1*6| - r4 c-.\f r2| - R1*2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r2 c4-.\p\< r| - r2 c4-. r| - r2 c4-. r| - c r c r| - \!c1\ff-\trill| - c8 r g r g r g r| - g4 r g r| - g r c r| - c r c r| - c r c r| - c\sf r r2| - c4\sf r r2| - R1*3| - c4\sf r r2| - R1*38| - c2:16\ff c4 g| - c g c g| - c2:16 c4 g| - c g c g| - g2:16 g4 g| - g c g c| - g2:16 g4 g| - g c g c| - c r r2| - c4 r r2| - c4 r r2| - c4 r r2| - c4 r c r| - g r g r| - c r c r| - c r c r| - c r r2| - R1*3| - g4\f r r2| - R1| - g4\f r r2| - R1*3| - g4\f r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g4 r8 g g4 r8 g| - R1| - % should extend over two bars tr ~~~~~~ - 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| - R1*4| - c4\ff r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r8 c c4 r8 c| - r2 c4 r8 c| - c4 r r2| - R1*18| - r2 r4 c\sf| - g r r c\sf| - g r r c\sf| - g r r c\sf| - g r r c\sf| - g r r2| - R1*35| - g2:16\ff g4 g| - g c g c| - g2:16\ff g4 g| - g c g c| - c2:16 c4 c| - c c c c| - c2:16 c4 c| - c c c c| - R1*8| - g4 r c r| - c r g r| - R1| - r2 r4 r8 g\f| - c4 r r2| - r2 r4 r8 g\f| - c4 r r2| - R1*3| - c4\f r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r r2| - R1*23| - c4\ff r r2| - c4 r r2| - c4 r r2| - c4 r r2| - c4 r r2| - g4 r r2| - c4-"sempre"\ff r c r| - g r r2| - c4 r c r| - g r r2| - c4 r c r| - c r c r| - c r r2| - R1| - c4-. r r2| - R1*3| - c4-. r r2| - R1*3| - c4-. r r2| - R1| - c4-. c-. r2| - c4-. c-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r g r| - R1| - \!c4\p r r2| - R1| - g4 r r2| - R1| - c4\pp r r2| - R1*18| -} - -timpaniStaff = \context Staff = timpani < - \property Staff.midiInstrument = #"timpani" - \property Staff.instrument = #"Timpani in C-G " - \property Staff.instr = #"Timp." - \clef "bass"; - \Time - \notes { \key c \major; } - \context Voice=timpani - \timpani -> - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/trombe-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/trombe-part.ly deleted file mode 100644 index 9f127a55cd..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/trombe-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.141"; - -instrument = "Trumpet" - -\include "header.ly" -\include "global.ly" -\include "trombe.ly" - -\score{ - \trombeStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/trombe.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/trombe.ly deleted file mode 100644 index 8a2bfa2604..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/trombe.ly +++ /dev/null @@ -1,21 +0,0 @@ - -\version "1.3.141"; - -\include "trombo-1.ly" -\include "trombo-2.ly" - -trombeStaff = \context Staff = trombe < - \context Staff=trombe { - \property Staff.midiInstrument = #"trumpet" - - \property Staff.instrument = #"Trombe in C" - \property Staff.instr = #`(lines "Tbe." (rows "(C)")) - - \notes { \key c \major; } - \End - } - \context Voice=one \partcombine Voice - \context Thread=one \tromboI - \context Thread=two \tromboII -> - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/trombo-1.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/trombo-1.ly deleted file mode 100644 index 2c8bdfe6f2..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/trombo-1.ly +++ /dev/null @@ -1,155 +0,0 @@ - -\version "1.3.141"; - -tromboI = \notes \relative c { - R1*2| - c''4-.\ff r r2| - R1*3| - c4-. r r2| - R1*3| - c4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - R1*5| - r2 r4 g4-.\f| - R1*6| - r4 c-.\f r2| - R1*2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r2 c4\p\< r| - r2 c4 r| - r2 c4 r| - c r c r| - \!c1\ff ~| - c8 r g r g r g r| - g4. r8 g4. r8| - g4. r8 c4. r8| - c4. r8 c4. r8| - c4. r8 c4. r8| - c2\sf r| - c2\sf r| - R1*3| - c1\sf| - R1*38| - c2.\ff g4| - c g c g| - c2. g4| - c g c g| - g2. g4| - g c g c| - g2. g4| - g c g c| - c r r2| - c4 r r2| - c4 r r2| - c4 r r2| - c4 r c r| - g r g r| - c r c r| - c r c r| - c r r2| - r d4 r| - R1| - r2 r4 r8 d\f| - g,4 r r2| - r r4 r8 d'\f| - g,4 r r2| - R1*3| - %a deux| - g4\f r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g4 r8 g g4 r8 g| - d'4 r8 d d4 r8 d| - g,1~| - 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| - R1*4| - c4\ff r8 c c4 r8 c| - c4\ff r8 c c4 r8 c| - c4\ff r8 c c4 r8 c| - r2 c4 r8 c| - c4 r r2| - R1*5| - d2\sf r| - d\sf r| - R1*11| - r2 r4 c\sf| - g2. c4\sf| - g2. c4\sf| - g2. c4\sf| - g2. c4\sf| - g4 r r2| - R1*35| - g2.\ff g4| - g c g c| - g2.\ff g4| - g c g c| - c2. c4| - c c c c| - c2. c4| - c c c c| - R1*8| - g4 r c r| - c r g r| - R1| - r2 r4 r8 g\f| - c4 r r2| - r r4 r8 g\f| - c4 r r2| - R1*3| - c4\f r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r r2| - R1*18| - e1\f(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c\p\< ~| - c~| - c~| - c~| - \!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| - g r r2| - c4 r c r| - g r r2| - c4 r c r| - c r c r| - %a deux| - c,1~| - c| - c'4-. r r2| - R1| - c,1~| - c| - c'4-. r r2| - R1| - c,1~| - c| - c'4-. d-. r2| - R1| - c4-. c-. r2| - c4-. c-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r g r| - R1| - \!g4\p r r2| - R1| - g4 r r2| - R1| - c,4\pp r r2| - R1*18| -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/trombo-2.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/trombo-2.ly deleted file mode 100644 index 9772e419b5..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/trombo-2.ly +++ /dev/null @@ -1,154 +0,0 @@ - -\version "1.3.141"; - -tromboII = \notes \relative c { - R1*2| - c'4-.\ff r r2| - R1*3| - c4-. r r2| - R1*3| - c4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - R1*5| - r2 r4 g4-.\f| - R1*6| - r4 c-.\f r2| - R1*2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r2 c4\p\< r| - r2 c4 r| - r2 c4 r| - c r c r| - \!c1\ff ~| - c8 r g r g r g r| - g4. r8 g4. r8| - g4. r8 c4. r8| - c4. r8 c4. r8| - c4. r8 c4. r8| - c2\sf r| - c2\sf r| - R1*3| - c1\sf| - R1*38| - c2.\ff g4| - c g c g| - c2. g4| - c g c g| - g2. g4| - g c g c| - g2. g4| - g c g c| - c r r2| - c4 r r2| - c4 r r2| - c4 r r2| - c4 r c r| - g r g r| - c r c r| - c r c r| - c r r2| - r2 d'4 r| - R1| - r2 r4 r8 d\f| - g,,4 r r2| - r2 r4 r8 d''8\f| - g,,4 r r2| - R1*3| - %a deux| - g'4\f r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g,4 r8 g g4 r8 g| - d''4 r8 d d4 r8 d| - g,,1~| - 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| - R1*4| - c4\ff r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r8 c c4 r8 c| - r2 c4 r8 c| - c4 r r2| - R1*5| - d'2\sf r| - d\sf r| - R1*11| - r2 r4 c,\sf| - g2. c4\sf| - g2. c4\sf| - g2. c4\sf| - g2. c4\sf| - g4 r r2| - R1*35| - g2.\ff g4| - g c g c| - g2.\ff g4| - g c g c| - c2. c4| - c c c c| - c2. c4| - c c c c| - R1*8| - g4 r c r| - c r g r| - R1| - r2 r4 r8 g\f| - c4 r r2| - r r4 r8 g\f| - c4 r r2| - R1*3| - c4\f r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r r2| - R1*18| - c1\f~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\p\< ~| - c~| - c~| - c~| - \!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| - g r r2| - c4 r c r| - g r r2| - c4 r c r| - c r c r| - %a deux| - c1~| - c| - c4-. r r2| - R1| - c1~| - c| - c4-. r r2| - R1| - c1~| - c| - c4-. d'-. r2| - R1| - c,4-. c-. r2| - c4-. c-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r g r| - R1| - \!g4\p r r2| - R1| - g4 r r2| - R1| - c4\pp r r2| - R1*18| -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/viola-1.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/viola-1.ly deleted file mode 100644 index e565393d7f..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/viola-1.ly +++ /dev/null @@ -1,408 +0,0 @@ - -\version "1.3.141"; - -violaI = \notes \relative c { - 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| - % 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]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es4.\< es8 d4. d8| - %20 - 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]| - \property Voice.crescendoText = #'(lines " " "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~| - \property Voice.crescendoText = #'(lines " " "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 - [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:| - %40 - c2\sf [c,8-. es-.][es()d]| - c'2\sf [c,8-. es-.][es()d]| - b'2\f r8 [d,-. d()c]| - b'2\f r8 [d,-. d()c]| - b'2\f r8 [des,-. des()c]| - %45 - a'2\sf [a8-. c-.][c()bes]| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes][bes()a]| - %50 - bes4 r r2| - R1| - es,4\p r r r8 es(| - )as4 r r r8 as (| - )g4 r r r8 g(| - %55 - )d4 r r r8 d(| - \property Voice.crescendoText = #'(lines " " "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\ff 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(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )f4\< r r r8 f(| - )bes4 r r r8 bes| - %70 - \!c2:\ff bes:| - a: fis:| - \property Voice.crescendoText = #'(lines " " "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 [as(g)as] r [bes(g)bes]| - [d,-.\pp d'-.] es4. es8-. d4 ~| - [d8 d-.] es4. es8-. d4 ~| - %80 - \property Voice.crescendoText = #'(lines " " "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| - \!fis2:\ff fis4: g:| - %85 - d2: d:| - fis: fis4: g:| - c,: d: c: d:| - b2: b4: c:| - f: es: f: es:| - %90 - 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| - - [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:| - %100 - [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]| - [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]| - [es, g b c][d, g a bes]| - [c, es g a]r[d, fis g]| - r[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]| - [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: - %115 - | - 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]| - [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]| - \property Voice.crescendoText = #'(lines " " "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]| - [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]| - [es, ges bes des][as c es as,]| - %140 - % shared with cello from here on; - % except cello has eighth notes - [des,16\f des f f][a a bes bes][c, c es es][g g as as]| - [bes8: des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c,: e: g: c:]| - %shared with cello from here on - \property Voice.crescendoText = #'(lines " " "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 - r[des, e g]r[c, e f]| - % hmm, don't want to miss more than one note, - % take bes octave higher - 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:]| - %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 - R1 - %155 - f,1 ~| - f| - d'2\sf [f,8-. as-.][as()g]| - - d'2\sf [f,8-. as-.][as()g]| - % ugh, should be quoted and transposed... - %160 - [f8-.\p as-.][as()f][g-. c-.][c()b]| - R1*2| - - g2\ff [es8-. g-.][g()f]| - g2\sf [es8-. g-.][g()f]| - %165 - [e-.\p bes'-.][bes()as][g-. des'-.][des()c]| - R1*2| - r4 [e,8-.\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-.]| - - 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 - % ugh, should be quoted and transposed - c,4\p r r r8 c8(| - )f4 r r r8 f8(| - %180 - )e4 r r r8 e8(| - )b'4 r r r8 b8(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c4 r\< r r8 c,8(| - % copied - )f4 r r r8 f8(| - )e4 r r r8 e8(| - %185 - )b'4 r r r8 b8(| - )c4 r r r8 c,8(| - )f4 r r r8 f8| - \!g'2:16\ff f:| - e: cis:| - %190 - d,4\p r r r8 d8(| - )g4 r r r8 g8(| - )f4 r r r8 f8(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )cis4\< r r r8 cis8(| - )d4 r r r8 d8(| - %195 - )g4 r r r8 g8| - [\!a16\ff a' a a]a4: g2:| - fis: dis:| - - e,4\p r r r8 e8(| - )a4\< r r r8 a8(| - %200 - [)g(g e g][e g e)g]| - % quote and transpose - [f(g f g][f g f)\!g]| - [c\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]| - %205 - r[c\p(as)c]r[c(a)c]| - [b-. g'-.] as4. as8-. g4 ~| - [g8 g-.] as4. as8-. g4 ~| - \property Voice.crescendoText = #'(lines " " "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:| - - %214 - b,2:16\ff b4: c:| - g'2: g:| - - e2:16\ff e4: f:| - bes,: c: bes: c:| - - e2:16\ff e4: f:| - bes,: c: bes: c:| - - %220 - r4 r8 as as2\sf| - r4 r8 as as2\sf| - r4 r8 as as2\sf| - r4 r8 as as2\sf| - [des16 des f f]des4: [b16 b d d]b4:| - %225 - [bes16 bes c c]bes4: [a16 a c c]a4:| - [f16 f b b]f4: [as16 as c c]as4:| - [as16 as d d]as4: [as16 as c c]as4:| - [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| - 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| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c'4\p\< r r r8 c8(| - )f4 r r r8 f,8(| - )es1| - - %255 - \!ges\f| - f\p| - as\f| - g\p - e'2:16\f e:| - - %260 - \property Voice.crescendoText = #'(lines " " "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| - %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:| - [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| - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - as4\> r g r| - R1| - \!c4\p r r2| - R1| - g4-#'((font-shape . upright) "pizz.") r r2| - R1| - c,4 r r2| - R1*15| - c4-#'((font-shape . upright) "pizz.") r r2| - c4 r r2| - c4 r r2| -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/viola-2.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/viola-2.ly deleted file mode 100644 index 2fc5a956bb..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/viola-2.ly +++ /dev/null @@ -1,400 +0,0 @@ - -\version "1.3.141"; - -violaII = \notes \relative c { - c1\ff ~| - c| - f4-. r r2| - R1| - % copied 3 bars from three back... - %5 - c1 ~| - c| - f4-. r r2| - R1| - c1 ~| - c| - fis4-. r r2| - R1| - g4-. 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]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es4.\< es8 d4. d8| - %20 - 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]| - \property Voice.crescendoText = #'(lines " " "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~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [c8\< c-.]c2.~| - %30 - [c8 c-.]c2.~| - [c8 c-.] c4. c8-. c4~| - [c8 c-.] c4. c8-. c4| - [\!as'16\ff as as as][as as as as]as2:16| - %35 - [f16 f f f][g g g g][f f f f][es es es es]| - f2:16 es:| - f: es:| - g: as:| - bes: c:| - %40 - c,2\sf [c8-. es-.][es()d]| - c2\sf [c8-. es-.][es()d]| - b'2\f r8 [d,-. d()c]| - b'2\f r8 [d,-. d()c]| - b'2\f r8 [des,-. des()c]| - %45 - a'2\sf [a8-. c-.][c()bes]| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes][bes()a]| - %50 - bes4 r r2| - R1| - es,4\p r r r8 es(| - )as4 r r r8 as (| - )g4 r r r8 g(| - %55 - )d4 r r r8 d(| - \property Voice.crescendoText = #'(lines " " "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| - \!g2:16\ff f:| - e: c:| - f4\p r r r8 f(| - %65 - )bes4 r r r8 bes(| - )as4 r r r8 as(| - )e4 r r r8 e(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )f4\< r r r8 f(| - )bes4 r r r8 bes| - %70 - \!as2:\ff g:| - fis: d:| - \property Voice.crescendoText = #'(lines " " "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 [c\p(g)c] r [bes(g)bes]| - r [g(es)g] r [g(d)g]| - r [g(es)g] r [g(e)g]| - [d-.\pp d'-.] es4. es8-. d4 ~| - [d8 d-.] es4. es8-. d4 ~| - %80 - \property Voice.crescendoText = #'(lines " " "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 (| - \!)fis2:\ff fis4: g:| - %85 - d2: d:| - fis: fis4: g:| - c,: d: c: d:| - b2: b4: c:| - f: es: f: es:| - %90 - 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| - [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:| - %100 - [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]| - [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]| - [es, g b c][d, g a bes]| - [c, es g a]r[d, fis g]| - r[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]| - [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:]| - g,2: g: - %115 - | - g: g:| - g: g:| - g: g:| - % urg, 2 copied from 102 - [g8\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]| - [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]| - \property Voice.crescendoText = #'(lines " " "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]| - [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]| - [es, ges bes des][as c es as,]| - %140 - % shared with cello from here on; - % except cello has eighth notes - [des,16\f des f f][a a bes bes][c, c es es][g g as as]| - [bes8: des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c,: e: g: c:]| - %shared with cello from here on - \property Voice.crescendoText = #'(lines " " "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 - r[des, e g]r[c, e f]| - % hmm, don't want to miss more than one note, - % take bes octave higher - 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:]| - %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| - bes4 r r2 - %155 - R1 - f1 ~| - f| - b2\sf [f8-. as-.][as()g]| - - b2\sf [f8-. as-.][as()g]| - % ugh, should be quoted and transposed... - %160 - [f8-.\p as-.][as()f][g-. c-.][c()b]| - R1*2| - - e,2\ff [es8-. g-.][g()f]| - e2\sf [es8-. g-.][g()f]| - %165 - [e-.\p bes'-.][bes()as][g-. des'-.][des()c]| - R1*2| - r4 [e,8-.\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-.]| - - 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 - % ugh, should be quoted and transposed - c,4\p r r r8 c8(| - )f4 r r r8 f8(| - %180 - )e4 r r r8 e8(| - )b'4 r r r8 b8(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c4 r\< r r8 c,8(| - % copied - )f4 r r r8 f8(| - )e4 r r r8 e8(| - %185 - )b'4 r r r8 b8(| - )c4 r r r8 c,8(| - )f4 r r r8 f8| - \!e'2:16\ff d:| - cis: a:| - %190 - d,4\p r r r8 d8(| - )g4 r r r8 g8(| - )f4 r r r8 f8(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )cis4\< r r r8 cis8(| - )d4 r r r8 d8(| - %195 - )g4 r r r8 g8| - [\!f16\ff f' f f]f4: e2:| - dis: b:| - e,4\p r r r8 e8(| - )a4\< r r r8 a8(| - %200 - [)g(g e g][e g e)g]| - % quote and transpose - [f(g f g][f g f)\!g]| - [c\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\p(d,)as']r[a(es)a]| - [g-. g'-.] as4. as8-. g4 ~| - [g8 g-.] as4. as8-. g4 ~| - \property Voice.crescendoText = #'(lines " " "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:| - %214 - b,2:16\ff b4: c:| - g'2: g:| - bes,2:16\ff bes4: as:| - g: f: g: f:| - bes2:16\ff bes4: as:| - g: f: g: f:| - %220 - r4 r8 f f4\sf()ges| - r4 r8 f f4\sf()ges| - r4 r8 f f4\sf()ges| - r4 r8 f f4\sf()ges| - [des'16 des f f]des4: [b16 b d d]b4:| - %225 - [bes16 bes c c]bes4: [a16 a c c]a4:| - [f16 f b b]f4: [as16 as c c]as4:| - [as16 as d d]as4: [as16 as c c]as4:| - [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| - 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| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c'4\p\< r r r8 c8(| - )f4 r r r8 f,8(| - )es1| - - %255 - \!ges\f| - f\p| - as\f| - g\p - bes2:16\f bes:| - - %260 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [as8\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| - %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"\ff g:| - 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| - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - as4\> r g r| - R1| - \!c4\p r r2| - R1| - g4-#'((font-shape . upright) "pizz.") r r2| - R1| - c,4 r r2| - R1*15| - c4-#'((font-shape . upright) "pizz.") r r2| - c4 r r2| - c4 r r2| -} diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/viole-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/viole-part.ly deleted file mode 100644 index 9a2fa0c4d9..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/viole-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.141"; - -instrument = "Viola" - -\include "header.ly" -\include "global.ly" -\include "viole.ly" - -\score{ - \violeGroup - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/viole.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/viole.ly deleted file mode 100644 index 7787d4e8e3..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/viole.ly +++ /dev/null @@ -1,56 +0,0 @@ - -\version "1.3.141"; - -\include "viola-1.ly" -\include "viola-2.ly" - -%{ -violeGroup = \context PianoStaff = viole_group \notes < - \property PianoStaff.aDueText = #"" - \context Staff=oneViole { - \property Staff.midiInstrument = #"viola" - \property Staff.instrument = #"Viola" - \property Staff.instr = #"Vla." - - \clef "alto"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #0 - - \global - } - \context Staff=twoViole { - \property Staff.midiInstrument = #"viola" - \property Staff.instrument = #"Viola II" - \property Staff.instr = #"Vla. II" - - \clef "alto"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #0 - - \global - } - - \context Staff=oneViole \partcombine Staff - \context Voice=one \violaI - \context Voice=two \violaII -> -%} - -violeGroup = \notes \context Staff = viole < - \property Staff.aDueText = #"" - \context Staff=viole { - \property Staff.midiInstrument = #"viola" - \property Staff.instrument = #"Viola" - \property Staff.instr = #"Vla." - - \clef "alto"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #0 - - \global - } - \context Voice=one \partcombine Voice - \context Thread=one \violaI - \context Thread=two \violaII -> - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/violino-1-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/violino-1-part.ly deleted file mode 100644 index d47e90ac8e..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/violino-1-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.141"; - -instrument = "Violin I" - -\include "header.ly" -\include "global.ly" -\include "violino-1.ly" - -\score{ - \violinoIStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/violino-1.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/violino-1.ly deleted file mode 100644 index 076af6d448..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/violino-1.ly +++ /dev/null @@ -1,449 +0,0 @@ - -\version "1.3.141"; - -violinoI = \notes \relative c { - 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]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [es8-.\< as-.] as4. g8-. g4 ~| - %20 - [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]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [des-.\< ges-.] ges4. f8-. f4~| - [f8 e-.]\!e4-.\f r2| - R1| - %29 - r8 f-.\p f4. es8-. es4~| - \property Voice.crescendoText = #'(lines " " "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:| - %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| - - %45 - ges\sf| - - f2. ges4\sf| - f2. ges4\sf| - f2. ges4\sf| - f2. ges4\sf| - %50 - f1\>~| - f4 d( bes)as| - \!g2.\p( as4| - g f d ) bes| - bes'2.( c4| - - %55 - bes2 )as| - \property Voice.crescendoText = #'(lines " " "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| - - %65 - as g e )c| - c'2.( des4| - c2 ) bes| - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [as16\< c c c][c c c c] c2:16| - c: c:| - - %70 - \!c:\ff es:| - d: c:| - \property Voice.crescendoText = #'(lines " " "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~| - [a8 a-.] a4. a8-. a4~| - %80 - [a8 bes-.] bes4. bes8-. bes4~| - [bes8 bes-.] bes4. bes8-. bes4~| - [bes8 c-.] c4. c8-. c4~| - [c8 d-.] d4. d8-. d4| - es2:16\ff es4: d:| - %85 - fis: g: fis: g:| - es2: es4: d:| - - fis: g: fis: g:| - as2: as4: g:| - - b: c: b: c:| - %90 - as2: as4: g:| - - b: c: b: c:| - r8 es as,4\sf~as()g| - r8 es' as,4\sf~as()g| - r8 es' as,4\sf~as()g| - %95 - r8 es' as,4\sf~as()g| - r8 es' as,4. fis8 es'4~| - [es8 d] g,4. e8 des'4~| - [des8 c] f,4. c'8 es,4 ~| - - [es8 c'] a4. c8 g4 ~| - %100 - [g8 fis] d,4. es8-. es4~| - - [es8 c-.] c4. d8-. d4| - 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'| - %110 - 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 ~| - - %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| - - %120 - bes4 r8 es des4 r8 bes| - as4 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| - - g4 r8 des' c4 r8 g| - as4 r8 es' des4 r8 as| - - bes4 r r2| - %130 - \property Voice.crescendoText = #'(lines " " "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| - 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' e4 r8 bes'| - \property Voice.crescendoText = #'(lines " " "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| - - %150 - 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,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| - [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."| - - r2 r4 des'4\ff (| - )c2. des4\sf(| - )c2. des4\sf(| - %170 - )c2. des4\sf(| - )c2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - %175 - )d2. es4\sf(| - )d1\> ~| - d4( b g )f - \!e2.\p( f4| - e d b ) g| - %180 - g'2.( a4| - g2 )f| - \property Voice.crescendoText = #'(lines " " "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:| - %190 - f2.\p( g4| - f e cis ) a| - a'2.( bes4| - a2 ) g| - \property Voice.crescendoText = #'(lines " " "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| - %200 - 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]| - %205 - r[c(as)c]r[c(a)c]| - [b-. d-.]d4. d8-. d4 ~| - [d8-. d-.]d4. d8-. d4 ~| - \property Voice.crescendoText = #'(lines " " "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:| - %220 - r8 as des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()c| - r8 as' des,4. b8 g'4| - %225 - r8 g c,4. a8 f'4 ~| - [f8 f] b,4. f'8 as,4 ~| - [as8 f'] d4. f8 c4 ~| - [c8 b] g,4. as8 as'4 ~| - [as8 as] f4. f8 g4| - %230 - c,4\p r8 as' g4 r8 es| - d4 r8 as' g4 r8 d\f| - es4 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 r8 f es4 r8 bes| - %240 - 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 ~| - \property Voice.crescendoText = #'(lines " " "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 - \property Voice.crescendoText = #'(lines " " "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 ~| - %265 - ~| - ~| - ~| - | - d4. d8 d2\sf| - %270 - es4.-"sempre" b8\ff c4. as8| - g4. as8 g4. f'8| - es4. b8 c4. as8| - g4. as8 g4. f'8| - 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| - - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - f4\> r d r| - R1| - \!es4\p r r2| - R1| - d,4-#'((font-shape . upright) "pizz.") r r2| - - %295 - R1| - - \property Voice.decrescendoText = #'(lines " " "sempre pi\\`u piano" " ") - % urg, "" is assumed to be hairpin... - %\property Voice.decrescendoSpanner = #"" - \property Voice.decrescendoSpanner = #'dashed-line - c1^"arco"\> ~| - c2 b2| - c1 ~| - c2 b2| - - %300 - c1 ~| - c| - b ~| - b| - c ~| - - %305 - c| - b ~| - \!b\> ~| - b ~| - b| - - %310 - \!c4\pp r r2| - R1| - c4-#'((font-shape . upright) "pizz.") r r2| - c4 r r2| - c4 r r2| -} - -violinoIStaff = \context Staff = violino1 < - \property Staff.midiInstrument = #"violin" - \property Staff.instrument = #"Violino I " - \property Staff.instr = #"Vl. I " - \notes< - \global - \context Voice=violinoi - \violinoI - > -> - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/violino-2-part.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/violino-2-part.ly deleted file mode 100644 index c205e3f3a8..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/violino-2-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.141"; - -instrument = "Violin II" - -\include "header.ly" -\include "global.ly" -\include "violino-2.ly" - -\score{ - \violinoIIStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/violino-2.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/violino-2.ly deleted file mode 100644 index d5b5d0bcff..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/violino-2.ly +++ /dev/null @@ -1,438 +0,0 @@ - -\version "1.3.141"; - -violinoII = \notes \relative c { - c'1\ff ~| - c| - r r2| - R1| - c1 ~| - c| - r r2| - R1| - c1 ~| - c| - r r2| - R1| - %13 - r r2| - r r2| - R1 *3| - r2 [b8-.\p f'-.] [f()es]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [es8-. as-.] as4.\< g8-. g4 ~| - %20 - [g8 fis-.] fis4 ~ fis \!g-.\f| - R1*4| - r2 - %25 - [a,8-.\p es'-.][es()des]| - \property Voice.crescendoText = #'(lines " " "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~| - \property Voice.crescendoText = #'(lines " " "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:| - - | - %40 - a2\sf [c,8-. es-.][es()d]| - a'2\sf [c,8-. es-.][es()d]| - d2\sf [b8-. d-.][d()c]| - d2\sf [b8-. d-.][d()c]| - des2\sf [bes8-. d-.][d()c]| - %45 - c2\sf [a8-. c-.][c()bes]| - r4[a8-. c-.][c()bes] r4| - r4[a8-. c-.][c()bes] r4| - r4[a8-. c-.][c()bes] r4| - r4[a8-. c-.][c()bes][bes()a]| - %50 - bes4 r r2| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g'2.\p\<( as4| - g f d ) bes| - bes'2.( c4| - bes2 )as| - %60 - [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| - - %65 - as g e )c| - c'2.( des4| - c2 ) bes| - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [as16\< c c c][c c c c] c2:16| - c: c:| - - %70 - \!c:\ff es:| - d: c:| - \property Voice.crescendoText = #'(lines " " "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]| - 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 - % bes -> g - % c -> a - % d -> bes - [fis8 fis-.] fis4. fis8-. fis4~| - %80 - [fis8 g-.] g4. g8-. g4~| - [g8 g-.] g4. g8-. g4~| - [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:| - %90 - 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| - r8 es' as,4\sf~as()g| - %95 - r8 es' as,4\sf~as()g| - % transpose viola... - [es16 as as as]as4:16[fis16 a a a]a4:16| - [d,16 g g g]g4:16[e16 g g g]g4:16| - [c,16 f f f]f4:16[c16 es es es]es4:16| - [c16 a' a a]a4:16[c,16 g' g g]g4:16| - %100 - [fis8 d]d4. es8 es4~| - [es8 c-.]c4. d8-. d4| - - g,\p r r2| - r2 r4 r8 | - - r r2| - %105 - r2 r4 r8 | - - r r r8 a'\p| - g4 r r r8 f| - 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| - - es4 r8 a g4 r8 cis,| - <[d16 s> ] | - | - | - | - | - r r2| - - R1*13 - %131 - % copied from viola(131,140) - [as8 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]| - - % 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' e4 r8 bes'| - \property Voice.crescendoText = #'(lines " " "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| - - % 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| - %155 - R1| - f1 ~| - f| - - [f8-. as-.][as()g]| - [f8-. as-.][as()g]| - %160 - 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."| - 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-.]| - 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| - e d b ) g| - - %180 - g'2.( a4| - g2 )f| - \property Voice.crescendoText = #'(lines " " "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:| - - %190 - f2.\p( g4| - f e cis ) a| - a'2.( bes4| - a2 ) g| - \property Voice.crescendoText = #'(lines " " "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| - - %200 - 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 ~| - \property Voice.crescendoText = #'(lines " " "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:| - - % copied violino-1(220, 223) - %220 - r8 as des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()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| - - %230 - c,4\p r r2| - - r2 r4 r8 | - - r r2| - r2 r4 r8 | - - r r2| - %235 - R1*3| - %copied violino-1(238,243) - es'4\f r8 as g4 r8 d| - - c4 r8 f es4 r8 bes| - - %240 - as4-. des-. r2| - R1*3| - - %245 - [g,8\p( e' c e][g e c )g~]| - [g8( d' b d][g d b )g~]| - [g8( e' c e][g e 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~]| - - %250 - [g8( es' c es][g es c )g~]| - [g8( f' d f][g f d )g,~]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [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 - <\!c2:16\f es:> | - [as8\p( f' des f][as f des )as]| - | - [bes8\p( g' es g][bes g es )bes]| - | - %copied viola-1(260, 273) - - %260 - \property Voice.crescendoText = #'(lines " " "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| - - %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"\ff g:| - 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| - - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - > r g' r| - R1| - \!g4\p r r2| - R1| - b,4-#'((font-shape . upright) "pizz.") r r2| - - %295 - R1| - c4 r r2| - R1*15| - c4-#'((font-shape . upright) "pizz.") r r2| - c4 r r2| - c4 r r2| -} - -violinoIIStaff = \context Staff = violino2 < - % 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 - \context Voice=violinoii - \violinoII - > -> diff --git a/ports/mutopia/BeethovenLv/O62/Coriolan/violoncello.ly b/ports/mutopia/BeethovenLv/O62/Coriolan/violoncello.ly deleted file mode 100644 index 9ab03ca219..0000000000 --- a/ports/mutopia/BeethovenLv/O62/Coriolan/violoncello.ly +++ /dev/null @@ -1,478 +0,0 @@ - -\version "1.3.141"; - -violoncello = \notes \relative c { - c1\ff~| - c| - f,4-. r r2| - R1| - c'1~| - c| - f,4-. r r2| - R1| - c'1~| - 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 = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c'4.\< c8 bes4. bes8| - - %20 - 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]| - \property Voice.crescendoText = #'(lines " " "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| - - %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 [a8-. 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,~]| - \property Voice.crescendoText = #'(lines " " "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| - [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][bes g e)bes]| - - %70 - as2\ff g| - fis d| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [g8\p\<(bes' g bes][d bes g)d~]| - [d8(a' fis a][d a fis)d]| - [\!f8\sf\>(as f as][f g d)g]| - - %75 - \!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 - \property Voice.crescendoText = #'(lines " " "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| - %85 - a(g a)g| - c2.()bes4| - a(g a)g| - f2.()es4| - d(c d)c| - - %90 - 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| - % copied \transpose c, viola-1(102, 130) - % except for some abbrevs below... - [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]| - [es, g b c][d, g a bes]| - % [c, es g a]r[d, fis g]| - [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]| - % see if this:8 neat trick works... - [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:]| - g,,2 ~ g4. g8| - - %115 - g2 ~ g4. g8| - g4. g8 g4 r8 g| - g4. g8 g4 r8 g| - % 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]| - [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]| - \property Voice.crescendoText = #'(lines " " "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]| - - %140 - % copied from viola-1 (140,152) - % except cello has eighth notes - % [des,16\f des f f][a a bes bes][c, c es es][g g as as]| - [des,8\f f a bes][c, es g as]| - [bes,8:8 des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c: e: g: c:]| - %shared with cello from here on - \property Voice.crescendoText = #'(lines " " "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... - % r[des, e g]r[c, e f]| - [bes, des e g][as, c e f]| - % hmm, don't want to miss more than one note, - % take bes octave higher - % r[bes des, f][c e g 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:]| - [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 - - %155 - R1| - 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| - [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,~]| - \property Voice.crescendoText = #'(lines " " "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 ~| - [a8( f' d f][a f d )a~]| - [a( e' cis e][a e cis )a~]| - [a8( f' d f][a f d )a~]| - [a( g' e g][a g e )a,~]| - - %195 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [a8\<( f' d f][a f d )a~]| - [a( e' cis e][a e cis )g]| - \!f2\ff e| - dis b'~| - [b8\p( g' e g][b g e )b~]| - - %200 - [b8\<( fis' dis fis ][b fis dis )b~]| - [b8( g' e g][e g e )g]| - [f(g f g][f g f)g]| - \!es4\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| - \property Voice.crescendoText = #'(lines " " "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| - d( c d )c| - - %215 - f2.\ff()es4| - d( c d )c| - bes2.\ff()as4| - g( f g )f| - 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 es g as][bes, d fis g]| - - %240 - [as, c e f][g, bes d es]| - 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(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c4\< r r r8 c(| - )f4 r r r8 f,(| - )es1| - - %255 - \!ges\f| - f\p| - as\f| - g\p| - bes\f| - - %260 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as4.\p\< as'8 g4. g8| - f4. f8 es4. es8| - as4. as8 g4. g8| - f4. f8 es4. es8| - \!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| - b,4. b'8 b2\sf| - - %270 - [c,8-"sempre"\ff b c d][es 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| - f,4-. r r2| - R1| - - %280 - c'1 ~| - c| - f,4-. r r2| - R1| - c'1 ~| - - %285 - c| - fis4-. f-. r2| - R1| - es4-. e-. r2| - f,4-. g-. r2| - - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - as4\> r b r| - R1| - \!c4\p r r2| - R1| - g4-#'((font-shape . upright) "pizz.") r r2| - - %295 - R1| - c4 r r2| - [c8-.-"arco" es-.][es()d][d-. as'-.][as()g]| - R1 - \property Voice.decrescendoText = #'(lines " " "sempre pi\\`u piano" " ") - % urg, "" is assumed to be hairpin... - %\property Voice.decrescendoSpanner = #"" - \property Voice.decrescendoSpanner = #'dashed-line - \times 2/3 { c,4\> ( es d ~ } \times 2/3 { d as' )g }| - - %300 - r2 r4 c,(| - es2. ) d4| - r2 r4 d(| - as'2. )g4 ~| - g1 (| - - %305 - es| - )d(| - \!)as'\> ~| - as ~| - as2.()g4| - - %310 - \!c,\pp r r2| - R1| - % no mistake: octave lower than contrabass, ie, sounding equal - c,4-#'((font-shape . upright) "pizz.") r r2| - c4 r r2| - c4 r r2| -} diff --git a/scm/font.scm b/scm/font.scm index b92027cdd1..874e8fcc43 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -106,7 +106,16 @@ ((-3 medium upright typewriter cmtt 6) . "cmtt6" ) ((-4 medium upright typewriter cmtt 5) . "cmtt5" ) ((-5 medium upright typewriter cmtt 5) . "cmtt5" ) + + ((3 medium caps roman cmcsc 12) . "cmcsc12") + ((2 medium caps roman cmcsc 12) . "cmcsc12") + ((1 medium caps roman cmcsc 12) . "cmcsc12") + ((0 medium caps roman cmcsc 10) . "cmcsc10") + ((-1 medium caps roman cmcsc 8) . "cmcsc8") + ((-2 medium caps roman cmcsc 7) . "cmcsc7") + ((-3 medium caps roman cmcsc 7) . "cmcsc7") + ;; should use the same brace font every where and fix C++ code. ((2 * * braces feta-braces 26) . "feta-braces26") ((1 * * braces feta-braces 23) . "feta-braces23") diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 2a5c40e861..d12715908c 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -143,7 +143,8 @@ (molecule-callback . ,Hairpin::brew_molecule) (thickness . 1.0) (height . 0.6666) - + (spacing-procedure . ,Spanner::set_spacing_rods) + (minimum-length . 2.0) (if-text-padding . 1.0) (width-correct . -1.0) @@ -385,7 +386,7 @@ (PhrasingSlur . ( (molecule-callback . ,Slur::brew_molecule) (thickness . 1.2) - (spacing-procedure . ,Slur::set_spacing_rods) + (spacing-procedure . ,Spanner::set_spacing_rods) (minimum-length . 1.5) (after-line-breaking-callback . ,Slur::after_line_breaking) (extremity-rules . ,default-slur-extremity-rules) @@ -456,7 +457,7 @@ (Slur . ( (molecule-callback . ,Slur::brew_molecule) (thickness . 1.2) - (spacing-procedure . ,Slur::set_spacing_rods) + (spacing-procedure . ,Spanner::set_spacing_rods) (minimum-length . 1.5) (after-line-breaking-callback . ,Slur::after_line_breaking) (extremity-rules . ,default-slur-extremity-rules) @@ -636,7 +637,7 @@ )) (Tie . ( (molecule-callback . ,Tie::brew_molecule) - (spacing-procedure . ,Tie::set_spacing_rods) + (spacing-procedure . ,Spanner::set_spacing_rods) (staffline-clearance . 0.35) (details . ((ratio . 0.333) (height-limit . 1.0))) (thickness . 1.2) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 9e0f7e43c9..0ce1bbc946 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -753,6 +753,7 @@ if 1: if 1: def conv (str): str = re.sub ('followThread', 'followVoice', str) + str = re.sub ('Thread.FollowThread', 'Voice.VoiceFollower', str) str = re.sub ('FollowThread', 'VoiceFollower', str) return str diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index 984bbc7c10..a3aa23133a 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -124,7 +124,7 @@ set_gcos () localtime = time.strftime ('%c %Z', time.localtime (time.time ())) if os.path.basename (index_url) != "index.html": - index_url = index_url + "/index.html" + index_url = os.path.join (index_url , "index.html") top_url = os.path.dirname (index_url) + "/" header = compose (default_header, header_file) @@ -172,8 +172,12 @@ def do_file (f): if os.path.basename (f) == "index.html": cwd = os.getcwd () if os.path.basename (cwd) == "topdocs": - index = "./index.html" - top = "./" + index = "index.html" + top = "" + + # don't cause ///////index.html entries in log files. + # index = "./index.html" + # top = "./" s = re.sub ('@INDEX@', index, s) s = re.sub ('@TOP@', top, s) diff --git a/stepmake/stepmake/yolily-debian-rules.make b/stepmake/stepmake/yolily-debian-rules.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/stepmake/stepmake/yolily-debian-targets.make b/stepmake/stepmake/yolily-debian-targets.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/stepmake/stepmake/yolily-debian-vars.make b/stepmake/stepmake/yolily-debian-vars.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/stepmake/stepmake/yolily-topdoc-rules.make b/stepmake/stepmake/yolily-topdoc-rules.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/stepmake/stepmake/yolily-topdoc-targets.make b/stepmake/stepmake/yolily-topdoc-targets.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/stepmake/stepmake/yolily-topdoc-vars.make b/stepmake/stepmake/yolily-topdoc-vars.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/stepmake/stepmake/yolily-toplevel-rules.make b/stepmake/stepmake/yolily-toplevel-rules.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/stepmake/stepmake/yolily-toplevel-targets.make b/stepmake/stepmake/yolily-toplevel-targets.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/stepmake/stepmake/yolily-toplevel-vars.make b/stepmake/stepmake/yolily-toplevel-vars.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tex/mudela-book.tex b/tex/mudela-book.tex deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tex/p.tex b/tex/p.tex deleted file mode 100644 index e69de29bb2..0000000000 -- 2.39.2