song2: Fix up transition.

5 files changed, 36 insertions, 9 deletions

diff --git a/02-song2/music/bass.ly b/02-song2/music/bass.ly
index dda53c4..93a24bc 100644
--- a/02-song2/music/bass.ly
+++ b/02-song2/music/bass.ly
@@ -36,7 +36,11 @@ bassTransition = \relative fis,, {
     fis16 r8. fis16 r8 e16 fis fis e fis8 r8. |
   }
 
-  \repeat volta 4 {
+  \repeat volta 2 {
+    r16 fis8 e16 fis8 e16 fis8 fis8 r16 r4      |
+    r16 fis8 e16 fis8 e16 fis16 r16 fis16 e4 r8 |
+  }
+  \repeat volta 2 {
     r16 fis8 e16 fis8 e16 fis8 fis8 r16 r4      |
     r16 fis8 e16 fis8 e16 fis16 r16 fis16 e4 r8 |
   }
diff --git a/02-song2/music/click.ly b/02-song2/music/click.ly
index fb32aa4..eaccc18 100644
--- a/02-song2/music/click.ly
+++ b/02-song2/music/click.ly
@@ -25,7 +25,10 @@ click = \drummode {
     hh4 hh hh hh | hh4 hh hh hh |
   }
 
-  \repeat volta 4 {
+  \repeat volta 2 {
+    hh4 hh hh hh | hh4 hh hh hh |
+  }
+  \repeat volta 2 {
     hh4 hh hh hh | hh4 hh hh hh |
   }
 
diff --git a/02-song2/music/guitar.ly b/02-song2/music/guitar.ly
index 307679e..11cef6d 100644
--- a/02-song2/music/guitar.ly
+++ b/02-song2/music/guitar.ly
@@ -15,12 +15,16 @@ guitar = \relative c {
 
   %% transition
   \repeat volta 2 { R1*4 }
-  \repeat volta 4 {
+  \repeat volta 2 {
     r16 <b e>8 <a d>16 <b e>8 <a d>16
     <b e>8 <b e>8 r16 r4           |
     r16 <b e>8 <a d>16 <b e>8 <a d>16
     <b e>16 r16 <b e>16 <a d>4 r8 |
   }
+  \repeat volta 2 {
+    r16 g'8 fis16 g8 fis16 g8 g8 r16 r4 |
+    r16 g8 fis16 g8 fis16 g16 r16 g16 fis4 r8 |
+  }
 
   %% crescendo
   \time 6/8
diff --git a/02-song2/music/keys.ly b/02-song2/music/keys.ly
index 4d0f4b7..3b06a12 100644
--- a/02-song2/music/keys.ly
+++ b/02-song2/music/keys.ly
@@ -1,14 +1,23 @@
 keysA = { R1*8 }
 keysB = { R1*4 }
 
-keysTransition = \relative c' {
+keysTransitionA = \relative c' {
   \repeat volta 2 {
     <cis fis a>1 | <b e gis>1   |
     <a d fis>1   | <a cis fis>1 |
   }
+}
 
-  %% TODO
-  \repeat volta 4 { R1 | R1 |}
+keysTransitionB = \relative c' {
+  %% TODO: change this.  Also play fast arpeggios in the breaks?
+  \repeat volta 2 {
+    r16 fis8 e16 fis8 e16 fis8 fis8 r16 r4      |
+    r16 fis8 e16 fis8 e16 fis16 r16 fis16 e4 r8 |
+  }
+  \repeat volta 2 {
+    r16 fis8 e16 fis8 e16 fis8 fis8 r16 r4      |
+    r16 fis8 e16 fis8 e16 fis16 r16 fis16 e4 r8 |
+  }
 }
 
 keysCrescendo = {
@@ -98,7 +107,12 @@ keyboard = \relative c' {
 
     \set Staff.midiInstrument = #"pad 2 (warm)"
     \key fis \minor
-    \keysTransition
+    \keysTransitionA
+
+    \set Staff.midiInstrument = #"electric piano 1"
+    \keysTransitionB
+
+    \set Staff.midiInstrument = #"pad 2 (warm)"
     \keysCrescendo
     \keysThree
 
diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
index 270966d..903411d 100644
--- a/02-song2/music/stick.ly
+++ b/02-song2/music/stick.ly
@@ -75,12 +75,14 @@ stickBRight = \relative c' {
 %% switch to acoustic guitar here
 stickTransitionLeft = \relative c, {
   \repeat volta 2 { R1*4 }
-  \repeat volta 4 { R1*2 }
+  \repeat volta 2 { R1*2 }
+  \repeat volta 2 { R1*2 }
 }
 
 stickTransitionRight = \relative c' {
   \repeat volta 2 { R1*4 }
-  \repeat volta 4 { R1*2 }
+  \repeat volta 2 { R1*2 }
+  \repeat volta 2 { R1*2 }
 }
 
 stickCrescendoLeft = \relative c, {