X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FF.Schubert%2Fstandchen.ly;h=7eb9d157fc7d7453d09082cad6797710c679e775;hb=4c8187e65dd9708d7733692842acc696da121bf1;hp=75539d4c18a7349b76c28ddab6369940fa026a7d;hpb=3b516ac6541617751b2dbb810275049185ccf513;p=lilypond.git

diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 75539d4c18..7eb9d157fc 100644
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -1,3 +1,4 @@
+#(ly:set-option 'old-relative)
 
 % #(ly:set-point-and-click 'line-column)
 
@@ -41,7 +42,7 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
-\version "1.7.3"
+\version "2.1.7"
 
 dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1
 dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction
@@ -50,30 +51,42 @@ dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction
 
 vocalVerse =  \notes\relative c''{
 	\dynamicUp
-	\times 2/3 { [ g8( )as] g } c4. g8 |
-	\times 2/3 { [ f8( )g] f } c'4 f,8 r |
-	g4.-> f8 \times 2/3 { [ f( )es] d } |
+	\times 2/3 {  g8[(  as)] g } c4. g8 |
+	\times 2/3 {  f8[(  g)] f } c'4 f,8 r |
+	g4.-> f8 \times 2/3 {  f[(  es)] d } |
 	es2 r4 |
 	R2. |
 	R2. |
-	\times 2/3 { [ g8( )as] g } es'4. g,8 |
-	\times 2/3 { [ f8( )g] f } d'4. c8 |
-	bes4. as8 \times 2/3 { [ as( )g] f } |
+	\times 2/3 {  g8[(  as)] g } es'4. g,8 |
+	\times 2/3 {  f8[(  g)] f } d'4. c8 |
+	bes4. as8 \times 2/3 {  as[(  g)] f } |
 	g2 r4 |
 	R2. |
 	R2. |
 	g8. b16 es4. d8 |
 	c8. g16 es4. c8 |
-	\grace { [ as'32( bes ] } \times 2/3 { [ )as8( )g] as } c4. as8 |
+	\grace {
+  \property Voice.Stem \override #'stroke-style = #"grace"
+    as'32[( bes ] 
+  \property Voice.Stem \revert #'stroke-style }
+ \times 2/3 {  as8[)(  g)] as } c4. as8 |
 	g2. |
-	\grace { [ f32( g ] } \times 2/3 { [ )f8( )e] f } as4. f8 |
+	\grace {
+  \property Voice.Stem \override #'stroke-style = #"grace"
+    f32[( g ] 
+  \property Voice.Stem \revert #'stroke-style }
+ \times 2/3 {  f8[)(  e)] f } as4. f8 |
   
 	es!2. |
 	g8. b16 es4. d8 |
 	c8. g16 e4. c8 |
- 	\grace { [ a'32( b ] } \times 2/3 { [ )a!8( ) gis] a } c4. a8 |
+ 	\grace {
+  \property Voice.Stem \override #'stroke-style = #"grace"
+    a'32[( b ] 
+  \property Voice.Stem \revert #'stroke-style }
+ \times 2/3 {  a!8[)(  gis)] a } c4. a8 |
 	g!2. |
-	\times 2/3 { [ d'8\f( )cis] d } f4. b,8 |
+	\times 2/3 {  d'8[\f(  cis)] d } f4. b,8 |
 	c!2. |
 }
 
@@ -83,13 +96,17 @@ vocalThrough =  \notes\relative c{
 	c4 b r |
 	g4. b8 d8. c16 |
 	b2 r4 |
-	e4. d8 \times 2/3 { [ d( )c] b } |
+	e4. d8 \times 2/3 {  d[(  c)] b } |
 	a8. b16 c4-> a8 r |
 	R2. |
 	R2. |
-	\grace { [ a32( b ] } \times 2/3 { [ )a!8( ) gis] a } c4. a8 |
+	\grace {
+  \property Voice.Stem \override #'stroke-style = #"grace"
+    a32[( b ] 
+  \property Voice.Stem \revert #'stroke-style }
+ \times 2/3 {  a!8[)(  gis)] a } c4. a8 |
 	g!2. |
-	\times 2/3 { [ d'8\f( )cis] d } f4. b,8 |
+	\times 2/3 {  d'8[\f(  cis)] d } f4. b,8 |
 	c!2. ~ |
 	% bug: slur on other staff fools lily into extending melisma
 	c4 r c |
@@ -139,10 +156,10 @@ lyricThrough =  \lyrics{
 }
 
 trebleIntro =  \notes\relative c{
-	r8^"\bf M\\\"a\\ss ig"\pp <g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.> |
-	r8 <as-. c-.> <c-. es-.> <as-. c-.> <c-. es-.> <as-. c-.> |
-	r8 <as-. c-.> <c-. d-.> <as-. c-.> <c-. d-.> <as-. c-.> |
-	r8 <g-. b-.> <b-. d-.> <g-. b-.> <b-. d-.> <g-. b-.> |
+	r8^"\bf M\\\"a\\ss ig"\pp <g' c>-. <c es>-. <g c>-. <c es>-. <g c>-. |
+	r8 <as c>-. <c es>-. <as c>-. <c es>-. <as c>-. |
+	r8 <as c>-. <c d>-. <as c>-. <c d>-. <as c>-. |
+	r8 <g b>-. <b d>-. <g b>-. <b d>-. <g b>-. |
 }
 
 trebleVerseOne =  \notes\relative c{
@@ -151,194 +168,201 @@ trebleVerseOne =  \notes\relative c{
 	r8 <f c'> <c' d> <f, c'> <c' d> <f, c'> |
 	r8 <f g b> <g b d> <f g b> <g b d> <f g b> |
 	r8 <es g c> <g c es> <es g c> <g c es> <es g c> |
-	<g''4.( b,> <)f8 d>
-	\times 2/3 < { [ f( es )d ] } { d c b } > |
+	<g'' b,>4.( <f d>8)
+	\times 2/3 { <f d>([ <es c> <d b>)] }
+
 	%10
-	<c2. es> |
+	<c es>2. |
 	r8 <g, c> <c es> <g c> <c es> <g c> |
 	r8 <f c'> <c' d> <f, c'> <c' d> <f, c'> |
 	r8 <f as bes> <as bes d> <f as bes> <as bes d> <f as bes> |
-	r8 < { [ es g es g ] } { g bes g bes } { bes es bes es } >
-	<{ es'( )  d4.() f8}{ c' | bes4.  as8 } >
-	\times 2/3 < { [ f( es )d ] } { as' g f } > |
+	r8
+	<es g bes>[
+	<g bes es>
+	<es g bes>
+	<g bes es>]
+	<es' c'>(
+	<d bes'>4.()
+	<f as>8)
+	
+	\times 2/3 { <f as>([ <es g> <d f>)] }
 	%16
-	<es2. g> |
+	<es g>2. |
 	r8 <f, g> <g b> <f g> <g b> <f g> |
 	r8 <es g> <g c> <es g> <g c> <es g> |
 	r8\pp <es as c> <as c es> <es as c> <as c es> <es as c> |
 	%20
 	r8 <es g bes> <g bes es> <es g bes> <g bes es> <es g bes> |
 	\property Voice.Slur \override #'attachment = #'(stem . stem)
-	\grace { [ as'32( bes ] } \times 2/3 { [ )as8( g as] } c4.-> ) as8 |
+	\grace {
+  \property Voice.Stem \override #'stroke-style = #"grace"
+    as'32[( bes ] 
+  \property Voice.Stem \revert #'stroke-style }
+
+	\times 2/3 {  as8[)( g as] } c4.->  as8) |
 	\property Voice.Slur \revert #'attachment
 	g2. |
 	r8 <f, g> <g b> <f g> <g b> <f g> |
 	r8 <e g> <g c> <e g> <g c> <e g> |
 	r8 <f a c> <a c f> <f a c> <a c f> <f a c> |
 	r8 <e g c> <g c e> <e g c> <g c e> <e g c> |
-	\times 2/3 < { [ f'8\f( e f] } {  f' e f } >
-	< {a4.- > )f8}  { a'4. f8 }  > |
+	\times 2/3  { <f' f'>\f( <e e'> <f f'> }
+	<a a'>4.-> <f f'>8)  |
 }
 
 trebleEentje =  \notes \relative c' \context Voice {
 	\stemBoth
-	<e2 e'> r4 |
-	<f2\mf as!\(> <as8.->( c> <f16 \))as> |
+	<e e'>2 r4 |
+	<f as!>2\(\mf <as c>8.(-> <f as>16)\) |
 	% urg: slurs with staccati are ugly
-	<e4. g> <e8-. g-.(> <e-. g-.> <e-. )g-.> |
-	<f4. g> <b,8-. g'-.(> <d-. g-.> <f-. )g-.> |
-	<e2 g> <e4\pp g> |
-	<f2 a\(> <a8.( c> <f16 \))a> |
-	<e4.\( g> <e8-.( g-.> <e-. g-.> <e-. \))g-.> |
-	<f4. g> <b,8-. g'-.(> <d-. g-.> <f-. )g-.> |
+	<e g>4. <e g>8-.( <e g>-. <e g>)-. |
+	<f g>4. <b, g'>8-.( <d g>-. <f g>)-. |
+	<e g>2 <e g>4\pp |
+	<f a>2\( <a c>8.( <f a>16)\) |
+	<e g>4.\( <e g>8(-. <e g>-. <e g>)\)-. |
+	<f g>4. <b, g'>8(-. <d g>-. <f g>)-. |
 	%60
-	<e2 g> r4 |
+	<e g>2 r4 |
 }
 
 trebleThrough =  \notes \relative c'{
 	\stemBoth
-	<e2. e'> |
+	<e e'>2. |
 	%61
 	R2. |
-	[<g,8.\< g'> <g16 g'> <b8. b'> <\! b16\> b'16> <d8. d'> <d16 d'>] |
+	<g, g'>8.[\< <g g'>16 <b b'>8. <b b'>16\>\! <d d'>8. <d d'>16] |
 
 	%% score has double slur on chord.
-	< { c4( )b } { c'4 b } > \!r |
+	<c c'>4( <b c'>) r\!
 
-	<g4. g'> <b8 b'> [<d'8.-> d,-> > c16] |
+	<g g'>4. <b b'>8 <d' d, >8.->[ c16] |
 	%65
-	< { d,2.(\f )a'2} { e2. ~ e2 } { b'2.( )c,2 }> r4 |
-	\context Staff < 
-		\context Voice=one {
-			\voiceOne
-			%urg
-			%a8. b16 c4-> () a8 r |
-			a8. b16 c4^> () a8 r |
-			%a8. b16 c4-> () a8 r |
-			a8. b16 c4^> () a8 r |
-		}
-		\context Voice=two {
-			\voiceTwo
-			<d,4 f> <d2 f> |
-			<c!4 es> <c2 es> |
-		}
-	>
+        <d, e b'>2.~(\f
+	<c e a>2)  r4
+	<< 
+	{ 	a'8. b16 c4^> ( a8) r |
+		a8. b16 c4^> ( a8) r |
+	}\\{ 
+		<d, f>4 <d f>2 |
+		<c! es>4 <c es>2 |
+	} >>
 
 	% 4 bars copied from end verse1
 	r8 <f, a c> <a c f> <f a c> <a c f> <f a c> |
 	%70
 	r8 <e g c> <g c e> <e g c> <g c e> <e g c> |
-	\times 2/3 < { [ f'8\f( e f] } {  f' e f } >
-	< { a4.-> )f8 } { a'4. f8 } > |
-	<e2. e'> |
-	<es!2. es'! > |
+	\times 2/3 {  <f' f'>8( <e e'> <f f'> }
+
+	<a a'>4.-> <f f'>8)
+	<e e'>2. |
+	<es! es'! >2. |
 	\property Voice . TextScript \override #'font-shape = #'italic
-	<d2._"decresc." d'> |
+	<d d'>2._"decresc."
 	\property Voice . TextScript \revert #'font-shape
 
 	%75
-	<b2. b'> |
-	<c2 c'> <e4\pp g> |
+	<b b'>2. |
+	<c c'>2 <e g>4\pp |
 
 	% four copied from begin eentje
-	<f2 as!(> <as8.-> c> <f16 )as> |
-	<e4. g> <e8-. g-.(> <e-. g-.> <e-. )g-.> |
-	<f4. g> <b,8-. g'-.(> <d-. g-.> <f-. )g-.> |
+	<f as!>2( <as c>8.-> <f as>16) |
+	<e g>4. <e g>8(-. <e g>-. <e g>)-. |
+	<f g>4. <b, g'>8(-. <d g>-. <f g>)-. |
 	%80
 
 	\property Voice . TextScript \override #'font-shape = #'italic
-	<e2._"dim." g> |
+	<e g>2._"dim."
 	\property Voice . TextScript \revert #'font-shape
 
-	<g,2. e' g> |
-	<g2.-\fermata e' g> |
+	<g, e' g>2. |
+	<g e' g>2.\fermata |
 }
 
 bassIntro =  \notes\relative c{
 	\dynamicUp
 %1
-	<c,2 c'> r4 |
-	<as2 as'> r4 |
-	<f2 f'> r4 |
-	<g2 g'> r4 |
+	<c, c'>2 r4 |
+	<as as'>2 r4 |
+	<f f'>2 r4 |
+	<g g'>2 r4 |
 }
 
 bassVerseOne =  \notes\relative c{
 %	\clef bass
 	\dynamicUp
 %5
-	<c,2 c'> r4 |
-	<as2 as'> r4 |
-	<g2 g'> r4 |
-	<c2 c'> r4 |
-	<g8 g'> [<g'' d'> <d' f> <g, d'> <d' f> <g, d'>] |
+	<c, c'>2 r4 |
+	<as as'>2 r4 |
+	<g g'>2 r4 |
+	<c c'>2 r4 |
+	<g g'>8 <g'' d'>[ <d' f> <g, d'> <d' f> <g, d'>] |
 %10
-	<c,,8 c'> [<g'' c> <c es> <g c> <c es> <g c>] |
-	<c,,2 c'> r4 |
-	<as2 as'> r4 |
-	<bes2 bes'> r4 |
-	<es,2 es'> r4 |
+	<c,, c'>8 <g'' c>[ <c es> <g c> <c es> <g c>] |
+	<c,, c'>2 r4 |
+	<as as'>2 r4 |
+	<bes bes'>2 r4 |
+	<es, es'>2 r4 |
 %15
-	bes'8 [<bes' f'> <f' as> <bes, f'> <f' as> <bes, f'>] |
-	es,8 [<bes' es> <es g> <bes es> <es g> <bes es>] |
-	<g,2 g'> r4 |
-	<c2 c'> r4 |
-	<as2 as'> r4 |
-	<es2 es'> r4 |
-	<bes'8 bes'> [<f'' bes> <bes d> <f bes> <bes d> <f bes>] |
-	<es,,8 es'> [<es'' g bes> <g bes es> <es g bes> <g bes es> <es g bes>] |
-	<g,,2 g'> r4 |
-	<c2 c'> r4 |
-	<f,2 f'> r4 |
-	<c'2 c'> r4 |
-	<g8 g'> [<d'' g> <g b> <d g> <g b> <d g>] |
-	c,8 [<c' e g> <e g c> <c e g> <e g c> <c e g>] |
+	bes'8 <bes' f'>[ <f' as> <bes, f'> <f' as> <bes, f'>] |
+	es,8 <bes' es>[ <es g> <bes es> <es g> <bes es>] |
+	<g, g'>2 r4 |
+	<c c'>2 r4 |
+	<as as'>2 r4 |
+	<es es'>2 r4 |
+	<bes' bes'>8 <f'' bes>[ <bes d> <f bes> <bes d> <f bes>] |
+	<es,, es'>8 <es'' g bes>[ <g bes es> <es g bes> <g bes es> <es g bes>] |
+	<g,, g'>2 r4 |
+	<c c'>2 r4 |
+	<f, f'>2 r4 |
+	<c' c'>2 r4 |
+	<g g'>8 <d'' g>[ <g b> <d g> <g b> <d g>] |
+	c,8 <c' e g>[ <e g c> <c e g> <e g c> <c e g>] |
 }
 
 bassEentje =  \notes\relative c{
 	\dynamicUp
-	<c,8 c'> [<c' f as!> <f as c> <c f as> <f as c> <c f as>] |
-	c,8 [<c' e g> <e g c> <c e g> <e g c> <c e g>] |
-	<g,8 g'> [<d'' g> <g b> <d g> <g b> <d g>] |
-	c,8 [<e' g> <g c> <e g> <g c> <e g>] |
-	<c,8 c'> [<c' f a> <f a c> <c f a> <f a c> <c f a>] |
-	c,8 [<c' e g> <e g c> <c e g> <e g c> <c e g>] |
-	<g,8 g'> [<d'' g> <g b> <d g> <g b> <d g>] |
-	c,8 [<e' g> <g c> <e g> <g c> <e g>] |
+	<c, c'>8 <c' f as!>[ <f as c> <c f as> <f as c> <c f as>] |
+	c,8 <c' e g>[ <e g c> <c e g> <e g c> <c e g>] |
+	<g, g'>8 <d'' g>[ <g b> <d g> <g b> <d g>] |
+	c,8 <e' g>[ <g c> <e g> <g c> <e g>] |
+	<c, c'>8 <c' f a>[ <f a c> <c f a> <f a c> <c f a>] |
+	c,8 <c' e g>[ <e g c> <c e g> <e g c> <c e g>] |
+	<g, g'>8 <d'' g>[ <g b> <d g> <g b> <d g>] |
+	c,8 <e' g>[ <g c> <e g> <g c> <e g>] |
 }
 
 bassThrough =  \notes\relative c{
 	\dynamicUp
 	%61
-	<g,8^"cresc." g'> [<g' b d> <b d f> <g b d> <as!-> b-> d-> > <b d f>] |
-	<g,8 g'> [<g' d'> <d' f> <g, d'> <as-> b-> d-> > <b d f>] |
+	<g, g'>8^"cresc." <g' b d>[ <b d f> <g b d> <as! b d >-> <b d f>] |
+	<g, g'>8 <g' d'>[ <d' f> <g, d'> <as b d >-> <b d f>] |
 	% copied
-	<g,8 g'> [<g' d'> <d' f> <g, d'> <as-> b-> d-> > <b d f>] |
-	<g,8 g'> [<g' d'> <d' f> <g, d'> <gis-> b-> d-> > <b d f>] |
+	<g, g'>8 <g' d'>[ <d' f> <g, d'> <as b d >-> <b d f>] |
+	<g, g'>8 <g' d'>[ <d' f> <g, d'> <gis b d >-> <b d f>] |
 	%65
-	<gis,8 gis'> [<d''\> e> <e b'> <d e> <e b'> <d\! e>] |
-	<a,8 a'> [<c' e> <e a> <c e> <e a> <c e>] |
-	<a,8 a'> [<a' d f> <d f a> <a d f> <d f a> <a d f>] |
-	<a,8 a'> [<a' c e> <c e a> <a c e> <c e a> <a c e>] |
+	<gis, gis'>8 <d'' e>[\> <e b'> <d e> <e b'> <d e> \!] |
+	<a, a'>8 <c' e>[ <e a> <c e> <e a> <c e>] |
+	<a, a'>8 <a' d f>[ <d f a> <a d f> <d f a> <a d f>] |
+	<a, a'>8 <a' c e>[ <c e a> <a c e> <c e a> <a c e>] |
 	% 4 bars copied from end verse1
-	<f,2\p f'> r4 |
+	<f, f'>2\p r4 |
 	%70
-	<c'2 c'> r4 |
-	<g8 g'> [<d'' g> <g b> <d g> <g b> <d g>] |
-	c,8\> [<c' e g> < \! e g c> <c e g> <e g c> <c e g>] |
+	<c' c'>2 r4 |
+	<g g'>8 <d'' g>[ <g b> <d g> <g b> <d g>] |
+	c,8\> <c' e g>[ < e g c> \! <c e g> <e g c> <c e g>] |
 
-	<c,8 c'> [<c' es! g> <es g c> <c es g> <es g c> <c es g>] |
-	<f,,8 f'> [<d'' f> <f as!> <d f> <f as> <d f>] |
+	<c, c'>8 <c' es! g>[ <es g c> <c es g> <es g c> <c es g>] |
+	<f,, f'>8 <d'' f>[ <f as!> <d f> <f as> <d f>] |
 	%75
-	<g,,8 g'> [<d'' f> <f g> <d f> <f g> <d f>] |
-	c,8 [<c' e> <e g> <c e> <e g> <c e>] |
-	c,8 [<c' f> <f as> <c f> <f as> <c f>] |
-	c,8 [<c' e> <e g> <c e> <e g> <c e>] |
-	g,8 [<g' d'> <d' f> <g, d'> <d' f> <g, d'>] |
+	<g,, g'>8 <d'' f>[ <f g> <d f> <f g> <d f>] |
+	c,8 <c' e>[ <e g> <c e> <e g> <c e>] |
+	c,8 <c' f>[ <f as> <c f> <f as> <c f>] |
+	c,8 <c' e>[ <e g> <c e> <e g> <c e>] |
+	g,8 <g' d'>[ <d' f> <g, d'> <d' f> <g, d'>] |
 	%80
-	c,8 [<c' e> <e g> <c e> <e g> <c e>] |
-	c,8 [<c' g> <e c> <c g> <e c> <c g>] |
-	<c,2._\fermata g' c> |
+	c,8 <c' e>[ <e g> <c e> <e g> <c e>] |
+	c,8 <c' g>[ <e c> <c g> <e c> <c g>] |
+	<c, g' c>2._\fermata |
 }
 		
 global =  \notes{
@@ -358,12 +382,12 @@ global =  \notes{
 
 allLyrics = \lyrics {
 	% maybe should be bigger by default, in grob-description.scm ?
-	\property Lyrics . LyricText \override #'font-relative-size = #1
+	\property Lyrics . LyricText \override #'font-size = #2
 	\property Lyrics . LyricHyphen \override #'maximum-length = #1.5
-	\lyricVerseOne
+	\context LyricsVoice = "leise-1"  { \lyricVerseOne
 	\lyricVerseTwo
 	\lyricThrough
-}
+} }
 
 lyricStaff = \context Lyrics {
 	\allLyrics
@@ -372,8 +396,7 @@ lyricStaff = \context Lyrics {
 vocals = \context Voice \notes {
 	\clef treble
  	% certainly no auto-beaming for vocals
- 	\property Voice.autoBeaming = ##f
-	\property Staff.automaticMelismata= ##t
+ 	\autoBeamOff
 
 	\dynamicUp
 	% duh 1 != 3/4
@@ -385,11 +408,11 @@ vocals = \context Voice \notes {
 	R1 * 3/4 * 6
 }
 
-vocalStaff =  \context Staff = vocal<
+vocalStaff =  \context Staff = vocal<<
 	  \property Staff.midiInstrument = "synth voice"
-	  \global
-	  \vocals
->
+	\context Voice = "leise" << 	  \global
+	  \vocals >>
+>>
 
 treble =  {
 	\clef treble
@@ -401,11 +424,11 @@ treble =  {
 	\trebleThrough
 }
 
-trebleStaff =  \context Staff = treble< 
+trebleStaff =  \context Staff = treble<< 
         \property Staff.midiInstrument = "acoustic grand"
 	\global
 	\treble
->
+>>
 bass =  {
 	\clef bass
 	\bassIntro 
@@ -415,51 +438,52 @@ bass =  {
 	\bassThrough
 }
 
-bassStaff =  \context Staff = bass<
+bassStaff =  \context Staff = bass<<
         \property Staff.midiInstrument = "acoustic grand"
 	\global
 	\bass
->
+>>
 
-grandStaff =  \context PianoStaff <
+grandStaff =  \context PianoStaff <<
 
 	\trebleStaff
 	\bassStaff
->
+>>
 
 
 \score{
-	<
+	<<
 
 %{
 	Transpose as you like for your voice
 	Range untransposed is c' to f'' (for tenors and sopranos)
-	\transpose a gives a' to d'' (for basses, who sing an octave down)
+	\transpose c' a gives a' to d'' (for basses, who sing an octave down)
 
 		\addlyrics 
-			\notes \transpose a \vocalStaff
+			\notes \transpose c' a \vocalStaff
 			\lyricStaff
-		\notes \transpose a \grandStaff
+		\notes \transpose c' a \grandStaff
 %}
 
 		\addlyrics
 			\vocalStaff
 			\lyricStaff 
 		\grandStaff
-	>
+	>>
 	\paper {
 		% Use
 		%   textheight = 280.\mm
 		%   linewidth = 190.\mm
 		% to get this on 3 pages of a4.
 		
-		% Mandatory Mutopia settings yield 4 pages :-(
+		% Mandatory Mutopia settings yield 4 pages :(
 		textheight = 270.0\mm
 		linewidth = 180.0\mm
 
-		\translator { \HaraKiriStaffContext }
+		\translator { \RemoveEmptyStaffContext }
 	}
 	\midi{
 		\tempo 4 = 54
 	}
 }
+