From 195abf4ce5b2182155bf8a9f0e2022eeaa5b32c2 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 4 Feb 2001 21:39:07 +0100
Subject: [PATCH] patch::: 1.3.127.jcn4
1.3.127.jcn4
============
* Mutopia preparations and Coriolan fixes.
---
CHANGES | 5 +
VERSION | 2 +-
input/features/mmrest-collision.ly | 24 +
input/tutorial/orchestral-score.ly | 28 +
input/tutorial/orchestral.ly | 4 -
lily/thread-devnull-engraver.cc | 16 +-
make/mutopia-rules.make | 6 +-
mutopia/Coriolan/clarinetto-1.ly | 32 +-
mutopia/Coriolan/clarinetto-2.ly | 36 +-
mutopia/Coriolan/contrabasso.ly | 400 ++++++------
mutopia/Coriolan/corno-1.ly | 100 +--
mutopia/Coriolan/corno-2.ly | 60 +-
mutopia/Coriolan/fagotto-1.ly | 102 ++--
mutopia/Coriolan/fagotto-2.ly | 118 ++--
mutopia/Coriolan/flauto-1.ly | 70 +--
mutopia/Coriolan/flauto-2.ly | 54 +-
mutopia/Coriolan/oboe-1.ly | 46 +-
mutopia/Coriolan/oboe-2.ly | 62 +-
mutopia/Coriolan/timpani.ly | 44 +-
mutopia/Coriolan/trombo-1.ly | 50 +-
mutopia/Coriolan/trombo-2.ly | 44 +-
mutopia/Coriolan/viola-1.ly | 406 ++++++-------
mutopia/Coriolan/viola-2.ly | 404 ++++++------
mutopia/Coriolan/violino-1.ly | 574 +++++++++---------
mutopia/Coriolan/violino-2.ly | 518 ++++++++--------
mutopia/Coriolan/violoncello.ly | 454 +++++++-------
.../J.S.Bach/Solo-Cello-Suites/GNUmakefile | 3 +
mutopia/J.S.Bach/Solo-Cello-Suites/header.ly | 1 +
scm/c++.scm | 4 +
scm/translator-property-description.scm | 3 +-
stepmake/stepmake/tex-rules.make | 3 +
31 files changed, 1878 insertions(+), 1795 deletions(-)
create mode 100644 input/features/mmrest-collision.ly
diff --git a/CHANGES b/CHANGES
index 7a2644bad9..b84e4d35aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.127.jcn4
+============
+
+* Mutopia preparations and Coriolan fixes.
+
1.3.127.jcn3
============
diff --git a/VERSION b/VERSION
index bd5dec172a..48b1e42c11 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=127
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
diff --git a/input/features/mmrest-collision.ly b/input/features/mmrest-collision.ly
new file mode 100644
index 0000000000..255b9e6fab
--- /dev/null
+++ b/input/features/mmrest-collision.ly
@@ -0,0 +1,24 @@
+\score {
+ \context Staff \notes <
+ \context Voice=i {
+ \property Voice.MultiMeasureRest \override #'staff-position = #3
+ R1
+ }
+ \context Voice=ii {
+ \property Voice.MultiMeasureRest \override #'staff-position = #-3
+ R1
+ }
+ >
+ \paper {
+ \translator {
+ \StaffContext
+ \remove Multi_measure_rest_engraver;
+ \remove Bar_engraver;
+ }
+ \translator {
+ \VoiceContext
+ \consists Multi_measure_rest_engraver;
+ \consists Bar_engraver;
+ }
+ }
+}
diff --git a/input/tutorial/orchestral-score.ly b/input/tutorial/orchestral-score.ly
index 2e641fb901..8926afb36d 100644
--- a/input/tutorial/orchestral-score.ly
+++ b/input/tutorial/orchestral-score.ly
@@ -224,6 +224,34 @@ contrabasso = \notes\relative c {
\paperSixteen
linewidth = 80 * \staffspace;
textheight = 200 * \staffspace;
+ \translator{
+ \ThreadContext
+ \consists "Rest_engraver";
+ }
+ \translator{
+ \VoiceContext
+ \remove "Rest_engraver";
+ soloText = #"I."
+ soloIIText = #"II."
+ soloADue = ##f
+ % We must override the settings for Staff level
+ % with the default values, here.
+ aDueText = #"\\`a2"
+ splitInterval = #'(0 . 1)
+ changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512))
+ }
+ \translator{
+ \HaraKiriStaffContext
+ \consists "Mark_engraver";
+ soloADue = ##t
+ soloText = #""
+ soloIIText = #""
+ % This is non-conventional, but currently it is
+ % the only way to tell the difference.
+ aDueText = #"\\`a2"
+ splitInterval = #'(1 . 0)
+ changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1))
+ }
\translator {
\OrchestralScoreContext
skipBars = ##t
diff --git a/input/tutorial/orchestral.ly b/input/tutorial/orchestral.ly
index 25a3e416f5..e69de29bb2 100644
--- a/input/tutorial/orchestral.ly
+++ b/input/tutorial/orchestral.ly
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc
index 4487d746ce..4006c476a2 100644
--- a/lily/thread-devnull-engraver.cc
+++ b/lily/thread-devnull-engraver.cc
@@ -25,7 +25,21 @@ ADD_THIS_TRANSLATOR (Thread_devnull_engraver);
void
Thread_devnull_engraver::acknowledge_grob (Grob_info i)
{
- if (daddy_trans_l_->id_str_.left_str (3) == "two"
+ /*
+ FIXME: coriolan-fix hack -- ff geen inspiratie
+
+ We should have at least three modes:
+
+ 1. Never -- do nothing
+ 2. Allways -- junk everythingallways
+ 3. Regular: junk according to two/unison/unisilence/soloADue
+
+ but how shall we do that?
+
+ Hmm, maybe just: threadDevNull = 'never|'allways|...
+ */
+ if (!to_boolean (get_property ("disableDevNullThread"))
+ && daddy_trans_l_->id_str_.left_str (3) == "two"
&& (to_boolean (get_property ("unison"))
|| to_boolean (get_property ("unisilence")))
&& to_boolean (get_property ("soloADue")))
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 923aa009d8..2c82d19e3a 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -21,7 +21,7 @@ $(outdir)/%.ly: %.abc
$(PYTHON) $(script-dir)/abc2ly.py -o $@ $<
$(outdir)/%.dvi: $(outdir)/%.ly
- $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir) $<
+ $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir) $<
-mv $(basename $(<F))*.midi $(outdir)
# don't junk intermediate .dvi files. They're easier to view than
@@ -32,6 +32,10 @@ $(outdir)/%.dvi: %.ly
$(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir) $<
-mv $(basename $<)*.midi $(outdir)
+$(outdir)-$(PAPERSIZE)/%.dvi: %.ly
+ $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)-$(PAPERSIZE) -p $(PAPERSIZE) $<
+ -mv $(basename $<)*.midi $(outdir)-$(PAPERSIZE)
+
$(outdir)/%.dvi: %.fly
$(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir) $<
-mv $(basename $<)*.midi $(outdir)
diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly
index 364137e8e4..87ca0befa0 100644
--- a/mutopia/Coriolan/clarinetto-1.ly
+++ b/mutopia/Coriolan/clarinetto-1.ly
@@ -2,22 +2,22 @@
\version "1.3.120";
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 |
+ 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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- bes2\p\< ( a |
- )gis2. \!a4-.\f |
- R1*13 |
- d1\ff ~ |
+ bes2\p\< ( a|
+ )gis2. \!a4-.\f|
+ R1*13|
+ d1\ff ~|
d4(f, bes)a|
a'4. r8 a4. r8|
g4. r8 d4. r8|
@@ -91,7 +91,7 @@ clarinettoI = \notes \relative c {
e4 r8 e e4 r8 e|
e4\p r r2|
R1*3|
- r4 r8 es d4 r8 a |
+ r4 r8 es d4 r8 a|
bes4 r r2|
r4 r8 es d4 r8 a|
fis4 r r2|
@@ -175,7 +175,7 @@ clarinettoI = \notes \relative c {
cis d|
e d|
cis4 r bes r|
- g r a r |
+ g r a r|
d,\p r r2|
r r4 r8 a'\f|
a4 r r2|
diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly
index 8d262806ec..3b55f39758 100644
--- a/mutopia/Coriolan/clarinetto-2.ly
+++ b/mutopia/Coriolan/clarinetto-2.ly
@@ -2,18 +2,18 @@
\version "1.3.120";
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 ~ |
+ 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|
@@ -63,7 +63,7 @@ clarinettoII = \notes \relative c {
g f|
b a|
gis4 r f r|
- d r e r |
+ d r e r|
a,\p r r2|
r r4 r8 b'\f|
c4 r r2|
@@ -72,7 +72,7 @@ clarinettoII = \notes \relative c {
R1*3|
%a deux; urg|
c4\f r b r|
- a r g r |
+ a r g r|
f r a r8 a|
a4 r8 e e4 r8 e|
c'1~|
@@ -174,10 +174,10 @@ clarinettoII = \notes \relative c {
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||
+ 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~|
diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly
index 4fbb97a923..ae44067f9c 100644
--- a/mutopia/Coriolan/contrabasso.ly
+++ b/mutopia/Coriolan/contrabasso.ly
@@ -3,71 +3,71 @@
contrabasso = \notes \relative c {
% copied 21 from cello
- c1\ff ~ |
- c |
- f,4-. r r2 |
- R1 |
- c'1\ff ~ |
- c |
- f,4-. r r2 |
- R1 |
- c'1\ff ~ |
- c |
- fis,4-. r r2 |
- R1 |
- g4-. r r2 |
- g4-. r r2 |
- c4\p r4 r2 |
- c4 r4 r2 |
- c4 r4 r2 |
- R1 |
+ c1\ff ~|
+ c|
+ f,4-. r r2|
+ R1|
+ c'1\ff ~|
+ c|
+ f,4-. r r2|
+ R1|
+ c'1\ff ~|
+ c|
+ fis,4-. r r2|
+ R1|
+ g4-. r r2|
+ g4-. r r2|
+ c4\p r4 r2|
+ c4 r4 r2|
+ c4 r4 r2|
+ R1|
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
- c'4.\< c8 bes4. bes8 |
+ c'4.\< c8 bes4. bes8|
%20
- as4. as8 \!g4\f r4 |
+ as4. as8 \!g4\f r4|
R1|
- bes,4\p r4 r2 |
- bes4 r4 r2 |
- bes4 r4 r2 |
+ bes,4\p r4 r2|
+ bes4 r4 r2|
+ bes4 r4 r2|
%25
- R1 |
+ R1|
% copied 14 from cello
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
- bes'4.\< bes8 as4. as8 |
- g4 \!g4-.\f r2 |
+ 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 ~ |
+ as4.\p as8 g4. g8|
+ f2.-"cresc" g4|
+ f2. g4|
+ f4. g8 f4. g8|
+ f4. g8 f4. g8|
+ as1\ff ~|
%35
as4(g f)es|
- d4. r8 c4. r8 |
- b4. r8 c4. r8 |
- bes4. r8 as4. r8 |
- g4. r8 f4. r8 |
+ d4. r8 c4. r8|
+ b4. r8 c4. r8|
+ bes4. r8 as4. r8|
+ g4. r8 f4. r8|
%40
- fis2\sf r |
- fis2\sf r |
- f!2\sf r |
- f2\sf r |
- e2\sf r |
+ fis2\sf r|
+ fis2\sf r|
+ f!2\sf r|
+ f2\sf r|
+ e2\sf r|
%45
- es!2\sf r |
+ es!2\sf r|
des2. es4\sf(|
)d2. es4\sf(|
)d2. es4\sf(|
)d2. es4\sf(|
% 50
- )d4 r r2 |
+ )d4 r r2|
R1
es'4\p r r r8 es(|
)as,4 r r r8 as(|
@@ -82,8 +82,8 @@ contrabasso = \notes \relative c {
%60
)es4 r r r8 es(|
)as,4 r r r8 as(|
- \!)g2\ff f |
- e c' |
+ \!)g2\ff f|
+ e c'|
f,4\p r r r8 f(|
%65
)bes4 r r r8 bes(|
@@ -94,82 +94,82 @@ contrabasso = \notes \relative c {
)f4\< r r r8 f(|
)bes4 r r r8 bes(|
%70
- \!)as2\ff g |
- fis d' |
+ \!)as2\ff g|
+ fis d'|
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
g,4\p\< r r r8 g(|
)c4 r r r8 c(|
- % )<b1\sf\> { s2 s4 \!s8}> |
- \!)b1\sf |
+ % )<b1\sf\> { 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 |
+ c4\p r d r|
+ es r d r|
+ c r cis r|
+ d4\pp r d r|
+ d r d r|
%80
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
- d r d\< r |
- d r d r |
- d r d r |
- d r d r |
+ d r d\< r|
+ d r d r|
+ d r d r|
+ d r d r|
% copied 8 from cello
- \!c'2.\ff()bes4 |
+ \!c'2.\ff()bes4|
%85
a(g a)g|
- c2.()bes4 |
+ c2.()bes4|
a(g a)g|
- f!2.()es4 |
+ f!2.()es4|
d(c d)c|
%90
- f2.()es4 |
+ f2.()es4|
d(c d)c|
- c4 r r2 |
- c4 r r2 |
- c4 r r2 |
+ 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 |
+ 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 |
+ 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 |
+ 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 |
+ [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 |
+ 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 |
+ 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 |
+ 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:]|
@@ -178,21 +178,21 @@ contrabasso = \notes \relative c {
[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 |
+ f,1\ff ~|
+ f|
bes,4-. r r2
%155
- R1 |
- f'1\ff ~ |
- f |
- b,2\sf r |
- b2\sf r |
+ 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( |
+ R1*3|
+ bes2\ff r|
+ bes2\sf r|
+ R1*2|
+ r2 r4 bes\ff(|
)as2. bes4\sf(|
)as2. bes4\sf(|
)as2. bes4\sf(|
@@ -201,8 +201,8 @@ contrabasso = \notes \relative c {
)b2. c4\sf(|
)b2. c4\sf(|
)b2. c4\sf(|
- )b4 r r2 |
- R1 |
+ )b4 r r2|
+ R1|
c4\p r r r8 c(|
)f,4 r r r8 f(|
%180
@@ -217,8 +217,8 @@ contrabasso = \notes \relative c {
)b4 r r r8 b(|
)c4 r r r8 c(|
)f,4 r r r8 f(|
- \!)e2\ff d' |
- cis a |
+ \!)e2\ff d'|
+ cis a|
%190
d4\p r r r8 d(|
)g,4 r r r8 g(|
@@ -229,72 +229,72 @@ contrabasso = \notes \relative c {
)d4\< r r r8 d(|
%195
- )g,4 r r r8 g( |
- \!)d2\ff e' |
- dis b |
+ )g,4 r r r8 g(|
+ \!)d2\ff e'|
+ dis b|
es4\p r r r8 es(|
)a,4 r r r8 a(|
- )g1 |
+ )g1|
%200
- f |
+ f|
% copied 18 from cello
- es'!4\fp r e r |
- f r g r |
- as r g r |
- f r fis r |
+ 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 |
+ g r g r|
+ g r g r|
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
- g r g\< r |
- g r g r |
+ 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 |
+ 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 |
+ 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 |
+ 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 |
+ 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 |
+ c4 r r2|
+ R1*3|
%copied 59 from cello
[c8\f e g as][bes, d fis g]|
%240
[as, c e f!][g, bes d es]|
- f4 r r2 |
- R1*3 |
+ f4 r r2|
+ R1*3|
c4\p r r r8 c(|
%245
@@ -311,30 +311,30 @@ contrabasso = \notes \relative c {
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
)c4\< r r r8 c(|
)f4 r r r8 f,(|
- )es1 |
+ )es1|
%255
- \!ges\f |
- f\p |
- as\f |
- g!\p |
- bes\f |
+ \!ges\f|
+ f\p|
+ as\f|
+ g!\p|
+ bes\f|
%260
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.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 |
+ 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 |
+ 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\ff d es c]|
@@ -345,57 +345,57 @@ contrabasso = \notes \relative c {
%275
[c b c g][c b c g]|
- c1 ~ |
- c |
- f4-. r r2 |
- R1 |
+ c1 ~|
+ c|
+ f4-. r r2|
+ R1|
%280
- c1 ~ |
- c |
- f4-. r r2 |
- R1 |
- c1 ~ |
+ c1 ~|
+ c|
+ f4-. r r2|
+ R1|
+ c1 ~|
%285
- c |
- fis4-. f-. r2 |
+ c|
+ fis4-. f-. r2|
R1|
- es4-. e-. r2 |
- f,4-. g-. r2 |
+ es4-. e-. r2|
+ f,4-. g-. r2|
%290
\property StaffCombineVoice.decrescendoText = #"dim."
\property StaffCombineVoice.decrescendoSpanner = #'dashed-line
- as4\> r b r |
- R1 |
+ as4\> r b r|
+ R1|
\!c4\p r r2|
- R1 |
- g4-"pizz." r r2 |
+ R1|
+ g4-"pizz." r r2|
%295
- R1 |
- c4 r r2 |
- r2 r4 f, |
- c' r r2 |
- r2 r4 f, |
+ R1|
+ c4 r r2|
+ r2 r4 f,|
+ c' r r2|
+ r2 r4 f,|
%300
- c' r r2 |
- R1 |
- f,4 r r2 |
- R1 |
- c'4 r r2 |
+ c' r r2|
+ R1|
+ f,4 r r2|
+ R1|
+ c'4 r r2|
%305
- R1 |
- f,4 r r2 |
- R1*3 |
+ R1|
+ f,4 r r2|
+ R1*3|
%310
- c'4\pp r r2 |
- R1 |
- c4 r r2 |
- c4 r r2 |
- c4 r r2 |
+ c'4\pp r r2|
+ R1|
+ c4 r r2|
+ c4 r r2|
+ c4 r r2|
}
diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly
index 250e8b6c3b..20812fcb68 100644
--- a/mutopia/Coriolan/corno-1.ly
+++ b/mutopia/Coriolan/corno-1.ly
@@ -2,32 +2,32 @@
\version "1.3.120";
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 |
+ 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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- r8 f\p\< f2 e4 |
- r8 f f2 e4 |
- f4. e8 f4. e8 |
- f4. e8 f4. e8 |
- \!f1\ff % ~ |
+ 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 |
+ e4. r8 e4. r8|
+ e4. r8 e4. r8|
+ e4. r8 d4. r8|
g4. r8 f4. r8
c2 \sf r2
c2 \sf r2
@@ -38,9 +38,9 @@ cornoI = \notes \relative c {
g2. g4\sf
g2. g4\sf
g2. g4\sf
- g r4 r2 |
- R1 |
- g\p~ |
+ g r4 r2|
+ R1|
+ g\p~|
g~|
g~|
g~|
@@ -55,51 +55,51 @@ cornoI = \notes \relative c {
c2. \ff e4|
r4 e r e c2. e4 r4 e r e|
f2. e4|
- e e e e |
+ e e e e|
f2. e4|
- e e e e ||
+ 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 ||
+ c4 r4 c r|
|
e4 r e r|
r2 e4 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\f r8 e e4 r8 e|
|
- e4 r8 e e4 r8 e ||
+ e4 r8 e e4 r8 e|
|
- e4 r8 e g4 r8 g ||
+ e4 r8 e g4 r8 g|
|
g4 r8 g8 r2|
g1~|
g|
- g4. g8 g4 r8 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|
|
- g4 r8 g g4 r8 g ||
+ g4 r8 g g4 r8 g|
|
- f4\p r4 r2 ||
+ 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 ||
+ d r r2|
|
R1|
d4-.\ff r4 r2|
@@ -109,7 +109,7 @@ cornoI = \notes \relative c {
e2\ff r2 e \sf r2|
R1*3|
d2.\ff r4|
- d2. r4 ||
+ d2. r4|
d2. r4|
d2. r4|
e2. r4|
@@ -120,12 +120,12 @@ cornoI = \notes \relative c {
R1*11|
e2 d2|
R1*17|
- r4 r8 e,8 e4. e8||
- r4 r8 e8 e4. e8||
- r4 r8 e8 e4. e8||
- r4 r8 e8 e4. e8||
- r4 r8 e8 e4. e8||
- r4 r8 e8 e4. e8||
+ r4 r8 e,8 e4. e8|
+ r4 r8 e8 e4. e8|
+ r4 r8 e8 e4. e8|
+ r4 r8 e8 e4. e8|
+ r4 r8 e8 e4. e8|
+ r4 r8 e8 e4. e8|
f'2. e4|
d e d e|
f2. e4|
@@ -138,20 +138,20 @@ cornoI = \notes \relative c {
r4 r8 f f2|
r4 r8 f f2|
r4 r8 f f2 |
- f2 e~ ||
- e d~ ||
+ f2 e~|
+ e d~|
d1 ~ d1|
- d4 r4 f r |
+ d4 r4 f r|
d r e r|
R1|
- r2 r4 r8 e\f |
+ r2 r4 r8 e\f|
e4 r4 r2|
- r2 r4 r8 e8 |
+ r2 r4 r8 e8|
e4 r r2|
R1*3|
%a deux|
c4\f r e r|
- d r c r |
+ d r c r|
d r r2|
R1|
e1\p~|
diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly
index 6ca40a6be3..3dec8f7b7b 100644
--- a/mutopia/Coriolan/corno-2.ly
+++ b/mutopia/Coriolan/corno-2.ly
@@ -2,28 +2,28 @@
\version "1.3.120";
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 |
+ 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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- r8 f'\p\< f2 e4 |
- r8 f f2 e4 |
- f4. e8 f4. e8 |
- f4. e8 f4. e8 |
+ 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|
@@ -192,19 +192,19 @@ cornoII = \notes \relative c {
d\f|
e\p|
e\f|
- d4\p r r2 |
+ 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||
+ 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|
@@ -215,5 +215,5 @@ cornoII = \notes \relative c {
%a deux|
e4-. e-. r2|
d4-. e-. r2|
- R1*25||
+ R1*25|
}
diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly
index 90b9f2d445..f14ac3e426 100644
--- a/mutopia/Coriolan/fagotto-1.ly
+++ b/mutopia/Coriolan/fagotto-1.ly
@@ -2,31 +2,31 @@
\version "1.3.120";
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 |
+ 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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- ges'2\p\< f2 ~ |
- f4 \!e-.\f r2 |
- R1 |
- f2\p()es |
+ ges'2\p\< f2 ~|
+ f4 \!e-.\f r2|
+ R1|
+ f2\p()es|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- d1\< |
- d |
- d2 d |
- d d |
- \!c1\ff ~ |
+ d1\<|
+ d|
+ d2 d|
+ d d|
+ \!c1\ff ~|
c4(bes as)g|
f4. r8 es4. r8|
b'4. r8 c4. r8|
@@ -109,15 +109,15 @@ fagottoI = \notes \relative c {
%% 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 ||
+ [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 ||
+ g2 ~ g4. g8|
+ g4. g8 g4 r8 g|
+ g4 r8 g g4 r8 g|
g4\p r r2|
@@ -144,10 +144,10 @@ fagottoI = \notes \relative c {
)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:]||
+ [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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
@@ -157,13 +157,13 @@ fagottoI = \notes \relative c {
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:]||
+ [\!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]||
+ % 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|
@@ -261,8 +261,8 @@ fagottoI = \notes \relative c {
R1*7|
%%238 copied from cello from viola|
- [c8\f e g as][bes, d fis g]||
- [as, c e f!][g, bes d es]||
+ [c8\f e g as][bes, d fis g]|
+ [as, c e f!][g, bes d es]|
f4 r r2|
@@ -294,25 +294,25 @@ fagottoI = \notes \relative c {
r4 r8 c c2\sf|
r4 r8 d d2\sf|
- %% 270 copied from cello |
- [c,8-"sempre"\ff b c d][es\ff d es c]||
- [b c d c][b c b g]||
- [c8 b c d][es d es c]||
- [b c d c][b c b g]||
- [c b c g][c b c g]||
+ %% 270 copied from cello|
+ [c,8-"sempre"\ff b c d][es\ff d es c]|
+ [b c d c][b c b g]|
+ [c8 b c d][es d es c]|
+ [b c d c][b c b g]|
+ [c b c g][c b c g]|
%275|
- [c b c g][c b c g]||
+ [c b c g][c b c g]|
- c1~ |
+ c1~|
c|
f4 r r2|
R1|
- c1~ |
+ c1~|
c|
f4 r r2|
R1|
- c1~ |
+ c1~|
c|
es'4-. d-. r2|
R1|
diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly
index 9806c3bffc..5530b17dd8 100644
--- a/mutopia/Coriolan/fagotto-2.ly
+++ b/mutopia/Coriolan/fagotto-2.ly
@@ -2,21 +2,21 @@
\version "1.3.120";
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 ~ |
+ 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|
@@ -26,7 +26,7 @@ fagottoII = \notes \relative c {
fis\sf r|
f\sf r|
f\sf r|
- e1\sf |
+ e1\sf|
es\sf|
d2. es4\sf(|
)d2. es4\sf(|
@@ -43,8 +43,8 @@ fagottoII = \notes \relative c {
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- g''2.(as4 \p\<||
- g f d)bes||
+ g''2.(as4 \p\<|
+ g f d)bes|
%\clef "bass";
% Ugh, clef broken in 1.3.125
@@ -94,7 +94,7 @@ fagottoII = \notes \relative c {
b2 bes|
as g|
fis es|
- d4 r es r |
+ d4 r es r|
c r d r|
g1\p|
fis|
@@ -107,18 +107,18 @@ fagottoII = \notes \relative c {
%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 |||
+ % 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||
+ g'1\p|
fis|
@@ -142,29 +142,29 @@ fagottoII = \notes \relative c {
c|
%a deux|
- \!des2\p( c||
- bes as||
- ges f||
- )es as,||
+ \!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:]|||
+ %% 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]|||
+ %%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|
@@ -269,11 +269,11 @@ fagottoII = \notes \relative c {
)d g,|
%a deux|
- %%238 copied from cello from viola||
- [c8\f e g as][bes, d fis g]|||
- [as, c e f!][g, bes d es]|||
+ %%238 copied from cello from viola|
+ [c8\f e g as][bes, d fis g]|
+ [as, c e f!][g, bes d es]|
- f4 r r2||
+ f4 r r2|
R1*14|
ges\f|
@@ -296,14 +296,14 @@ fagottoII = \notes \relative c {
r4 r8 b b2\sf|
% a deux|
- %% 270 copied from cello ||
- [c,8-"sempre"\ff b c d][es\ff d es c]|||
- [b c d c][b c b g]|||
- [c8 b c d][es d es c]|||
- [b c d c][b c b g]|||
- [c b c g][c b c g]|||
- %275||
- [c b c g][c b c g]|||
+ %% 270 copied from cello|
+ [c,8-"sempre"\ff b c d][es\ff d es c]|
+ [b c d c][b c b g]|
+ [c8 b c d][es d es c]|
+ [b c d c][b c b g]|
+ [c b c g][c b c g]|
+ %275|
+ [c b c g][c b c g]|
% a deux|
c1~|
diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly
index c21336a37c..827f3f28b4 100644
--- a/mutopia/Coriolan/flauto-1.ly
+++ b/mutopia/Coriolan/flauto-1.ly
@@ -2,50 +2,50 @@
\version "1.3.120";
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 |
+ 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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- r2 g'\p\< ( |
- )fis2. \!g4-.\f |
- R1*5 |
+ r2 g'\p\< (|
+ )fis2. \!g4-.\f|
+ R1*5|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- r2 f\p\< ~ |
- f4 \!e-.\f r2 |
- R1 |
- f2\p()es |
+ r2 f\p\< ~|
+ f4 \!e-.\f r2|
+ R1|
+ f2\p()es|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- d1\< |
- d1 |
- d2 d2 |
- d2 d2 |
+ 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 |
+ 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 |
+ f4 r r2|
R1*9|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
@@ -77,7 +77,7 @@ flautoI = \notes \relative c {
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
r r4 r8 bes\<|
- c4 r r r8 c |
+ c4 r r r8 c|
d4 r r r8 d|
\!es2.\ff()d4|
fis(g fis)g|
@@ -203,7 +203,7 @@ flautoI = \notes \relative c {
r r4 r8 d\f|
es4 r r2|
R1*3|
- es4\f r d r |
+ es4\f r d r|
c r8 f8 es4 r8 bes|
as4-. des4-. r2|
R1*11|
diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly
index 7109fd837f..ceeecc5177 100644
--- a/mutopia/Coriolan/flauto-2.ly
+++ b/mutopia/Coriolan/flauto-2.ly
@@ -2,22 +2,22 @@
\version "1.3.120";
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 ~ |
+ 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|
@@ -55,7 +55,7 @@ flautoII = \notes \relative c {
c r d r|
es,\p r r2|
r r4 r8 d'\f|
- d4 r r2 |
+ d4 r r2|
r r4 r8 d\f|
d4 r r2|
R1*3|
@@ -103,13 +103,13 @@ flautoII = \notes \relative c {
% 220 a deux?|
R1*5|
r2 a|
- b c |
+ b c|
d c|
b4 r as r|
f r g r|
c,\p r r2|
r r4 r8 g'\f|
- g4 r r2 |
+ g4 r r2|
r r4 r8 g\f|
g4 r r2|
R1*3|
@@ -136,14 +136,14 @@ flautoII = \notes \relative 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||
+ 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|
diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly
index effd0d5ca2..a3aaf027dc 100644
--- a/mutopia/Coriolan/oboe-1.ly
+++ b/mutopia/Coriolan/oboe-1.ly
@@ -2,33 +2,33 @@
\version "1.3.120";
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 |
+ 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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- as2\p\< ( g |
- )fis2. \!g4-.\f |
- R1*5 |
+ as2\p\< ( g|
+ )fis2. \!g4-.\f|
+ R1*5|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- ges2\p\< f ~ |
- f4 \!e\f r2 |
- R1 |
- f2\p()es |
+ ges2\p\< f ~|
+ f4 \!e\f r2|
+ R1|
+ f2\p()es|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- d1\< |
- d |
- d2 d |
- d d |
+ d1\<|
+ d|
+ d2 d|
+ d d|
\!f1\ff ~|
f4(es des)c|
f4. r8 es4. r8|
@@ -70,7 +70,7 @@ oboeI = \notes \relative c'' {
d(c2)bes4|
bes(a bes)g|
fis\pp r r2|
- r r4 r8 fis' |
+ r r4 r8 fis'|
g4 r r2|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
@@ -112,7 +112,7 @@ oboeI = \notes \relative c'' {
g4\p r r2|
R1*15|
r4 r8 as-"cresc" ges4 r8 des|
- es4 r8 bes' as4 r8 es |
+ es4 r8 bes' as4 r8 es|
f4 r r2|
R1*3|
f4\f r r r8 es|
diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly
index 12f44e4701..fc9541ee84 100644
--- a/mutopia/Coriolan/oboe-2.ly
+++ b/mutopia/Coriolan/oboe-2.ly
@@ -3,20 +3,20 @@
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 ~ |
+ 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|
@@ -57,7 +57,7 @@ oboeII = \notes \relative c{
R1*3|
%a deux; urg: copied oboe-1(110,111)|
bes'4\f r a r|
- g r f r |
+ g r f r|
es r g r8 g|
g4 r8 g fis4 r8 fis|
bes,1~|
@@ -79,7 +79,7 @@ oboeII = \notes \relative c{
bes4 r8 bes bes4 r8 bes|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- c1\p\< ~||
+ c1\p\< ~|
c~|
c~|
c|
@@ -117,17 +117,17 @@ oboeII = \notes \relative c{
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||
+ 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|
@@ -155,10 +155,10 @@ oboeII = \notes \relative 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.-"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~|
diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly
index f38440325f..539732b093 100644
--- a/mutopia/Coriolan/timpani.ly
+++ b/mutopia/Coriolan/timpani.ly
@@ -2,30 +2,30 @@
\version "1.3.120";
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 |
+ 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 = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- r2 c4-.\p\< r |
- r2 c4-. r |
- r2 c4-. r |
- c r c r |
- \!c1\ff-\trill |
+ 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 |
+ g r c r|
c r c r|
c r c r|
c\sf r r2|
@@ -85,9 +85,9 @@ timpani = \notes \relative c {
g2:16\ff g4 g|
g c g c|
c2:16 c4 c|
- c c c c |
+ c c c c|
c2:16 c4 c|
- c c c c |
+ c c c c|
R1*8|
g4 r c r|
c r g r|
diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly
index f7aa7cc240..85420657e7 100644
--- a/mutopia/Coriolan/trombo-1.ly
+++ b/mutopia/Coriolan/trombo-1.ly
@@ -2,32 +2,32 @@
\version "1.3.120";
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 |
+ 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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- r2 c4\p\< r |
- r2 c4 r |
- r2 c4 r |
- c r c r |
- \!c1\ff ~ |
+ 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 |
+ c4. r8 c4. r8|
+ c4. r8 c4. r8|
c2\sf r|
c2\sf r|
R1*3|
@@ -98,7 +98,7 @@ tromboI = \notes \relative c {
g4 r c r|
c r g r|
R1|
- r2 r4 r8 g\f |
+ r2 r4 r8 g\f|
c4 r r2|
r r4 r8 g\f|
c4 r r2|
@@ -124,7 +124,7 @@ tromboI = \notes \relative c {
g r r2|
c4 r c r|
g r r2|
- c4 r c r |
+ c4 r c r|
c r c r|
%a deux|
c,1~|
@@ -146,9 +146,9 @@ tromboI = \notes \relative c {
c4\> r g r|
R1|
\!g4\p r r2|
- R1 |
+ R1|
g4 r r2|
- R1 |
+ R1|
c,4\pp r r2|
R1*18|
}
diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly
index 13056eabd5..40bd7f5ae9 100644
--- a/mutopia/Coriolan/trombo-2.ly
+++ b/mutopia/Coriolan/trombo-2.ly
@@ -2,32 +2,32 @@
\version "1.3.120";
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 |
+ 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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- r2 c4\p\< r |
- r2 c4 r |
- r2 c4 r |
- c r c r |
- \!c1\ff ~ |
+ 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 |
+ c4. r8 c4. r8|
+ c4. r8 c4. r8|
c2\sf r|
c2\sf r|
R1*3|
@@ -120,7 +120,7 @@ tromboII = \notes \relative c {
c4. c8 c2~|
c4. c8 c2|
r4 r8 g'8 g2|
- c,4-"sempre"\ff r c r||
+ c,4-"sempre"\ff r c r|
g r r2|
c4 r c r|
g r r2|
diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly
index 17a8073a82..72d7bba1ad 100644
--- a/mutopia/Coriolan/viola-1.ly
+++ b/mutopia/Coriolan/viola-1.ly
@@ -2,75 +2,75 @@
\version "1.3.120";
violaI = \notes \relative c {
- c'1\ff ~ |
- c |
- f,4-. r r2 |
- R1 |
+ c'1\ff ~|
+ c|
+ f,4-. r r2|
+ R1|
% copied 3 bars from three back...
%5
- c'1 ~ |
- c |
- f,4-. r r2 |
- R1 |
- c'1 ~ |
- c |
- fis,4-. r r2 |
- R1 |
- g'4-. r r2 |
- g4-. r r2 |
+ c'1 ~|
+ c|
+ f,4-. r r2|
+ R1|
+ c'1 ~|
+ c|
+ fis,4-. r r2|
+ R1|
+ g'4-. r r2|
+ g4-. r r2|
% copied from violino-1...
%15
- [c,,8-.\p es-.] [es()d] [d-. g-.] g4-"ten." |
- [c,8-. es-.] [es()d] [d-. g-.] g4-"ten." |
- [c,8-. es-.] [es()d] [d-. as'-.] [as()g] |
- [g8-. c-.] [c()b] [b-. f'-.] [f()es] |
+ [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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- es4.\< es8 d4. d8 |
+ 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] |
+ 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] |
+ [f-. bes-.][bes()a][a-. es'-.][es()des]|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- des4.\< des8 c4. c8 |
- bes4 \!bes4-.\f r2 |
+ des4.\< des8 c4. c8|
+ bes4 \!bes4-.\f r2|
R1
% same rhythm as violins...
- r8 c-.\p c4. c8-. c4~ |
+ r8 c-.\p c4. c8-. c4~|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- [c8\< c-.]c2.~ |
+ [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 |
+ [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: |
+ [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] |
+ 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] |
+ 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 |
+ bes4 r r2|
+ R1|
es,4\p r r r8 es(|
)as4 r r r8 as (|
)g4 r r r8 g(|
@@ -84,9 +84,9 @@ violaI = \notes \relative c {
)d4 r r r8 d(|
%60
)es4 r r r8 es(|
- )as4 r r r8 as |
- \!bes2:16\ff as: |
- g: e: |
+ )as4 r r r8 as|
+ \!bes2:16\ff as:|
+ g: e:|
f4\p r r r8 f(|
%65
)bes4 r r r8 bes(|
@@ -95,78 +95,78 @@ violaI = \notes \relative c {
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
)f4\< r r r8 f(|
- )bes4 r r r8 bes |
+ )bes4 r r r8 bes|
%70
- \!c2:\ff bes: |
- a: fis: |
+ \!c2:\ff bes:|
+ a: fis:|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
g4\p\< r r r8 g(|
- )c,4 r r r8 c |
- [\!f8\sf(\>as f as][f g d)\!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 ~ |
+ 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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- [d8\< d-.] es4. es8-. d4 ~ |
- [d8 d-.] es4. es8-. d4 ~ |
- [d8 d-.] es4. es8-. d4 ~ |
+ [d8\< d-.] es4. es8-. d4 ~|
+ [d8 d-.] es4. es8-. d4 ~|
+ [d8 d-.] es4. es8-. d4 ~|
[d8 d-.] es4. es8-. d4 (|
- \!)fis,2:\ff fis4: g: |
+ \!)fis,2:\ff fis4: g:|
%85
- d2: d: |
- fis: fis4: g: |
- c,: d: c: d: |
- b2: b4: c: |
- f': es: f: es: |
+ d2: d:|
+ fis: fis4: g:|
+ c,: d: c: d:|
+ b2: b4: c:|
+ f': es: f: es:|
%90
- b2: b4: c: |
- d: c: d: c: |
- c,4 r8 c' c4\sf()des |
- r r8 c c4\sf()des |
+ b2: b4: c:|
+ d: c: d: c:|
+ c,4 r8 c' c4\sf()des|
+ r r8 c c4\sf()des|
- r r8 c c4\sf()des |
+ r r8 c c4\sf()des|
- r r8 c c4\sf()des |
+ r r8 c c4\sf()des|
- [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: |
+ [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 |
+ [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] |
+ [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] |
+ [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,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: |
+ 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] |
+ [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]|
@@ -221,38 +221,38 @@ violaI = \notes \relative c {
%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,1\ff ~|
+ f|
f'4 r r2
R1
%155
- f,1 ~ |
- f |
- d'2\sf [f,8-. as-.][as()g] |
+ f,1 ~|
+ f|
+ d'2\sf [f,8-. as-.][as()g]|
- 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 |
+ [f8-.\p as-.][as()f][g-. c-.][c()b]|
+ R1*2|
- g2\ff [es8-. g-.][g()f] |
- g2\sf [es8-. g-.][g()f] |
+ 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 |
+ [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-.] |
+ 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 |
+ 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 |
+ )b r r2|
R1
% ugh, should be quoted and transposed
c,4\p r r r8 c8(|
@@ -270,8 +270,8 @@ violaI = \notes \relative c {
)b'4 r r r8 b8(|
)c4 r r r8 c,8(|
)f4 r r r8 f8|
- \!g'2:16\ff f: |
- e: cis: |
+ \!g'2:16\ff f:|
+ e: cis:|
%190
d,4\p r r r8 d8(|
)g4 r r r8 g8(|
@@ -282,127 +282,127 @@ violaI = \notes \relative c {
)d4 r r r8 d8(|
%195
)g4 r r r8 g8|
- [\!a16\ff a' a a]a4: a2: |
- fis: dis: |
+ [\!a16\ff a' a a]a4: a2:|
+ fis: dis:|
e,4\p r r r8 e8(|
)a4\< r r r8 a8(|
%200
- [)g(g e g][e g e)g] |
+ [)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] |
+ [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 ~ |
+ r[c\p(as)c]r[c(a)c]|
+ [b-. g'-.] as4. as8-. g4 ~|
+ [g8 g-.] as4. as8-. g4 ~|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- [g8 g-.\<] as4. as8-. g4 ~ |
- [g8 g-.] as4. as8-. g4 ~ |
+ [g8 g-.\<] as4. as8-. g4 ~|
+ [g8 g-.] as4. as8-. g4 ~|
%210
- [g8 g-.] as4. as8-. g4 ~ |
+ [g8 g-.] as4. as8-. g4 ~|
[g8 g-.] as4. as8-. g4 (|
- \!)b,2:16\ff b4: c: |
- g'2: g: |
+ \!)b,2:16\ff b4: c:|
+ g'2: g:|
%214
- b,2:16\ff b4: c: |
- g'2: g: |
+ 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:|
- e2:16\ff e4: f: |
- b,: c: b: c: |
+ e2:16\ff e4: f:|
+ b,: c: b: 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: |
+ [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 |
+ [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] |
+ 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 |
+ f,4 r r2|
+ R1*11|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
c'4\p\< r r r8 c8(|
)f4 r r r8 f,8(|
- )es1 |
+ )es1|
%255
- \!ges\f |
- f\p |
- as\f |
+ \!ges\f|
+ f\p|
+ as\f|
g\p
- e'2:16\f e: |
+ e'2:16\f e:|
%260
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.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 |
+ [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 |
+ 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] |
+ g2:16-"sempre" g:\ff|
+ g: g:|
+ g: g:|
+ g: g:|
+ [g8 b, c g][c b c g]|
%275
- [c b c g][c b c g] |
- c,1 ~ |
- c |
- f4-. r r2 |
- R1 |
- c1 ~ |
- c |
- f4-. r r2 |
- R1 |
- c1 ~ |
- c |
- fis4-. f-. r2 |
- R1 |
- es4-. e-. r2 |
- f4-. g-. r2 |
+ [c 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 VoiceCombineVoice.decrescendoText = #"dim."
\property VoiceCombineVoice.decrescendoSpanner = #'dashed-line
- as4\> r g r |
- R1 |
- \!c4\p r r2 |
- R1 |
- g4-"pizz." r r2 |
- R1 |
- c,4 r r2 |
- R1*15 |
- c4\pp r r2 |
- c4 r r2 |
- c4 r r2 |
+ as4\> r g r|
+ R1|
+ \!c4\p r r2|
+ R1|
+ g4-"pizz." r r2|
+ R1|
+ c,4 r r2|
+ R1*15|
+ c4\pp r r2|
+ c4 r r2|
+ c4 r r2|
}
diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly
index db61eb7e27..9f90c1d844 100644
--- a/mutopia/Coriolan/viola-2.ly
+++ b/mutopia/Coriolan/viola-2.ly
@@ -2,75 +2,75 @@
\version "1.3.120";
violaII = \notes \relative c {
- c1\ff ~ |
- c |
- f4-. r r2 |
- R1 |
+ 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 |
+ 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] |
+ [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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- es4.\< es8 d4. d8 |
+ 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] |
+ 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] |
+ [f-. bes-.][bes()a][a-. es'-.][es()des]|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- des4.\< des8 c4. c8 |
- bes4 \!bes4-.\f r2 |
+ des4.\< des8 c4. c8|
+ bes4 \!bes4-.\f r2|
R1
% same rhythm as violins...
- r8 c,-.\p c4. c8-. c4~ |
+ r8 c,-.\p c4. c8-. c4~|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- [c8\< c-.]c2.~ |
+ [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 |
+ [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: |
+ [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] |
+ 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] |
+ 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 |
+ bes4 r r2|
+ R1|
es,4\p r r r8 es(|
)as4 r r r8 as (|
)g4 r r r8 g(|
@@ -84,9 +84,9 @@ violaII = \notes \relative c {
)d4 r r r8 d(|
%60
)es4 r r r8 es(|
- )as4 r r r8 as |
- \!g2:16\ff f: |
- e: c: |
+ )as4 r r r8 as|
+ \!g2:16\ff f:|
+ e: c:|
f4\p r r r8 f(|
%65
)bes4 r r r8 bes(|
@@ -95,78 +95,78 @@ violaII = \notes \relative c {
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
)f4\< r r r8 f(|
- )bes4 r r r8 bes |
+ )bes4 r r r8 bes|
%70
- \!as2:\ff g: |
- fis: d: |
+ \!as2:\ff g:|
+ fis: d:|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
g4\p\< r r r8 g(|
- )c,4 r r r8 c |
- [\!f8\sf(\>as f as][f g d)\!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 ~ |
+ 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 VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- [d8\< d-.] es4. es8-. d4 ~ |
- [d8 d-.] es4. es8-. d4 ~ |
- [d8 d-.] es4. es8-. d4 ~ |
+ [d8\< d-.] es4. es8-. d4 ~|
+ [d8 d-.] es4. es8-. d4 ~|
+ [d8 d-.] es4. es8-. d4 ~|
[d8 d-.] es4. es8-. d4 (|
- \!)fis,2:\ff fis4: g: |
+ \!)fis,2:\ff fis4: g:|
%85
- d2: d: |
- fis: fis4: g: |
- c,: d: c: d: |
- b2: b4: c: |
- f': es: f: es: |
+ d2: d:|
+ fis: fis4: g:|
+ c,: d: c: d:|
+ b2: b4: c:|
+ f': es: f: es:|
%90
- b2: b4: c: |
- d: c: d: c: |
- c,4 r8 c' c4\sf()des |
- r r8 c c4\sf()des |
+ b2: b4: c:|
+ d: c: d: c:|
+ c,4 r8 c' c4\sf()des|
+ r r8 c c4\sf()des|
- r r8 c c4\sf()des |
+ r r8 c c4\sf()des|
- r r8 c c4\sf()des |
+ r r8 c c4\sf()des|
- [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: |
+ [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 |
+ [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] |
+ [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] |
+ [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,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: |
+ 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] |
+ [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]|
@@ -221,38 +221,38 @@ violaII = \notes \relative c {
%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,1\ff ~|
+ f|
bes4 r r2
%155
R1
- f1 ~ |
- f |
- b2\sf [f8-. as-.][as()g] |
+ f1 ~|
+ f|
+ b2\sf [f8-. as-.][as()g]|
- 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 |
+ [f8-.\p as-.][as()f][g-. c-.][c()b]|
+ R1*2|
- e,2\ff [es8-. g-.][g()f] |
- e2\sf [es8-. g-.][g()f] |
+ 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 |
+ [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-.] |
+ 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 |
+ 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 |
+ )b r r2|
R1
% ugh, should be quoted and transposed
c,4\p r r r8 c8(|
@@ -270,8 +270,8 @@ violaII = \notes \relative c {
)b'4 r r r8 b8(|
)c4 r r r8 c,8(|
)f4 r r r8 f8|
- \!e'2:16\ff d: |
- cis: a: |
+ \!e'2:16\ff d:|
+ cis: a:|
%190
d,4\p r r r8 d8(|
)g4 r r r8 g8(|
@@ -282,66 +282,66 @@ violaII = \notes \relative c {
)d4 r r r8 d8(|
%195
)g4 r r r8 g8|
- [\!f16\ff f' f f]f4: f2: |
- dis: b: |
+ [\!f16\ff f' f f]f4: f2:|
+ dis: b:|
e,4\p r r r8 e8(|
)a4\< r r r8 a8(|
%200
- [)g(g e g][e g e)g] |
+ [)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] |
+ [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 ~ |
+ r[as\p(d,)as']r[a(es)a]|
+ [g-. g'-.] as4. as8-. g4 ~|
+ [g8 g-.] as4. as8-. g4 ~|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
- [g8 g-.\<] as4. as8-. g4 ~ |
- [g8 g-.] as4. as8-. g4 ~ |
+ [g8 g-.\<] as4. as8-. g4 ~|
+ [g8 g-.] as4. as8-. g4 ~|
%210
- [g8 g-.] as4. as8-. g4 ~ |
+ [g8 g-.] as4. as8-. g4 ~|
[g8 g-.] as4. as8-. g4 (|
- \!)b,2:16\ff b4: c: |
- g'2: g: |
+ \!)b,2:16\ff b4: c:|
+ g'2: g:|
%214
- b,2:16\ff b4: c: |
- g'2: g: |
+ b,2:16\ff b4: c:|
+ g'2: g:|
- bes,2:16\ff bes4: as: |
- g: f: g: f: |
+ bes,2:16\ff bes4: as:|
+ g: f: g: f:|
- bes2: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: |
+ [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 |
+ [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] |
+ 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 |
+ f,4 r r2|
+ R1*11|
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
c'4\p\< r r r8 c8(|
@@ -349,60 +349,60 @@ violaII = \notes \relative c {
)es1|
%255
- \!ges\f |
- f\p |
- as\f |
+ \!ges\f|
+ f\p|
+ as\f|
g\p
- bes2:16\f bes: |
+ bes2:16\f bes:|
%260
\property VoiceCombineVoice.crescendoText = #"cresc."
\property VoiceCombineVoice.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 |
+ [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 |
+ 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] |
+ g2:16-"sempre" g:\ff|
+ g: g:|
+ g: g:|
+ g: g:|
+ [g8 b, c g][c b c g]|
%275
- [c b c g][c b c g] |
- c,1 ~ |
- c |
- f4-. r r2 |
- R1 |
- c1 ~ |
- c |
- f4-. r r2 |
- R1 |
- c1 ~ |
- c |
- fis4-. f-. r2 |
- R1 |
- es4-. e-. r2 |
- f4-. g-. r2 |
+ [c 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 VoiceCombineVoice.decrescendoText = #"dim."
\property VoiceCombineVoice.decrescendoSpanner = #'dashed-line
- as4\> r g r |
- R1 |
- \!c4\p r r2 |
- R1 |
- g4-"pizz." r r2 |
- R1 |
- c,4 r r2 |
- R1*15 |
- c4\pp r r2 |
- c4 r r2 |
- c4 r r2 |
+ as4\> r g r|
+ R1|
+ \!c4\p r r2|
+ R1|
+ g4-"pizz." r r2|
+ R1|
+ c,4 r r2|
+ R1*15|
+ c4\pp r r2|
+ c4 r r2|
+ c4 r r2|
}
diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly
index 2f23ede63e..da0f4ee50a 100644
--- a/mutopia/Coriolan/violino-1.ly
+++ b/mutopia/Coriolan/violino-1.ly
@@ -2,112 +2,112 @@
\version "1.3.120";
violinoI = \notes \relative c {
- c'1\ff ~ |
- c |
- <f4-. c'-. as'-.> r r2 |
- R1 |
- c1 ~ |
- c |
- <d4-. d'-. d'-.> r r2 |
- R1 |
- c1 ~ |
- c |
- <es'4-. es'-.> r r2 |
- R1 |
- <es,4-. c'-. g'-.> r r2 |
- <g,4-. d'-. b'-.> 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] |
+ c'1\ff ~|
+ c|
+ <f4-. c'-. as'-.> r r2|
+ R1|
+ c1 ~|
+ c|
+ <d4-. d'-. d'-.> r r2|
+ R1|
+ c1 ~|
+ c|
+ <es'4-. es'-.> r r2|
+ R1|
+ <es,4-. c'-. g'-.> r r2|
+ <g,4-. d'-. b'-.> 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 = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [es8-.\< as-.] as4. g8-. g4 ~ |
+ [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] |
+ [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 = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [des-.\< ges-.] ges4. f8-. f4~ |
- [f8 e-.]\!e4-.\f r2 |
- R1 |
+ [des-.\< ges-.] ges4. f8-. f4~|
+ [f8 e-.]\!e4-.\f r2|
+ R1|
%29
- r8 f-.\p f4. es8-. es4~ |
+ r8 f-.\p f4. es8-. es4~|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [es8\< d-.]d2.~ |
- [d8 d-.]d2.~ |
- [d8 d-.] d4. d8-. d4~ |
- [d8 d8-.] d4. d8-. d4 |
- [\!f16\ff f f f][f f f f]f2:16 |
+ [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: |
+ [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 |
+ 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 |
+ 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 |
+ )f1\>~|
+ f4 d( bes)as|
+ \!g2.\p( as4|
+ g f d ) bes|
+ bes'2.( c4|
%55
- bes2 )as |
+ bes2 )as|
\property Voice.crescendoText = #"cresc." % poco a poco
\property Voice.crescendoSpanner = #'dashed-line
- g4 <bes2\< bes'> <bes4 bes' > ~ |
- <bes bes'> <bes2 bes'> <bes4 bes' > ~ |
- <bes bes'> <bes2 bes'> <bes4 bes' > ~ |
- <bes bes'> <bes2 bes'> <bes4 bes'> |
+ g4 <bes2\< bes'> <bes4 bes' > ~|
+ <bes bes'> <bes2 bes'> <bes4 bes' > ~|
+ <bes bes'> <bes2 bes'> <bes4 bes' > ~|
+ <bes bes'> <bes2 bes'> <bes4 bes'>|
%60
- bes'2:16 bes: |
- bes: bes: |
- \!bes:\ff des: |
- c: bes: |
- as2.\p( bes4 |
+ bes'2:16 bes:|
+ bes: bes:|
+ \!bes:\ff des:|
+ c: bes:|
+ as2.\p( bes4|
%65
- as g e )c |
- c'2.( des4 |
- c2 ) bes |
+ as g e )c|
+ c'2.( des4|
+ c2 ) bes|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [as16\< c c c][c c c c] c2:16 |
- c: c: |
+ [as16\< c c c][c c c c] c2:16|
+ c: c:|
%70
- \!c:\ff es: |
- d: c: |
+ \!c:\ff es:|
+ d: c:|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- bes2.\p\<( c4 |
- bes a fis ) d |
- \!d'\sf\>( as g )f |
+ 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] |
+ \!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~|
@@ -116,129 +116,129 @@ violinoI = \notes \relative c {
[bes8 bes-.] bes4. bes8-. bes4~|
[bes8 c-.] c4. c8-. c4~|
[c8 d-.] d4. d8-. d4(|
- )es2:16\ff es4: d: |
+ )es2:16\ff es4: d:|
%85
- fis: g: fis: g: |
- es2: es4: d: |
+ fis: g: fis: g:|
+ es2: es4: d:|
- fis: g: fis: g: |
- as2: as4: g: |
+ fis: g: fis: g:|
+ as2: as4: g:|
- b: c: b: c: |
+ b: c: b: c:|
%90
- as2: as4: g: |
+ as2: as4: g:|
- b: c: b: c: |
- r8 es as,4\sf~as()g |
- r8 es' as,4\sf~as()g |
- r8 es' as,4\sf~as()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 d'4~ |
- [d8 c] f,4. c'8 es,4 ~ |
+ r8 es' as,4\sf~as()g|
+ r8 es' as,4. fis8 es'4~|
+ [es8 d] g,4. e8 d'4~|
+ [d8 c] f,4. c'8 es,4 ~|
- [es8 c'] a4. c8 g4 ~ |
+ [es8 c'] a4. c8 g4 ~|
%100
- [g8 fis] d,4. es8-. es4~ |
+ [g8 fis] d,4. es8-. es4~|
- [es8 c-.] c4. d8-. d4 |
- g, r8 es'' d4 r8 bes8 |
+ [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 |
+ a4 r8 es' d4 r8 a\f|
+ bes4 r8 es8\p d4 r8 bes|
%105
- a4 r8 es' d4 r8 a8\f |
- bes4 r8 es\p d4 r8 a |
- g4 r8 c bes4 r8 f |
- es4 r8 a g4 r8 d |
- c4 r8 g' fis4 r8 c' |
+ a4 r8 es' d4 r8 a8\f|
+ bes4 r8 es\p d4 r8 a|
+ g4 r8 c bes4 r8 f|
+ es4 r8 a g4 r8 d|
+ c4 r8 g' fis4 r8 c'|
%110
- bes4\f r8 es' d4 r8 a |
+ bes4\f r8 es' d4 r8 a|
- g4 r8 c bes4 r8 f |
+ g4 r8 c bes4 r8 f|
- es4 r8 a g4 r8 cis,, |
- d4 r8 g' d,4 r8 fis' |
+ es4 r8 a g4 r8 cis,,|
+ d4 r8 g' d,4 r8 fis'|
- bes,,4. g''8 g2 ~ |
+ bes,,4. g''8 g2 ~|
%115
- g4. bes8 bes2 ~ |
- bes4. g8 g4 r8 bes |
- bes4 r8 d d4 r8 g |
+ g4. bes8 bes2 ~|
+ bes4. g8 g4 r8 bes|
+ bes4 r8 d d4 r8 g|
- g4\p r8 es, d4 r8 bes |
- a4 r8 es' d4 r8 a |
+ g4\p r8 es, d4 r8 bes|
+ a4 r8 es' d4 r8 a|
%120
- bes4 r8 es des4 r8 bes |
- as!4 r8 es' des4 r8 as |
- g4 r r2 |
- r4 r8 es' des4 r8 as |
- g4 r r2 |
+ bes4 r8 es des4 r8 bes|
+ as!4 r8 es' des4 r8 as|
+ g4 r r2|
+ r4 r8 es' des4 r8 as|
+ g4 r r2|
%125
- r4 r8 c bes4 r8 e, |
+ r4 r8 c bes4 r8 e,|
- as4 r8 des c4 r8 as |
+ as4 r8 des c4 r8 as|
- g4 r8 des' c4 r8 g |
- as4 r8 es' des4 r8 as |
+ g4 r8 des' c4 r8 g|
+ as4 r8 es' des4 r8 as|
- bes4 r r2 |
+ bes4 r r2|
%130
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- r4 r8 f'8\< es4 r8 c |
- bes4 r8 f' es4 r8 bes |
- c4 r8 f es4 r8 c |
- c4 r r2 |
- r4 r8 as' ges4 r8 des |
+ 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' |
+ 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' |
+ 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 = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- as4\p r8 des\< c4 r8 g |
+ as4\p r8 des\< c4 r8 g|
%145
- f4 r8 bes as4 r8 es |
- des4 r8 g f4 r8 c |
- bes4 r8 f' e4 r8 bes' |
- \!as4\ff r8 des c4 r8 g |
- f4 r8 bes as4 r8 es |
+ f4 r8 bes as4 r8 es|
+ des4 r8 g f4 r8 c|
+ bes4 r8 f' e4 r8 bes'|
+ \!as4\ff r8 des c4 r8 g|
+ f4 r8 bes as4 r8 es|
%150
- des4 r8 g f4 r8 c, |
- des4 r8 f' c,4 r8 e' |
+ des4 r8 g f4 r8 c,|
+ des4 r8 f' c,4 r8 e'|
- f,1\ff ~ |
- f |
- des''4 r r2 |
+ f,1\ff ~|
+ f|
+ des''4 r r2|
%155
- R1 |
- f,,1 ~ |
- f |
+ R1|
+ f,,1 ~|
+ f|
- <f'2\sf d'!> [f,8-. as-.][as()g] |
- <f'2\sf d'> [f,8-. as-.][as()g] |
+ <f'2\sf d'!> [f,8-. as-.][as()g]|
+ <f'2\sf d'> [f,8-. as-.][as()g]|
%160
- [f8-.\p as-.][as()g] [g-. c-.][c()b] |
- [b8-. es-.][es()d] [d-. g-.]g4-"ten." |
- R1 |
- <des2\ff des'> [e,8-. g-.][g()f] |
- <des'2\sf des'> [e,8-. g-.][g()f] |
+ [f8-.\p as-.][as()g] [g-. c-.][c()b]|
+ [b8-. es-.][es()d] [d-. g-.]g4-"ten."|
+ R1|
+ <des2\ff des'> [e,8-. g-.][g()f]|
+ <des'2\sf des'> [e,8-. g-.][g()f]|
%165
- [e-.\p bes'-.][bes()as][g-.des'-.][des()c] |
- [bes-. g'-.][g()f][e-. g-.]g4-"ten." |
+ [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(|
@@ -251,199 +251,199 @@ violinoI = \notes \relative c {
)d2. es4\sf(|
%175
)d2. es4\sf(|
- )d1\> ~ |
+ )d1\> ~|
d4( b g )f
- \!e2.\p( f4 |
- e d b ) g |
+ \!e2.\p( f4|
+ e d b ) g|
%180
- g'2.( a4 |
- g2 )f |
+ g'2.( a4|
+ g2 )f|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- e4 g2\< g4 ~ |
+ e4 g2\< g4 ~|
- g g2 g4 ~ |
- g 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: |
+ 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 |
+ f2.\p( g4|
+ f e cis ) a|
+ a'2.( bes4|
+ a2 ) g|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [f16\< a a a][a a a a]a2:16 |
+ [f16\< a a a][a a a a]a2:16|
%195
- a2 a |
- \!a2:16\ff c: |
- b: a: |
- g2.\p( a4 |
- g\< fis dis ) b |
+ a2 a|
+ \!a2:16\ff c:|
+ b: a:|
+ g2.\p( a4|
+ g\< fis dis ) b|
%200
- b'1 ~ |
+ b'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] |
+ [\!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 ~ |
+ r[c(as)c]r[c(a)c]|
+ [b-. d-.]d4. d8-. d4 ~|
+ [d8-. d-.]d4. d8-. d4 ~|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [d8-. es-.]es4.\< es8-. es4 ~ |
- [es8-. es-.]es4. es8-. es4 ~ |
+ [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: |
+ [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 |
+ 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'] d!4. f8 c4 ~ |
- [c8 b] g,4. as8 as'4 ~ |
- [as8 as] f4. f8 g4 |
+ r8 g c,4. a8 f'4 ~|
+ [f8 f] b,4. f'8 as,4 ~|
+ [as8 f'] d!4. f8 c4 ~|
+ [c8 b] g,4. as8 as'4 ~|
+ [as8 as] f4. f8 g4|
%230
- c,4\p r8 as' g4 r8 es |
+ c,4\p r8 as' g4 r8 es|
- d4\p r8 as' g4 r8 d\f |
+ d4\p r8 as' g4 r8 d\f|
- es4\p r8 as\p g4 r8 es |
+ es4\p r8 as\p g4 r8 es|
- d4\p r8 as' g4 r8 d\f |
+ d4\p r8 as' g4 r8 d\f|
- es4\p r8 as'\p g4 r8 d |
+ es4\p r8 as'\p g4 r8 d|
%235
- c4 r8 f es4 r8 bes |
+ c4 r8 f es4 r8 bes|
- as4 r8 d c4 r8 g |
+ as4 r8 d c4 r8 g|
- f4 r8 c' b4 r8 f' |
+ f4 r8 c' b4 r8 f'|
- es4\f r8 as g4 r8 d |
+ es4\f r8 as g4 r8 d|
- c4\f r8 f es4 r8 bes |
+ c4\f r8 f es4 r8 bes|
%240
- as4-. des-. r2 |
- R1*3 |
- e2.\p( f4 |
- e d b ) g |
- g'2.( a4 |
- g2 ) f |
- es4 g2 g4 ~ |
- g4 g2 g4 ~ |
+ 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 ~ |
+ g4 g2 g4 ~|
+ g4 g2 g4 ~|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [g16\< g g g][g g g g]g2:16 |
- g: g: |
- g: g: |
- \!as:\f as: |
- as:\p as: |
- bes:\f bes: |
- bes:\p bes: |
- c:\f c: |
+ [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 = #"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 <c8 c,> <c2\sf c, > ~ |
+ r8 c\< c4. c8 c4 ~|
+ [c8 c] c4. c8 c4 ~|
+ [c8 c] c4. c8 c4 ~|
+ [c8 c] c4. c8 c4 ~|
+ \!c4.\ff <c8 c,> <c2\sf c, > ~|
%265
- <c4. c,> <c8 c,> <c2\sf c, > ~ |
- <c4. c,> <c8 c,> <c2\sf c, > ~ |
- <c4. c,> <c8 c,> <c2\sf c, > ~ |
- <c4. c,> <c8 c,> <c2\sf c,> |
- d4. d8 d2\sf |
+ <c4. c,> <c8 c,> <c2\sf c, > ~|
+ <c4. c,> <c8 c,> <c2\sf c, > ~|
+ <c4. c,> <c8 c,> <c2\sf c, > ~|
+ <c4. c,> <c8 c,> <c2\sf c,>|
+ 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, |
+ 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 |
- <f4 c' as'-.> r r2 |
+ c4 r8 b,8 c4 r8 b|
+ c1 ~|
+ c|
+ <f4 c' as'-.> r r2|
R1
- c1 ~ |
- c |
- <d4 d' d'-.> r r2 |
+ c1 ~|
+ c|
+ <d4 d' d'-.> r r2|
R1
- c1 ~ |
- c |
- es''4-. b-. r2 |
- R1 |
- c4-. g-. r2 |
- as4-. e-. r2 |
+ c1 ~|
+ c|
+ es''4-. b-. r2|
+ R1|
+ c4-. g-. r2|
+ as4-. e-. r2|
%290
\property Voice.decrescendoText = #"dim."
\property Voice.decrescendoSpanner = #'dashed-line
- f4\> r d r |
- R1 |
- \!es!4\p r r2 |
- R1 |
- d,4-"pizz." r r2 |
+ f4\> r d r|
+ R1|
+ \!es!4\p r r2|
+ R1|
+ d,4-"pizz." r r2|
%295
- R1 |
+ R1|
\property Voice.decrescendoText = #"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 |
+ c1^"arco"\> ~|
+ c2 b2|
+ c1 ~|
+ c2 b2|
%300
- c1 ~ |
- c |
- b ~ |
- b |
- c ~ |
+ c1 ~|
+ c|
+ b ~|
+ b|
+ c ~|
%305
- c |
- b ~ |
- \!b\> ~ |
- b ~ |
- b |
+ c|
+ b ~|
+ \!b\> ~|
+ b ~|
+ b|
%310
- \!c4\pp r r2 |
- R1 |
- c4-"pizz." r r2 |
- c4 r r2 |
- c4 r r2 |
+ \!c4\pp r r2|
+ R1|
+ c4-"pizz." r r2|
+ c4 r r2|
+ c4 r r2|
}
violinoIStaff = \context Staff = violino1 <
diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly
index fe84a0e630..3b7bcbae3d 100644
--- a/mutopia/Coriolan/violino-2.ly
+++ b/mutopia/Coriolan/violino-2.ly
@@ -2,106 +2,106 @@
\version "1.3.120";
violinoII = \notes \relative c {
- c'1\ff ~ |
- c |
- <f4-. c'-. as'-.> r r2 |
- R1 |
- c1 ~ |
- c |
- <d4-. b'-. as'-.> r r2 |
- R1 |
- c1 ~ |
- c |
- <fis4-. es'-. c'-.> r r2 |
- R1 |
+ c'1\ff ~|
+ c|
+ <f4-. c'-. as'-.> r r2|
+ R1|
+ c1 ~|
+ c|
+ <d4-. b'-. as'-.> r r2|
+ R1|
+ c1 ~|
+ c|
+ <fis4-. es'-. c'-.> r r2|
+ R1|
%13
- <g,4-. es'-. c'-.> r r2 |
- <g4-. d'-. b'-.> r r2 |
- R1 *3 |
- r2 [b8-.\p f'-.] [f()es] |
+ <g,4-. es'-. c'-.> r r2|
+ <g4-. d'-. b'-.> r r2|
+ R1 *3|
+ r2 [b8-.\p f'-.] [f()es]|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [es8-. as-.] as4.\< g8-. g4 ~ |
+ [es8-. as-.] as4.\< g8-. g4 ~|
%20
- [g8 fis-.] fis4 ~ fis \!g-.\f |
- R1*4 |
+ [g8 fis-.] fis4 ~ fis \!g-.\f|
+ R1*4|
r2
%25
- [a,8-.\p es'-.][es()des] |
+ [a,8-.\p es'-.][es()des]|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [des-.\< ges-.]ges4. f8-. f4~ |
- [f8 e-.]\!e4-.\f r2 |
+ [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~ |
+ r8 f-.\p f4. es8-. es4~|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [es8\< d-.]d2.~ |
- [d8 d-.]d2.~ |
- [d8 d-.] d4. d8-. d4~ |
- [d8 d8-.] d4. d8-. d4 |
- [\!f16\ff f f f][f f f f]f2:16 |
+ [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: |
+ [f16 f f f][es es es es][des des des des][c c c c]|
+ b2:16 c:|
+ d!: es:|
+ e: f:|
- <g: c,:> <as: c,:> |
+ <g: c,:> <as: c,:>|
%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] |
+ 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 |
+ 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 |
+ bes4 r r2|
+ R1*5|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- g'2.\p\<( as4 |
- g f d ) bes |
- bes'2.( c4 |
- bes2 )as |
+ g'2.\p\<( as4|
+ g f d ) bes|
+ bes'2.( c4|
+ bes2 )as|
%60
- [g16 bes bes bes][bes bes bes bes]bes2: |
+ [g16 bes bes bes][bes bes bes bes]bes2:|
%copied... \transpose c, violino-1(61,74)
- bes: bes: |
- \!bes:\ff des: |
- c: bes: |
- as2.\p( bes4 |
+ bes: bes:|
+ \!bes:\ff des:|
+ c: bes:|
+ as2.\p( bes4|
%65
- as g e )c |
- c'2.( des4 |
- c2 ) bes |
+ as g e )c|
+ c'2.( des4|
+ c2 ) bes|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [as16\< c c c][c c c c] c2:16 |
- c: c: |
+ [as16\< c c c][c c c c] c2:16|
+ c: c:|
%70
- \!c:\ff es: |
- d: c: |
+ \!c:\ff es:|
+ d: c:|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- bes2.\p\<( c4 |
- bes a fis ) d |
- \!d'\sf\>( as g )f |
+ bes2.\p\<( c4|
+ bes a fis ) d|
+ \!d'\sf\>( as g )f|
%75
% nono, only looks like transpose
- r8[\!c'\p(g)c]r[bes(g)bes] |
- r[g(es)g]r[g(d)g] |
+ r8[\!c'\p(g)c]r[bes(g)bes]|
+ r[g(es)g]r[g(d)g]|
r[g(es)g]r[g(e)g]|r8 fis-.\pp fis4. fis8-. fis4~|
% urg, can't copy: \transpose g \violino-1(75,91)
% a -> fis
@@ -115,75 +115,75 @@ violinoII = \notes \relative c {
[g8 a-.] a4. a8-. a4~|
[a8 bes-.] bes4. bes8-. bes4|
% different
- a2:16\ff a4: bes: |
- c: bes: c: bes: |
- a2:16 a4: bes: |
- c: bes: c: bes: |
- b2: b4: c: |
- f: es: f: es: |
+ a2:16\ff a4: bes:|
+ c: bes: c: bes:|
+ a2:16 a4: bes:|
+ c: bes: c: bes:|
+ b2: b4: c:|
+ f: es: f: es:|
%90
- b2: b4: c: |
- f: es: f: es: |
+ b2: b4: c:|
+ f: es: f: es:|
% copied: \transpose c, \violino-1(92,95)
- r8 es as,4\sf~as()g |
- r8 es' as,4\sf~as()g |
- r8 es' as,4\sf~as()g |
+ 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\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 |
+ [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 |
+ [es8 c-.]c4. d8-. d4|
- g,\p r r2 |
- r2 r4 r8 <d'\f a'> |
+ g,\p r r2|
+ r2 r4 r8 <d'\f a'>|
- <d4 bes'> r r2 |
+ <d4 bes'> r r2|
%105
- r2 r4 r8 <d\f a'> |
+ r2 r4 r8 <d\f a'>|
- <d4 bes'> r r r8 a'\p |
- g4 r r r8 f |
- es4 r r r8 d |
+ <d4 bes'> r r r8 a'\p|
+ g4 r r r8 f|
+ es4 r r r8 d|
- c4 r8 g fis4 r8 c' |
+ c4 r8 g fis4 r8 c'|
% looks lot like violino-1 110-113
%110
- bes4\f r8 es d4 r8 a |
+ bes4\f r8 es d4 r8 a|
- g4 r8 c bes4 r8 f |
+ g4 r8 c bes4 r8 f|
- es4 r8 a g4 r8 cis |
- <[d16 s> <bes g'> <bes g'> <bes g'>] <a4:16 fis':> <a2:16 fis':> |
- <bes: g':> <bes: g':> |
- <bes: g':> <bes: g':> |
- <bes: g':> <bes: g':> |
- <bes: g':> <bes: g':> |
- <bes4\p g'> r r2 |
+ es4 r8 a g4 r8 cis|
+ <[d16 s> <bes g'> <bes g'> <bes g'>] <a4:16 fis':> <a2:16 fis':>|
+ <bes: g':> <bes: g':>|
+ <bes: g':> <bes: g':>|
+ <bes: g':> <bes: g':>|
+ <bes: g':> <bes: g':>|
+ <bes4\p g'> r r2|
% copied... urg: *same* as violino-1(119,128)
% URG: or is this R1*10??
% should hara-kiri like viola-1/2...
- a'4 r8 es' d4 r8 a |
+ a'4 r8 es' d4 r8 a|
%120
- bes4 r8 es des4 r8 bes |
- as!4 r8 es' des4 r8 as |
- g4 r r2 |
- r4 r8 es' des4 r8 as |
- g4 r r2 |
+ bes4 r8 es des4 r8 bes|
+ as!4 r8 es' des4 r8 as|
+ g4 r r2|
+ r4 r8 es' des4 r8 as|
+ g4 r r2|
%125
- r4 r8 c bes4 r8 e, |
+ r4 r8 c bes4 r8 e,|
- as4 r8 des c4 r8 as |
+ as4 r8 des c4 r8 as|
- g4 r8 des' c4 r8 g |
- as4 r8 es' des4 r8 as |
+ g4 r8 des' c4 r8 g|
+ as4 r8 es' des4 r8 as|
R1*3
%131
% copied from viola(131,140)
@@ -202,242 +202,242 @@ violinoII = \notes \relative c {
% 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' |
+ 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 = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- as4\p r8 des\< c4 r8 g |
+ as4\p r8 des\< c4 r8 g|
%145
- f4 r8 bes as4 r8 es |
- des4 r8 g f4 r8 c |
- bes4 r8 f' e4 r8 bes' |
- \!as4\ff r8 des c4 r8 g |
- f4 r8 bes as4 r8 es |
+ f4 r8 bes as4 r8 es|
+ des4 r8 g f4 r8 c|
+ bes4 r8 f' e4 r8 bes'|
+ \!as4\ff r8 des c4 r8 g|
+ f4 r8 bes as4 r8 es|
% copied somewhat from violino-1(150,168)
%150
- des4 r8 g f4 r8 c |
- des4 r8 f' c,4 r8 e' |
+ des4 r8 g f4 r8 c|
+ des4 r8 f' c,4 r8 e'|
- f,1\ff ~ |
- f |
- <f4 des'> r r2 |
+ f,1\ff ~|
+ f|
+ <f4 des'> r r2|
%155
- R1 |
- f1 ~ |
- f |
+ R1|
+ f1 ~|
+ f|
- <d2\sf d'!> [f8-. as-.][as()g] |
- <d2\sf d'> [f8-. as-.][as()g] |
+ <d2\sf d'!> [f8-. as-.][as()g]|
+ <d2\sf d'> [f8-. as-.][as()g]|
%160
- R1 |
- [b,8-. es-.][es()d] [d-. g-.]g4-"ten." |
- R1 |
- <e2\ff des'> [e8-. g-.][g()f] |
- <e2\sf des'> [e8-. g-.][g()f] |
+ R1|
+ [b,8-. es-.][es()d] [d-. g-.]g4-"ten."|
+ R1|
+ <e2\ff des'> [e8-. g-.][g()f]|
+ <e2\sf des'> [e8-. g-.][g()f]|
%165
R1
- [bes,8-.\p g'-.][g()f][e-. g-.]g4-"ten." |
- 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 |
+ 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 |
+ 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\> ~ |
+ )d1\> ~|
d4( b g )f
- \!e2.\p( f4 |
- e d b ) g |
+ \!e2.\p( f4|
+ e d b ) g|
%180
- g'2.( a4 |
- g2 )f |
+ g'2.( a4|
+ g2 )f|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- e4 g2\< g4 ~ |
- g g2 g4 ~ |
- g g2 g4 ~ |
+ 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: |
+ 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 |
+ f2.\p( g4|
+ f e cis ) a|
+ a'2.( bes4|
+ a2 ) g|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [f16\< a a a][a a a a]a2:16 |
+ [f16\< a a a][a a a a]a2:16|
%195
- a2 a |
- \!a2:16\ff c: |
- b: a: |
- g2.\p( a4 |
- g\< fis dis ) b |
+ a2 a|
+ \!a2:16\ff c:|
+ b: a:|
+ g2.\p( a4|
+ g\< fis dis ) b|
%200
- b'1 ~ |
+ b'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] |
+ [\!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 ~ |
+ r[as(d,)as']r[a(es)a]|
+ [g-. b-.]b4. b8-. b4 ~|
+ [b8-. b-.]b4. b8-. b4 ~|
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [b8-. c-.]c4.\< c8-. c4 ~ |
- [c8-. c-.]c4. c8-. c4 ~ |
+ [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: |
+ [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 |
+ 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: |
+ [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: |
+ [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 |
+ [d8 g,] g'4. as8 as4 ~|
+ [as8 as] f4. f8 g4|
%230
- c,4\p r r2 |
+ c,4\p r r2|
- r2 r4 r8 <g\f d'> |
+ r2 r4 r8 <g\f d'>|
- <g4 es'> r r2 |
- r2 r4 r8 <g\f d'> |
+ <g4 es'> r r2|
+ r2 r4 r8 <g\f d'>|
- <g4 es'> r r2 |
+ <g4 es'> r r2|
%235
- R1*3 |
+ R1*3|
%copied violino-1(238,243)
- es'4\f r8 as g4 r8 d |
+ es'4\f r8 as g4 r8 d|
- c4\f r8 f es4 r8 bes |
+ c4\f r8 f es4 r8 bes|
%240
- as4-. des-. r2 |
- R1*3 |
+ as4-. des-. r2|
+ R1*3|
%245
- [g,8\p( e' c e][g e c )g~] |
- [g8( d' b d][g d b )g~] |
- [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~] |
+ [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,~] |
- [g8( es' c es][g es c )g~] |
- [g8( d' b d][g d b )g~] |
- [g8( es' c es][g es c )g] |
+ [g8( es' c es][g es c )g~]|
+ [g8( f' d f][g f d )g,~]|
+ [g8( es' c es][g es c )g~]|
+ [g8( d' b d][g d b )g~]|
+ [g8( es' c es][g es c )g]|
%255
- <c2:16\f es:> <c: es:> |
- [as8\p( f' des f][as f des )as] |
- <d2:16\f f:> <d: f:> |
- [bes8\p( g' es g][bes g es )bes] |
- <c2:16\f g':> <c: g':> |
+ <c2:16\f es:> <c: es:>|
+ [as8\p( f' des f][as f des )as]|
+ <d2:16\f f:> <d: f:>|
+ [bes8\p( g' es g][bes g es )bes]|
+ <c2:16\f g':> <c: g':>|
%copied viola-1(260, 273)
%260
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
- [f8\p\< f']f4. es8 es4 ~ |
- [es8 as]as4. g8 g4 ~ |
- [g8 f]f4. es8 es4 ~ |
- [es8 as]as4. g8 g4 |
- r r8 \!d\ff es4.\sf()d8 |
+ [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 |
+ 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: |
- g4. d8 es4. d,8 |
+ g2:16-"sempre" g:\ff|
+ g: g:|
+ g: g:|
+ g: g:|
+ g4. d8 es4. d,8|
%275
- es4 r8 b8 c4 r8 b |
- c1 ~ |
- c |
- <f4 c' as'-.> r r2 |
+ es4 r8 b8 c4 r8 b|
+ c1 ~|
+ c|
+ <f4 c' as'-.> r r2|
R1
- c1 ~ |
- c |
- <d4 b' as'-.> r r2 |
+ c1 ~|
+ c|
+ <d4 b' as'-.> r r2|
R1
- c1 ~ |
- c |
- <c'4-. a'-.> <b-. as'-.> r2 |
- R1 |
- <c4-. g'-.> <g-. c-.> r2 |
- as4-. <c,-. e-.> r2 |
+ c1 ~|
+ c|
+ <c'4-. a'-.> <b-. as'-.> r2|
+ R1|
+ <c4-. g'-.> <g-. c-.> r2|
+ as4-. <c,-. e-.> r2|
%290
\property Voice.decrescendoText = #"dim."
\property Voice.decrescendoSpanner = #'dashed-line
- <c4 f\>> r g' r |
- R1 |
- \!g4\p r r2 |
- R1 |
- b,4-"pizz." r r2 |
+ <c4 f\>> r g' r|
+ R1|
+ \!g4\p r r2|
+ R1|
+ b,4-"pizz." r r2|
%295
- R1 |
- c4 r r2 |
- R1*15 |
- c4-"pizz." r r2 |
- c4 r r2 |
- c4 r r2 |
+ R1|
+ c4 r r2|
+ R1*15|
+ c4-"pizz." r r2|
+ c4 r r2|
+ c4 r r2|
}
violinoIIStaff = \context Staff = violino2 <
diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly
index 837a6bda5b..88fce58207 100644
--- a/mutopia/Coriolan/violoncello.ly
+++ b/mutopia/Coriolan/violoncello.ly
@@ -2,56 +2,56 @@
\version "1.3.120";
violoncello = \notes \relative c {
- c1\ff ~ |
- c |
- f,4-. r r2 |
- R1 |
- c'1\ff ~ |
- c |
- f,4-. r r2 |
- R1 |
- c'1\ff ~ |
- c |
- fis,4-. r r2 |
- R1 |
- g4-. r r2 |
- g4-. r r2 |
- c4\p r4 r2 |
- c4 r4 r2 |
- c4 r4 r2 |
- R1 |
+ c1\ff ~|
+ c|
+ f,4-. r r2|
+ R1|
+ c'1\ff ~|
+ c|
+ f,4-. r r2|
+ R1|
+ c'1\ff ~|
+ c|
+ fis,4-. r r2|
+ R1|
+ g4-. r r2|
+ g4-. r r2|
+ c4\p r4 r2|
+ c4 r4 r2|
+ c4 r4 r2|
+ R1|
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
- c'4.\< c8 bes4. bes8 |
+ c'4.\< c8 bes4. bes8|
%20
- as4. as8 \!g4\f r4 |
- R1 |
+ 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] |
+ [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 StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
- bes4.\< bes8 as4. as8 |
- g4 \!g4-.\f r2 |
+ 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 ~ |
+ as4.\p as8 g4. g8|
+ f2.-"cresc" g4|
+ f2. g4|
+ f4. g8 f4. g8|
+ f4. g8 f4. g8|
+ as1\ff ~|
%35
as4(g f)es|
- d4. r8 c4. r8 |
- b4. r8 c4. r8 |
- bes4. r8 as4. r8 |
- g4. r8 f4. r8 |
+ d4. r8 c4. r8|
+ b4. r8 c4. r8|
+ bes4. r8 as4. r8|
+ g4. r8 f4. r8|
%40
fis2\sf [c'8-. es-.][es()d]
@@ -61,73 +61,73 @@ violoncello = \notes \relative c {
e,2\sf [bes'!8-. des-.][des()c]
%45
- es,!2\sf [a!8-. c-.][c()bes] |
+ es,!2\sf [a!8-. c-.][c()bes]|
d,4 [a'!8-. c-.][c()bes] es,4\sf(|
)d4 [a'!8-. c-.][c()bes] es,4\sf(|
)d4 [a'!8-. c-.][c()bes] es,4\sf(|
)d4 [a'!8-. c-.][c()bes] es,4\sf(|
%50
- )d4 r r2 |
- R1 |
- [bes'8\p(g'es g][bes g es)bes~] |
- [bes(f'd f][bes f d)bes~] |
- [bes(g'es g][bes g es)bes~] |
+ )d4 r r2|
+ R1|
+ [bes'8\p(g'es g][bes g es)bes~]|
+ [bes(f'd f][bes f d)bes~]|
+ [bes(g'es g][bes g es)bes~]|
%55
- [bes(as'f as][bes as f)bes,~] |
+ [bes(as'f as][bes as f)bes,~]|
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.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,~] |
+ [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][c g e)bes] |
+ [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][c g e)bes]|
%70
- as2\ff g |
- fis d |
+ as2\ff g|
+ fis d|
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
- [g8\p\<(bes' g bes][d bes g)d~] |
- [d8(a' fis a][d a fis)d] |
- [\!f!8\sf\>(as f as][f g d)g] |
+ [g8\p\<(bes' g bes][d bes g)d~]|
+ [d8(a' fis a][d a fis)d]|
+ [\!f!8\sf\>(as f as][f g d)g]|
%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 |
+ \!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 StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.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 |
+ 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 |
+ c2.()bes4|
a(g a)g|
- f!2.()es4 |
+ f!2.()es4|
d(c d)c|
%90
- f2.()es4 |
+ f2.()es4|
d(c d)c|
c r8 c' c4\sf()des|
r r8 c c4\sf()des|
@@ -135,46 +135,46 @@ violoncello = \notes \relative c {
%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 |
+ 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 |
+ 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] |
+ [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] |
+ [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] |
+ % [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 |
+ [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 |
+ 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] |
+ [fis a cis d][es d a fis]|
%120
[g bes c des][c des bes g]|
@@ -196,14 +196,14 @@ violoncello = \notes \relative c {
%131
[g bes d es][f es bes g]|
% shared with viola until here
- as1 ( |
- a |
- bes |
- )c |
- \!des2\p( c |
- bes as |
- ges f |
- )es [as,8 c es as] |
+ as1 (|
+ a|
+ bes|
+ )c|
+ \!des2\p( c|
+ bes as|
+ ges f|
+ )es [as,8 c es as]|
%140
% copied from viola-1 (140,152)
@@ -236,119 +236,119 @@ violoncello = \notes \relative c {
[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 |
+ 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] |
+ 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] |
+ R1*3|
+ bes,!2\ff [e8-. g-.][g()f]|
+ bes,2\sf [e8-. g-.][g()f]|
%165
- R1*2 |
+ 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-.] |
+ )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~] |
+ )b4 r r2|
+ R1|
+ [g8\p(e' c d][g e c )g~]|
+ [g(d' b d][g d b )g~]|
%180
- [g(e' c d][g e c )g~] |
- [g(f' d f][g f d )g,~] |
+ [g(e' c d][g e c )g~]|
+ [g(f' d f][g f d )g,~]|
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
- [g\<(e' c d][g e c )g~] |
- [g(d' b d][g d b )g~] |
+ [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(] |
+ [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 c )a!~] |
- [a8( f' d f][a f d )a!~] |
- [a( g' e g][a g e )a,!~] |
+ \!)e2\ff d'|
+ cis a ~|
+ [a8( f' d f][a f d )a!~]|
+ [a( e' cis e][a e c )a!~]|
+ [a8( f' d f][a f d )a!~]|
+ [a( g' e g][a g e )a,!~]|
%195
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
- [a8\<( f' d f][a f d )a!~] |
- [a( e' cis e][a e c )g] |
- \!f2\ff e |
- dis b'~ |
- [b8\p( g' e g][b g e )b!~] |
+ [a8\<( f' d f][a f d )a!~]|
+ [a( e' cis e][a e c )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] |
- \!es!4\fp r e r |
- f r g r |
+ [b8\<( fis' dis fis ][b fis dis )b!~]|
+ [b8( g' e g][e g e )g]|
+ [f(g f g][f g f)g]|
+ \!es!4\fp r e r|
+ f r g r|
%205
- as r g r |
- f r fis r |
- g r g r |
- g r g r |
+ as r g r|
+ f r fis r|
+ g r g r|
+ g r g r|
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
- g r g\< r |
+ g r g\< r|
%210
- g r g r |
- g r g r |
- g r g r |
- \!f2.\ff()es4 |
- d( c d )c |
+ 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 |
+ 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 |
+ 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 |
+ 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 |
+ 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]|
@@ -363,8 +363,8 @@ violoncello = \notes \relative c {
%240
[as, c e f!][g, bes d es]|
- f4 r r2 |
- R1*3 |
+ f4 r r2|
+ R1*3|
c4\p r r r8 c(|
%245
@@ -381,30 +381,30 @@ violoncello = \notes \relative c {
\property StaffCombineVoice.crescendoSpanner = #'dashed-line
)c4\< r r r8 c(|
)f4 r r r8 f,(|
- )es1 |
+ )es1|
%255
- \!ges\f |
- f\p |
- as\f |
- g!\p |
- bes\f |
+ \!ges\f|
+ f\p|
+ as\f|
+ g!\p|
+ bes\f|
%260
\property StaffCombineVoice.crescendoText = #"cresc."
\property StaffCombineVoice.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 |
+ 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 |
+ 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\ff d es c]|
@@ -415,63 +415,63 @@ violoncello = \notes \relative c {
%275
[c b c g][c b c g]|
- c1 ~ |
- c |
- f4-. r r2 |
- R1 |
+ c1 ~|
+ c|
+ f4-. r r2|
+ R1|
%280
- c1 ~ |
- c |
- f4-. r r2 |
- R1 |
- c1 ~ |
+ c1 ~|
+ c|
+ f4-. r r2|
+ R1|
+ c1 ~|
%285
- c |
- fis4-. f-. r2 |
+ c|
+ fis4-. f-. r2|
R1|
- es4-. e-. r2 |
- f,4-. g-. r2 |
+ es4-. e-. r2|
+ f,4-. g-. r2|
%290
\property StaffCombineVoice.decrescendoText = #"dim."
\property StaffCombineVoice.decrescendoSpanner = #'dashed-line
- as4\> r b r |
- R1 |
+ as4\> r b r|
+ R1|
\!c4\p r r2|
- R1 |
- g4-"pizz." r r2 |
+ R1|
+ g4-"pizz." r r2|
%295
- R1 |
- c4 r r2 |
- [c8-.-"arco" es-.][es()d][d-. as'-.][as()g] |
+ R1|
+ c4 r r2|
+ [c8-.-"arco" es-.][es()d][d-. as'-.][as()g]|
R1
\property StaffCombineVoice.decrescendoText = #"sempre pi\\`u piano"
% urg, "" is assumed to be hairpin...
%\property StaffCombineVoice.decrescendoSpanner = #""
\property StaffCombineVoice.decrescendoSpanner = #'dashed-line
- \times 2/3 { c,4\> ( es c ~ } \times 2/3 { c as' )g } |
+ \times 2/3 { c,4\> ( es c ~ } \times 2/3 { c as' )g }|
%300
- r2 r4 c,( |
- es2. ) d4 |
- r2 r4 d( |
- as'2. )g4 ~ |
- g1 ( |
+ r2 r4 c,(|
+ es2. ) d4|
+ r2 r4 d(|
+ as'2. )g4 ~|
+ g1 (|
%305
- es |
- )d( |
- \!)as'\> ~ |
- as ~ |
- as2.()g4 |
+ es|
+ )d(|
+ \!)as'\> ~|
+ as ~|
+ as2.()g4|
%310
- \!c,\pp r r2 |
- R1 |
- c4-"pizz." r r2 |
- c4 r r2 |
- c4 r r2 |
+ \!c,\pp r r2|
+ R1|
+ c4-"pizz." r r2|
+ c4 r r2|
+ c4 r r2|
}
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile b/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile
index 167992e09e..f58014df7c 100644
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile
@@ -11,3 +11,6 @@ include $(depth)/make/stepmake.make
tarball=solo-cello-suite-ii
+mutopia:
+ $(MAKE) examples="scsii-cello scsii-viola" PAPERSIZE=letter local-WWW out-letter/scsii-cello.ps.gz out-letter/scsii-viola.ps.gz
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly
index eb755bf2a0..fb551846db 100644
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly
@@ -37,4 +37,5 @@ information is taken to the extreme.
".\\\\Unrestricted modification and redistribution is permitted
and encouraged---copy this music and share it!}";
tagline = \mutopiapublicdomain;
+ footer = "Mutopia-2001/01/31-2";
}
diff --git a/scm/c++.scm b/scm/c++.scm
index 18cd4e273f..f3d795b7da 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -11,6 +11,10 @@
(and (pair? x)
(number? (car x)) (number? (cdr x))))
+(define (moment-pair? x)
+ (and (pair? x)
+ (moment? (car x)) (moment? (cdr x))))
+
(define (boolean-or-symbol? x)
(or (boolean? x) (symbol? x)))
diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm
index b34dc23090..7210e92b28 100644
--- a/scm/translator-property-description.scm
+++ b/scm/translator-property-description.scm
@@ -100,7 +100,7 @@ key signatures after the bar lines:
@end example
")
(translator-property-description 'centralCPosition number? "Place of the central C. Usually determined by looking at clefPosition and clefGlyph.")
-(translator-property-description 'changeMoment moment? "duration that voices are examined for differences, when part-combining. Usually unset or zero when combining threads into one voice, and 1 (or the duration of one measure) when combining voices into one staff.")
+(translator-property-description 'changeMoment moment-pair? "duration that voices are examined for differences, when part-combining. Usually unset or zero when combining threads into one voice, and 1 (or the duration of one measure) when combining voices into one staff.")
(translator-property-description 'chordChanges boolean? "Only show changes in chords scheme?")
(translator-property-description 'clefGlyph string? "Name of the symbol within the music font")
(translator-property-description 'clefOctavation integer? "Add
@@ -116,6 +116,7 @@ arpeggios that cross staffs.
(translator-property-description 'crescendoText string? "Text to print at start of non-hairpin crecscendo, ie: @samp{cresc.}")
(translator-property-description 'crescendoSpanner symbol? "Type of spanner to be used for crescendi. One of: @samp{hairpin}, @samp{line}, @samp{dashed-line}, @samp{dotted-line}. If unset, hairpin type is used.")
(translator-property-description 'decrescendoText string? "Text to print at start of non-hairpin decrecscendo, ie: @samp{dim.}")
+(translator-property-description 'disableDevNullThread boolean? "temp hack: turn off thread-devnull-engraver")
(translator-property-description 'decrescendoSpanner symbol? "Type of spanner to be used for decrescendi. One of: @samp{hairpin}, @samp{line}, @samp{dashed-line}, @samp{dotted-line}. If unset, hairpin type is used.")
(translator-property-description 'currentBarNumber integer? "Contains the current barnumber. This property is incremented at
every barline.
diff --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make
index 0761a04cf6..ffbaf5ba24 100644
--- a/stepmake/stepmake/tex-rules.make
+++ b/stepmake/stepmake/tex-rules.make
@@ -16,3 +16,6 @@ $(outdir)/%.dvi: $(outdir)/%.latex
$(outdir)/%.ps: $(outdir)/%.dvi
dvips -ta4 -o $@ $<
+$(outdir)-$(PAPERSIZE)/%.ps: $(outdir)-$(PAPERSIZE)/%.dvi
+ dvips -t$(PAPERSIZE) -o $@ $<
+
--
2.39.5