song2: stick: Alternate hands in finale.

1 files changed, 30 insertions, 7 deletions

diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
index 7c6ec22..9c8c06b 100644
--- a/02-song2/music/stick.ly
+++ b/02-song2/music/stick.ly
@@ -153,18 +153,41 @@ stickRepriseRight = \relative c' {
 
 stickFinalLeft = \relative c, {
   \time 4/4
-  \repeat volta 4 { r1 | r1 | r1 | r1 |}
+  \repeat volta 4 { R1*4 }
+  R1
+  %% alternate right and left hand
+  %% keep this bar alive; it's filled later
+  s1
 }
 
 stickFinalRight = \relative c' {
   \time 4/4
-  \repeat volta 4 { r1 | r1 | r1 | r1 |}
-
-  b'16 a fis dis b' fis dis fis
-  dis b fis b fis dis b fis
+  \repeat volta 4 { R1*4 }
+
+  b'16 a fis dis
+  b' fis dis fis
+  dis b fis b
+  fis dis b fis
+
+  %% alternate right and left hand
+  \tuplet 6/4 {
+    d''
+    \change Staff = "stick left"  a
+    \change Staff = "stick right" fis
+    \change Staff = "stick left"  a
+    \change Staff = "stick right" fis
+    \change Staff = "stick left"  d
+  }
+  \tuplet 6/4 {
+    \change Staff = "stick right" fis
+    \change Staff = "stick left"  d
+    \change Staff = "stick right" a
+    \change Staff = "stick left" d
+    \change Staff = "stick right" a
+    \change Staff = "stick left" e'
+  }
 
-  \tuplet 6/4 { d'' a fis  a fis d }
-  \tuplet 6/4 { fis d a    d a e' }
+  \change Staff = "stick right"
   \tuplet 6/4 { fis a cis  a cis e }
   \tuplet 3/2 { cis e fis }
   gis16 a |