From c37f087a090e7565f44d44f788b443210d2cff4e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Tue, 3 Jan 2017 22:52:49 +0100
Subject: white noise: stick: Fix solo.

---
 04-white-noise/music/stick.ly | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

(limited to '04-white-noise')

diff --git a/04-white-noise/music/stick.ly b/04-white-noise/music/stick.ly
index c7aec7b..e663214 100644
--- a/04-white-noise/music/stick.ly
+++ b/04-white-noise/music/stick.ly
@@ -78,18 +78,34 @@ stickSoloLeft = \relative c {
   r1 | r1 |
 }
 
-stickSoloRight = \relative c' {
+stickSoloRight = \relative c'' {
   \grace{a16 d} fis2 r8 gis8 a \grace{fis16} gis8 ~ |
   gis4 e4 cis8 fis gis fis ~ |
-  fis4. r4 e8 fis \grace{b,16} cis8 ~ |
+  fis4. r4 e8\2-1 fis\2-2 \grace{b,16} cis8\3-1 ~ |
   %% bending isn't working in MIDI :(
   %%b\bendAfter #+2 b
-  cis b a16 gis fis e fis8
-  a16 b cis d e f |
-  fis4. r4 gis8 a e' ~ |
-  e fis4 cis4. r8 b16 cis |
-  %% TODO
-  d2 cis4. b8 | cis1 |
+  cis b\3-1 a16\4-3 gis\4-2 fis\4-1 e\5-3 fis8\4-1
+  a16\4-3 b\3-1 cis\3-2 d\3-3 e\2-1 f\2-2 |
+  fis4.\2-3 r4 gis,8\4-2 a\4-3 e'\2-1 ~ |
+  e fis4\2-3 cis4.\3-2 r8 b16-1 cis-2 |
+
+  d8-3
+  \tuplet 3/2 {
+    \change Staff = "stick left"
+    gis,16\10-1 b\10-4
+    \change Staff = "stick right"
+    e-3
+  } gis16-2 r16
+  \tuplet 3/2 {
+    \change Staff = "stick left"
+    a,16\10-1
+    \change Staff = "stick right"
+    cis fis
+  } a4 b8
+  \tuplet 3/2 {
+    cis,16 fis a
+  }
+  | cis4. fis,8 fis'2 |
 }
 
 %% TODO
-- 
cgit v1.2.3