white noise: stick: Use PianoStaff.

1 files changed, 37 insertions, 19 deletions

diff --git a/04-white-noise/parts/stick.ly b/04-white-noise/parts/stick.ly
index 2ba1479..fed4ee2 100644
--- a/04-white-noise/parts/stick.ly
+++ b/04-white-noise/parts/stick.ly
@@ -1,5 +1,19 @@
+stickIntro = {
+  \time 4/4 { R1*8 }
+  %% silly but I have to mimick the repeats for the other voices to
+  %% make the notes line up.
+  \time 5/4 \repeat volta 2 {
+    r2. r2 | r2. r2 | r2. r2 | r2. r2 |
+    r2. r2 | r2. r2 | r2. r2 |
+  }
+  \alternative {
+    {r2. r2 | }
+    {r2. r2 | }
+  }
+}
+
 %% TODO
-stickThunder = \relative c'' {
+stickThunderRight = \relative c'' {
   a8 gis16 a8 gis16 a8 gis16 a8 gis16 a8 gis |
   a8 gis16 a8 gis16 a8 gis16 a8 gis16 a8 gis |
   a8 gis16 a8 gis16 a8 gis16 a8 gis16 a8 gis |
@@ -7,33 +21,29 @@ stickThunder = \relative c'' {
 }
 
 %% TODO
-stickTheme = \relative c {
+stickThemeRight = \relative c {
   fis'4. cis a' cis8*7 d2 
   gis,4. e d' cis8*7 a4 gis
   fis4. d gis a8*9 r4
   fis4. d gis e8*5 gis4 a4. r8
 }
 
-stick = {
-  \set Staff.midiInstrument = #"electric guitar (jazz)"
+stickLeft = {
   \key fis \minor
-  \time 4/4 { R1*8 }
-  %% silly but I have to mimick the repeats for the other voices to
-  %% make the notes line up.
-  \time 5/4 \repeat volta 2 {
-    r2. r2 | r2. r2 | r2. r2 | r2. r2 |
-    r2. r2 | r2. r2 | r2. r2 |
-  }
-  \alternative {
-    {r2. r2 | }
-    {r2. r2 | }
-  }
+  \clef "bass_8"
+  \stickIntro
+  \whiteNoise
+}
 
+stickRight = {
+  \key fis \minor
+  \stickIntro
   \whiteNoise
-  \stickThunder
-  \repeat volta 2 \stickTheme
-  \stickThunder
-  \repeat volta 2 \stickTheme
+
+  \stickThunderRight
+  \repeat volta 2 \stickThemeRight
+  \stickThunderRight
+  \repeat volta 2 \stickThemeRight
 
   %% TODO: this is terrible and I would never play this
   \repeat volta 2 \relative c' {
@@ -42,3 +52,11 @@ stick = {
     <a e, >2 d,1 cis
   }
 }
+
+stick = \new PianoStaff <<
+  \set PianoStaff.midiInstrument = #"electric guitar (jazz)"
+  \set PianoStaff.pedalSustainStyle = #'bracket
+
+  \new Staff \stickRight
+  \new Staff \stickLeft
+>>