song2: Move final from synth to stick.

2 files changed, 32 insertions, 22 deletions

diff --git a/02-song2/parts/keys.ly b/02-song2/parts/keys.ly
index f8703d2..cb25460 100644
--- a/02-song2/parts/keys.ly
+++ b/02-song2/parts/keys.ly
@@ -68,29 +68,15 @@ keysFinal = \relative c' {
     \tuplet 6/2 { a'8\sustainOn fis dis cis a fis ~ } fis2   cis16\sustainOff dis gis8 |
     a16 d fis d fis gis a8 ~ a2 |
 
-    \tuplet 6/2 { cis8 a fis dis cis fis, }
-    b8. dis,16 a' cis fis gis a b cis d
+    \tuplet 6/2 { cis8\sustainOn a fis dis cis fis, }
+    b8.\sustainOff dis,16\sustainOn a' cis fis\sustainOff gis a-. b-. cis-. d-.
     <cis a>16 r8 <b gis>16 r8 a16 gis fis\sustainOn cis a gis fis4\sustainOff
   }
 
-  %% TODO: simplify more!
-  %% TODO: move these commented chords to stick?
-  %% <fis,, dis b>
-  b''16 a
-  fis dis b' fis dis fis dis b fis b fis dis b fis
-
-  %% <a, fis d>
-  d''4*1/6 a fis a fis d
-  fis d a d a
-
-  %% <e b a a,>
-  e'4*1/6 fis a cis a cis
-  e cis e fis gis16 a
-
-  %% <fis,, dis b>
-  b16 a
-  fis dis b' fis dis fis dis b fis b fis dis b fis
-  f8 b' r8 d16 f gis1.
+  <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
+  <a d fis>8 r <a d fis> r16 <a cis e>8. a8 <a cis e> r |
+  <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
+  f8 b r8 d16 f gis1.\trill
 }
 
 \layout {
diff --git a/02-song2/parts/stick.ly b/02-song2/parts/stick.ly
index d80aaeb..2809ec5 100644
--- a/02-song2/parts/stick.ly
+++ b/02-song2/parts/stick.ly
@@ -181,8 +181,32 @@ stickRepriseRight = \relative c' {
   }
 }
 
-stickFinalLeft = {}
-stickFinalRight = {}
+stickFinalLeft = \relative c, {
+  \time 4/4
+  \repeat volta 4 { r1 | r1 | r1 | r1 |}
+}
+
+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
+
+  \tuplet 3/2 { d'' a fis }
+  \tuplet 3/2 { a fis d }
+  \tuplet 3/2 { fis d a }
+  \tuplet 3/2 { d a e' }
+  \tuplet 3/2 { fis a cis }
+  \tuplet 3/2 { a cis e }
+  \tuplet 3/2 { cis e fis }
+  gis16 a |
+
+  b16 a fis dis b' fis dis fis
+  dis b fis b fis dis b fis
+
+  f8 b' r8 d16 f gis1.
+}
 
 \layout {
   ragged-last = ##t