From 3c412716132b36940205d16989ffbcda2a13beed Mon Sep 17 00:00:00 2001
From: rekado <rekado@elephly.net>
Date: Sun, 29 May 2016 10:30:50 +0200
Subject: circus: stick: Fix ending.

---
 03-circus/parts/stick.ly | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to '03-circus/parts/stick.ly')

diff --git a/03-circus/parts/stick.ly b/03-circus/parts/stick.ly
index 4ea8c18..628c1b7 100644
--- a/03-circus/parts/stick.ly
+++ b/03-circus/parts/stick.ly
@@ -273,9 +273,17 @@ stickDramaLeft = \relative c, {
     <b fis' d'>2 r4
     b8 fis' cis' d4. ~ | d2. ~ | d2. |
   }
+}
+stickDramaEndingLeft = \relative c {
   <a e' cis'>2.\arpeggio ~ | <a e' cis'>2. ~ | <a e' cis'>2. ~ | <a e' cis'>2. |
   <e b' gis'>2.\arpeggio ~ | <e b' gis'>2. ~ | <e b' gis'>2. ~ | <e b' gis'>2. |
 }
+stickFinalLeft = \relative c {
+  <a e' cis'>2.\arpeggio ~ | <a e' cis'>2. ~ | <a e' cis'>2. ~ | <a e' cis'>2. |
+  <e b' gis'>2.\arpeggio  | cis2. | <d a' fis'>2. ~ | <d a' fis'>2. ~ |
+  <d a' fis'>2. ~ | <d a' fis'>2. |
+}
+
 stickDramaRight = \relative c' {
   \key cis \minor
   \time 3/4
@@ -283,28 +291,16 @@ stickDramaRight = \relative c' {
     cis2 b4 | cis2 b4 | cis2 b4 | cis4 d cis |
     b fis2 ~ | fis2. ~ | fis2. ~ | fis2. |
   }
-  cis'2. ~ cis2. ~ cis2. b2 a4
-  gis2. ~ gis2. ~ gis2. ~ gis2.
 }
 
-stickFinalLeft = \relative c, {
-  \time 5/4
-  d8\sustainOn a' fis'1
-  fis,8\sustainOff\sustainOn cis' a'1
-  e,8\sustainOff\sustainOn b' gis'1
-  r8\sustainOff r d,1
+stickDramaEndingRight = \relative c {
+  cis'2. ~ cis2. ~ cis2. b2 a4
+  gis2. ~ gis2. ~ gis2. ~ gis2.
 }
-
-%% TODO
-stickFinalRight = \transpose g d \relative c' {
-  \time 5/4
-  g'4.\sustainOff fis8 e4 cis16 e fis8 g4 |
-  fis4. e16 d b4
-  \tuplet 3/2 { fis8 b d }
-  fis4 |
-
-  e2.   ~ e2   |
-  d8 cis bes1 |
+stickFinalRight = \relative c {
+  cis'2. ~ | cis2. ~ | cis2.   | b2 a4   |
+  gis2.    | a2.     | fis2. ~ | fis2. ~ |
+  fis2. ~ | fis2. |
 }
 
 stick = \new PianoStaff <<
@@ -384,11 +380,13 @@ stick = \new PianoStaff <<
     \key fis \minor
     \transpose c d { \stickArpeggioRightHigher }
     \stickDramaRight
+    \stickDramaEndingRight
 
     \stickArpeggioRightLonger
     \key fis \minor
     \transpose c d { \stickArpeggioRightHigher }
     \stickDramaRight
+    \stickFinalRight
   }
 
   %% staff for left hand side
@@ -443,10 +441,12 @@ stick = \new PianoStaff <<
     \key fis \minor
     \transpose c d { \stickArpeggioLeftHigher }
     \stickDramaLeft
+    \stickDramaEndingLeft
 
     \stickArpeggioLeftLonger
     \key fis \minor
     \transpose c d { \stickArpeggioLeftHigher }
     \stickDramaLeft
+    \stickFinalLeft
   }
 >>
-- 
cgit v1.2.3