song1: Adjust ending.

3 files changed, 20 insertions, 52 deletions

diff --git a/01-song1/music/bass.ly b/01-song1/music/bass.ly
index f433f8e..5e7864a 100644
--- a/01-song1/music/bass.ly
+++ b/01-song1/music/bass.ly
@@ -142,30 +142,11 @@ bassWaltz = \relative c, {
   c4. c c4 |
 }
 
-%% TODO
-bassB = \relative c, {
-  \key cis \minor
-  \time 2/4
-  cis4 cis, | cis'4 r8 b | r b r cis, |
-  cis4 cis | cis'4 r8 b |
-  \time 6/8
-  r b r cis r r|
-
-  \time 2/4
-  cis,4 cis | cis'4 r8 b | r b r r |
-  \time 4/4
-  cis,4. dis e4 ~ | e8 fis4. e4 dis |
-}
-
-bassBTransition = \relative c,, {
-  \time 4/4 e4. dis cis4 ~ | cis8 dis4. e4 dis4 |
-}
-
 bassEnd = \relative fis, {
   \time 4/4
-  \repeat unfold 3 { cis8 b r b cis r cis r |}
+  \repeat unfold 3 { cis8 cis cis cis cis cis cis cis |}
   e e e e b b b b |
-  \repeat unfold 3 { cis8 b r b cis r cis r |}
+  \repeat unfold 3 { cis8 cis cis cis cis cis cis cis |}
   e e e e fis fis fis gis |
 }
 
@@ -194,8 +175,8 @@ bassMusic = {
   \bassNasty
   \bassWaltz
 
-  \repeat volta 2 \bassB
-  \bassBTransition
+  \repeat volta 2 \bassA
+  \bassAExtended
   \repeat volta 2 \bassEnd
 }
 
diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
index 022d81d..746c356 100644
--- a/01-song1/music/keys.ly
+++ b/01-song1/music/keys.ly
@@ -128,12 +128,9 @@ keysWaltz = \relative c'' {
   <c dis gis>4. <c dis fis>8 ~ <c dis fis>2 |
 }
 
-keysBTransition = \relative c' {
-  \time 4/4 <e gis>4. <dis fis> <cis e>4 ~ | <cis e>8 <dis fis>4. e4 dis4 |
-}
-
 keysOutro = \relative c' {
   \time 4/4
+  \set PianoStaff.midiInstrument = #"lead 8 (bass+lead)"
   \repeat unfold 3 { cis8 b, cis gis e' gis, e' gis, |}
   <b e gis>2 <b dis fis> |
   \repeat unfold 3 { cis'8 b, cis gis e' gis, e' gis, |}
@@ -171,7 +168,7 @@ keyboard = <<
     \keysWaltz
 
     \repeat volta 2 \keysA
-    \keysBTransition
+    \keysAExtended
     \repeat volta 2 \keysOutro
     \keysEnd
   }
diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index 798d2e8..d038997 100644
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -273,31 +273,21 @@ stickWaltzRight = \relative c'' {
   gis'4. fis c4 |
 }
 
-stickBLeft = \stickALeft
-stickBRight = \stickARight
-
-%% TODO: just copied from keys
-stickBTransitionLeft = {
-  \time 4/4 <e gis>4. <dis fis> <cis e>4 ~ | <cis e>8 <dis fis>4. e4 dis4 |
-}
-
-stickBTransitionRight = \relative c' {
+stickOutroLeft = \relative c, {
   \time 4/4
-  <e gis>4. <dis fis> <cis e>4 ~ |
-  %% TODO
-  <cis e>8 <dis fis>4. e4 dis4 |
+  \repeat unfold 3 { r8 b cis <cis' gis'> r q r r |}
+  <e b'>2 <dis b'> |
+  \repeat unfold 3 { r8 b cis <cis' gis'> r q r r |}
+  <e b'>2 <dis b'> |
 }
 
-stickOutroLeft = \relative c {
-  \time 4/4
-  \repeat unfold 3 { cis8 b, cis gis' e' cis, e' cis, |}
-  r1 |
-  \repeat unfold 3 { cis'8 b, cis gis' e' cis, e' cis, |}
-  r1 |
+stickOutroRight = \relative c' {
+  \repeat unfold 3 { <gis cis e>8 r r r q r q r | }
+  <gis b e>2 <dis fis b> |
+  \repeat unfold 3 { <gis cis e>8 r r r q r q r | }
+  <gis b e>2 <dis fis b> |
 }
 
-stickOutroRight = {}
-
 stickEndLeft = {}
 stickEndRight = {}
 
@@ -327,8 +317,8 @@ stick = <<
     \stickNastyRight
     \stickWaltzRight
 
-    \repeat volta 2 \stickBRight
-    \stickBTransitionRight
+    \repeat volta 2 \stickARight
+    \stickAExtendedRight
     \repeat volta 2 \stickOutroRight
     \stickEndRight
   }
@@ -357,8 +347,8 @@ stick = <<
     \stickNastyLeft
     \stickWaltzLeft
 
-    \repeat volta 2 \stickBLeft
-    \stickBTransitionLeft
+    \repeat volta 2 \stickALeft
+    \stickAExtendedLeft
     \repeat volta 2 \stickOutroLeft
     \stickEndLeft
   }