From 53d900b181b42fbbbeeff23588ea61722daead76 Mon Sep 17 00:00:00 2001
From: rekado <rekado@elephly.net>
Date: Wed, 11 Nov 2015 22:32:58 +0100
Subject: song2: stick: Bring stanza B part closer to what I play.

---
 02-song2/parts/stick.ly | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to '02-song2')

diff --git a/02-song2/parts/stick.ly b/02-song2/parts/stick.ly
index d2634c6..27c5bdb 100644
--- a/02-song2/parts/stick.ly
+++ b/02-song2/parts/stick.ly
@@ -36,7 +36,7 @@ stickStanzaLeft = \relative c {
     <e b>4 <e b>8 r <e b> |
   } \alternative {
     { <b g'>8 r16 <b g'>8 r16  <b fis'>2 r8 |}
-    { <b g' d'>8 r16 <a e'>8 r16 <d a'>8 ~ <d a'>2 |}
+    { <b g' d'>8 r16 <a e'>8 r16 <d, a'>8 ~ <d a'>2 |}
   }
 }
 
@@ -55,28 +55,23 @@ stickStanzaRight = \relative c' {
   }
 }
 
-%% TODO: this is not how I play it.
 stickBLeft = \relative c {
-  <cis gis'>8 r16 <cis gis'>8 r16
-  <fis cis>4 <fis cis>8 r <fis cis> |
-  <a cis e'>8 r16 <a cis e'>8 r16
-  <e gis'>8 ~ <e gis'>2 |
-
-  <cis gis'>8 r16 <cis gis'>8 r16
-  <fis cis>4 <fis cis>8 r <cis gis'> |
-  a r16 b8 r16 e8 ~ e2 |
+  \repeat unfold 2 {
+    <cis gis'>4. <fis, cis'>4\sustainOn fis4 cis'8\sustainOff |
+  } \alternative {
+    { a,8 cis'4 e,4\sustainOn b'8 gis' e,\sustainOff |}
+    %% TODO: not happy with this
+    { cis r16 dis8 r16 e8 ~ e2 |}
+  }
 }
 
 stickBRight = \relative c' {
   <b e>8 r16 <b e>8 r16
   <ais e'>4 r8 <ais e'> r |
-  a8. ~ <a e'>8 a16
-  gis4 r8 <gis e'> r |
+  a8. ~ <a e'>8 a16 gis2 r8 |
 
-  <b e>8 r16 <b e>8 r16
-  <ais e'>4 r8 <ais e'> r |
-  <e' a>8 r16 <e a>8 r16
-  <e gis>4. r4 |
+  <b e>8 r16 <b e>8 r16 <ais e'>4 r8 <ais e'> r |
+  <e' a>8 r16 fis8 r16 <e gis>4. r4 |
 }
 
 stickTransitionLeft = \relative c, {
-- 
cgit v1.2.3