X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=mutopia%2FCoriolan%2Ffagotto-2.ly;h=5530b17dd88e63115c858aaa059b2973cd268034;hb=195abf4ce5b2182155bf8a9f0e2022eeaa5b32c2;hp=4156cd812c57236902ef4eb8d4c67465e96e890b;hpb=8b8b92e31703bf4a23683efff479793227ad39c1;p=lilypond.git

diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly
index 4156cd812c..5530b17dd8 100644
--- a/mutopia/Coriolan/fagotto-2.ly
+++ b/mutopia/Coriolan/fagotto-2.ly
@@ -1,30 +1,22 @@
-\header{
-filename =	 "fagotto-2.ly";
-%title =	 "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
-description =	 "";
-composer =	 "Ludwig van Beethoven (1770-1827)";
-enteredby =	 "JCN";
-copyright =	 "public domain";
-}
 
-\version "1.3.88";
+\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 ~ |
+fagottoII =  \notes \relative c {
+	R1*2|
+	f4-.\ff r r2|
+	R1*3|
+	f4-. r r2|
+	R1*3|
+	fis4-. r r2|
+	R1|
+	g4-. r r2|
+	g4-. r r2|
+	R1*5|
+	r2 r4 g,4-.|
+	R1*6|
+	r4 g'\f r2|
+	R1*6|
+	as1\ff ~|
 	as4(g f)es|
 	d4. r8 c4. r8|
 	b4. r8 c4. r8|
@@ -34,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(|
@@ -42,27 +34,37 @@ fagottoII = \notes \relative c {
 	)d2. es4\sf(|
 	)d4 r r2|
 	R1*9|
-	\clef "tenor";
-	\property VoiceCombineVoice.crescendoText = "cresc."
-	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
-	g''2.(as4 \p\<||
-	g f d)bes||
-	\clef "bass";
 	
+	%\clef "tenor";
+	% Ugh, clef broken in 1.3.125
+	\property VoiceCombineStaff.clefGlyph = #"clefs-C"
+	\property VoiceCombineStaff.clefPosition = #2
+
+	
+	\property VoiceCombineVoice.crescendoText = #"cresc."
+	\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
+	g''2.(as4 \p\<|
+	g f d)bes|
+
+	%\clef "bass";
+	 % Ugh, clef broken in 1.3.125
+	\property VoiceCombineStaff.clefGlyph = #"clefs-F"
+	\property VoiceCombineStaff.clefPosition = #2
+
 	\!g2\ff f|
 	e c~|
 	c1\p~|
 	c~|
 	c~|
 	c~|
-	\property VoiceCombineVoice.crescendoText = "cresc."
-	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = #"cresc."
+	\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
 	c\<~|
 	c|
 	\!c2\ff g'|
 	fis d|
-	\property VoiceCombineVoice.crescendoText = "cresc."
-	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = #"cresc."
+	\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
 	g,4 \p\< r r r8 g(|
 	)c4 r r r8 c(|
 	\!)b1\sf\>|
@@ -70,8 +72,8 @@ fagottoII = \notes \relative c {
 	R1*2|
 	r4 r8 fis\pp fis4. fis8|
 	r4 r8 fis fis4. fis8|
-	\property VoiceCombineVoice.crescendoText = "cresc."
-	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = #"cresc."
+	\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
 	r4 r8 g\< g4. g8|
 	r4 r8 g g4. g8|
 	r4 r8 a a4. a8|
@@ -92,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|
@@ -105,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|
@@ -130,8 +132,8 @@ fagottoII = \notes \relative c {
 	e|
 	f|
 	g|
-	\property VoiceCombineVoice.crescendoText = "cresc."
-	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = #"cresc."
+	\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
 	as\<|
 	g|
 	as|
@@ -140,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|
@@ -191,8 +193,8 @@ fagottoII = \notes \relative c {
 	g~|
 	g~|
 	g~|
-	\property VoiceCombineVoice.crescendoText = "cresc."
-	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = #"cresc."
+	\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
 	g\<~|
 	g~|
 	g~|
@@ -205,15 +207,13 @@ fagottoII = \notes \relative c {
 	a~|
 	a~|
 	a~|
-	\property VoiceCombineVoice.crescendoText = "cresc."
-	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = #"cresc."
+	\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
 	a\<~|
 	a|
 	\!f'2\ff e|
 	dis b~|
 	b1\p|
-	\property VoiceCombineVoice.crescendoText = "cresc."
-	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
 	a\<|
 	g|
 	f|
@@ -221,14 +221,25 @@ fagottoII = \notes \relative c {
 	R1*3|
 	r4 r8 b'' b4. b8|
 	r4 r8 b b4. b8|
-	\property VoiceCombineVoice.crescendoText = "cresc."
-	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = #"cresc."
+	\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
 	r4 r8 c\< c4. c8|
 	r4 r8 c c4. c8|
-	\clef "tenor";
+
+	%\clef "tenor";
+	% Ugh, clef broken in 1.3.125
+	\property VoiceCombineStaff.clefGlyph = #"clefs-C"
+	\property VoiceCombineStaff.clefPosition = #2
+
+	
 	r4 r8 d d4. d8|
 	r4 r8 es es4. es8|
-	\clef "bass"; 
+	
+	%\clef "bass";
+	% Ugh, clef broken in 1.3.125
+	\property VoiceCombineStaff.clefGlyph = #"clefs-F"
+	\property VoiceCombineStaff.clefPosition = #2
+
 	\!f,2.\ff()es4|
 	d(c d)c|
 	f2.\ff()es4|
@@ -258,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|
@@ -271,8 +282,8 @@ fagottoII = \notes \relative c {
 	g\p|
 	bes\f|
 	%a deux|
-	\property VoiceCombineVoice.crescendoText = "cresc."
-	\property VoiceCombineVoice.crescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.crescendoText = #"cresc."
+	\property VoiceCombineVoice.crescendoSpanner = #'dashed-line
 	as4.\p\< as8 g4. g8|
 	f4. f8 es4. es8|
 	as4. as8 g4. g8|
@@ -285,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~|
@@ -309,8 +320,8 @@ fagottoII = \notes \relative c {
 	R1|
 	es,4-. e-. r2|
 	f4-. g-. r2|
-	\property VoiceCombineVoice.decrescendoText = "dim."
-	\property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
+	\property VoiceCombineVoice.decrescendoText = #"dim."
+	\property VoiceCombineVoice.decrescendoSpanner = #'dashed-line
 	as4\> r b r|
 	R1|
 	%a deux|