circus: stick: split into left and right hand.

... and align repeats with bass.

1 files changed, 152 insertions, 28 deletions

diff --git a/03-circus/parts/stick.ly b/03-circus/parts/stick.ly
index e2b7720..6e2b1b6 100644
--- a/03-circus/parts/stick.ly
+++ b/03-circus/parts/stick.ly
@@ -23,7 +23,7 @@ stickHalfTimeFeel = \relative c' {
 }
 
 stickWeird = \relative c' {
-  \repeat unfold 2 {
+  \repeat volta 2 {
     \time 5/4 {g4. fis16 g cis8 d r g, fis fis, |}
     \time 9/8 {cis''4. b16 fis a8 b2 | }
   } \alternative {
@@ -32,6 +32,17 @@ stickWeird = \relative c' {
   }
 }
 
+%% TODO
+stickWeirdLeft = \relative c, {
+  \repeat volta 2 {
+    \time 5/4 { r2. r2 |}
+    \time 9/8 { r1 r8 | }
+  } \alternative {
+    { r1 r8 |}
+    { r1 r8 |}
+  }
+}
+
 stickDance = \relative c' {
   \time 5/4
   g'4. fis16 dis e4
@@ -45,38 +56,151 @@ stickDance = \relative c' {
   d' cis ais4 r4
 }
 
-stick = {
-  \set Staff.midiInstrument = #"clav"
-  \key cis \minor
-  \clef "treble_8"
+%% TODO
+stickDanceLeft = \relative c, {
+  \time 5/4 { r2. r2 | r2. r2 | }
+  \time 3/4 { r2. | r2. | }
+}
+
 
-  %% intro
-  \time 2/4
-  \relative c'' { r4 r8 g ~ | }
-  \repeat volta 2 \stickA
-  \alternative {
-    { r2 | }
-    { r2 | R2*3 }
+stickBeautyLeft = \relative c, {
+  \repeat unfold 3 {
+    \time 4/4
+    b8\sustainOn fis' cis' d8 ~ d2 |
+    \time 3/4
+    g,8\sustainOff d' b'
+    a, e' cis' |
   }
+  d,,-. d-. d-. cis-. cis-. cis-. |
+}
 
-  %% TODO solo
-  \repeat unfold 2 {
-    \time 2/4 R2*3
-    \time 3/4 R2.
-    \time 2/4 R2*5
+stickBeautyRight = \relative c' {
+  \repeat unfold 3 {
+    \time 4/4 { R1 | }
+    \time 3/4 { R2. | }
   }
+  { R2. | }
+}
 
-  %% TODO spooky
-  \key fis \minor
-  \repeat volta 2 {
-    \time 2/4 R2*3
-    \time 3/4 R2.
-    \time 2/4 R2*5
+stickArpeggioLeft = \relative c, {
+  \time 3/4
+  \repeat unfold 4 {
+    e8\sustainOn b' g' r4.
+  }
+  \repeat unfold 4 {
+    d,8\sustainOn a' fis' r4.
   }
+}
 
-  \key b \minor
-  \stickHalfTimeFeel
-  \stickHalfTimeFeel
-  \stickWeird
-  \stickDance
+stickArpeggioRight = \relative c' {
+  \time 3/4
+  \repeat unfold 8 {
+    r4. b8\sustainOn fis d
+  }
 }
+
+stickEndLeft = \relative c, {
+  <d, a' fis'>4
+}
+
+stick = \new PianoStaff <<
+  \set PianoStaff.midiInstrument = #"clav"
+  \set PianoStaff.pedalSustainStyle = #'bracket
+
+  \new Staff \relative c'  {
+    \key cis \minor
+    \clef "treble_8"
+
+    %% intro
+    \time 2/4
+    \relative c'' { r4 r8 g ~ | }
+    \repeat volta 2 \stickA
+    \alternative {
+      { r2 | }
+      { r2 | R2*3 }
+    }
+
+    %% TODO solo
+    \repeat unfold 2 {
+      \time 2/4 R2*3
+      \time 3/4 R2.
+      \time 2/4 R2*5
+    }
+
+    %% TODO spooky
+    \key fis \minor
+    \repeat volta 2 {
+      \time 2/4 R2*3
+      \time 3/4 R2.
+      \time 2/4 R2*5
+    }
+
+    %% Half time feel
+    \key b \minor
+    \repeat volta 2 {
+      \repeat volta 2 \stickHalfTimeFeel
+      \stickWeird
+      \stickDance
+    }
+
+    \repeat volta 2 { \stickBeautyRight }
+    \time 3/4 { R2. }
+    \key e \minor
+    \stickArpeggioRight
+    \transpose c d { \stickArpeggioRight }
+    \stickArpeggioRight
+    \transpose c d { \stickArpeggioRight }
+  }
+
+  %% staff for left hand side
+  \new Staff \relative c  {
+    \key cis \minor
+    \clef "bass_8"
+
+    %% intro
+    \time 2/4 { R2 | }
+    %% TODO: empty
+    \repeat volta 2 { R2*11 | }
+    \alternative {
+      { R2 | }
+      { R2*4 }
+    }
+
+    %% Solo
+    \repeat unfold 2 {
+      \time 2/4 R2*3
+      \time 3/4 R2.
+      \time 2/4 R2*5
+    }
+
+    %% Spooky
+    \key fis \minor
+    \repeat volta 2 {
+      \time 2/4 R2*3
+      \time 3/4 R2.
+      \time 2/4 R2*5
+    }
+
+    %% Half time feel
+    \key b \minor
+    \repeat volta 2 {
+      \repeat volta 2 {
+        \time 2/4 { R2*3 }
+        \time 3/4 { R2.  }
+        \time 2/4 { R2*5 }
+      }
+      \stickWeirdLeft
+      \stickDanceLeft
+    }
+
+    \repeat volta 2 { \stickBeautyLeft }
+
+    \time 3/4
+    \relative c, { r4 fis8 g fis-. r8 }
+    \key e \minor
+    \stickArpeggioLeft
+    \transpose c d { \stickArpeggioLeft }
+    \stickArpeggioLeft
+    \transpose c d { \stickArpeggioLeft }
+  }
+>>