song 2: stick: Fix octave problems.

1 files changed, 8 insertions, 7 deletions

diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
index 2e5b2e6..6cc2ea9 100644
--- a/02-song2/music/stick.ly
+++ b/02-song2/music/stick.ly
@@ -10,10 +10,9 @@ stickRepriseLeft = \relative c, {
     <fis dis' a'>8 fis <dis' a'> fis, <f d' a'> r16 <f d' a'>8 r16 <fis cis' a'>8 ~
     <fis cis' a'>2 |
   } \alternative {
-    %% TODO: some notes are too low
     { <fis cis'>8 r16 <b fis'>16 r16 a, b4 fis'8 <b fis'> cis,
-      <d d' a'>8 r16 a8 r16 fis4. ~ fis4 | }
-    { <fis' cis'>8 r16 <b fis'>16 r16 a, b4 fis'8 <b fis'> r
+      <d d' a'>8 r16 a'8 r16 fis4. ~ fis4 | }
+    { <fis cis'>8 r16 <b fis'>16 r16 a, b4 fis'8 <b fis'> r
       <f d' a'>8 r16 <f d' a'>8 r16 <fis cis' a'>4. ~ <fis cis' a'>4 | }
   }
 }
@@ -21,19 +20,19 @@ stickRepriseLeft = \relative c, {
 stickRepriseRight = \relative c' {
   \time 4/4
   \repeat volta 3 {
-    r8 <a cis fis>16-. r r r <a cis fis>8 ~
+    r8 <a cis fis>-. r <a cis fis>8 ~
     <a cis fis>4 ~ <a cis fis>4
-    <f' a d>8 r16 <f a d>8 r16 <fis gis cis>8 ~ <fis a cis>2 |
+    <f' a d>8 r16 <f a d>8 r16 <fis a cis>8 ~ <fis a cis>2 |
   } \alternative {
     {
-      r8 <a, cis fis>16-. r r r <dis fis b>8 ~
+      r8 <a, cis fis>-. r <dis fis b>8 ~
       <dis fis b>4 ~ <dis fis b>4
       <a d f>8 r16 <a d f>8 r16 <a cis fis>4. ~ <a cis fis>4 |
     }
     %% Same.  Need to use alternative here in order to match the notes
     %% for the left hand.
     {
-      r8 <a, cis fis>16-. r r r <dis fis b>8 ~
+      r8 <a cis fis>-. r <dis fis b>8 ~
       <dis fis b>4 ~ <dis fis b>4
       <a d f>8 r16 <a d f>8 r16 <a cis fis>4. ~ <a cis fis>4 |
     }
@@ -113,6 +112,7 @@ stick = <<
     #(mmrest-of-length stickBreak)
 
     \time 4/4
+    \key fis \minor
     \stickRepriseRight
     \stickFinalRight
   }
@@ -126,6 +126,7 @@ stick = <<
     \time 1/4
     #(mmrest-of-length stickBreak)
     \time 4/4
+    \key fis \minor
     \stickRepriseLeft
     \stickFinalLeft
   }