white-noise: Add fast part.

4 files changed, 134 insertions, 29 deletions

diff --git a/04-white-noise/parts/bass.ly b/04-white-noise/parts/bass.ly
index dbf9194..021f52c 100644
--- a/04-white-noise/parts/bass.ly
+++ b/04-white-noise/parts/bass.ly
@@ -35,6 +35,23 @@ bassSolo = \relative fis,, {
   b2 r8 cis4 e,8 | fis1              |
 }
 
+bassTransition = \relative fis,, {
+  \time 3/4
+  fis'8. cis d gis, | a8 gis fis r4. |
+}
+
+bassFast = \relative fis,, {
+  \time 4/4
+  fis8 e fis a4 gis8 fis e         |
+  cis cis cis gis' cis b a16 b a8  |
+  d, d d d d d d d                 |
+  cis eis b' fis' b a gis a        |
+  fis cis fis b4 a8 gis a          |
+  cis b a b a gis fis gis          |
+  d b a gis fis gis a b            |
+  gis gis gis gis cis-. r8 cis,4   |
+}
+
 bass = {
   \set Staff.midiInstrument = #"electric bass (finger)"
   \clef "bass_8"
@@ -57,22 +74,12 @@ bass = {
 
     \time 4/4 \repeat volta 2 \bassBeautyB
 
-    \repeat unfold 2 \bassSolo
-
-    %% TODO
-    %% sweet and quiet
-    %% solo
+    \bassSolo
 
-    %{
-    %% fast and weird
-    fis8 e fis a4 gis8 fis e 
-    cis cis cis gis' cis b a16 b a8 
-    d, d d d d d d d 
-    cis f b fis' b a gis a 
-    fis cis fis b4 a8 gis a 
-    cis b a b a gis fis gis 
-    d b a gis fis gis a b 
-    gis gis gis gis cis cis,4*80/960 r4*400/960 cis4
-    %}
+    \bassTransition
+    \tempo 4 = 160
+    \bassFast
+    \repeat volta 2 \bassEleven
+    \bassShifter
   }
 }
diff --git a/04-white-noise/parts/click.ly b/04-white-noise/parts/click.ly
index cdf3da4..15d53c4 100644
--- a/04-white-noise/parts/click.ly
+++ b/04-white-noise/parts/click.ly
@@ -47,14 +47,30 @@ click = \drummode {
   %% Beauty
   \time 4/4
   \repeat volta 2 {
-    bd4 hh hh hh | hh4 hh hh hh |
-    bd4 hh hh hh | hh4 hh hh hh |
+    bd4 hh sn hh | bd4 hh sn hh |
+    bd4 hh sn hh | bd4 hh sn hh |
   }
 
-  %% TODO
-  %% solo
-  %% sweet and quiet
   %% solo
+  \repeat volta 2 {
+    bd4 hh sn hh | bd4 hh sn hh |
+    bd4 hh sn hh | bd4 hh sn hh |
+  }
+
+  %% transition
+  \time 3/4
+  hh8 hh hh hh hh hh | hh8 hh hh r8 tri r |
+
+  %% fast
+  \time 4/4
+  bd4 bd bd bd |
+  bd4 bd bd bd |
+  bd4 bd bd bd |
+  bd4 bd bd bd |
+
+  bd4 bd bd bd |
+  bd4 bd bd bd |
+  bd4 bd bd bd |
+  bd4 bd bd bd |
 
-  %% april?
 }
diff --git a/04-white-noise/parts/keys.ly b/04-white-noise/parts/keys.ly
index 718c99e..d869def 100644
--- a/04-white-noise/parts/keys.ly
+++ b/04-white-noise/parts/keys.ly
@@ -49,6 +49,23 @@ keysArpeggio = \relative d' {
   fis cis gis' a gis cis, fis e
 }
 
+keysTransition = \relative c' {
+  \time 3/4
+  fis'8. cis d gis, | a8 gis fis r4. |
+}
+
+keysFast = \relative c'' {
+  \time 4/4
+  <a cis fis>1   |
+  <gis b cis e>1  |
+  <fis a d>1     |
+  <fis gis b d>2  <gis b e>  |
+  <fis a cis>1  |
+  <gis cis e>1   |
+  <a d fis>4\arpeggio <fis a d>\arpeggio <fis a> <d fis> |
+  <d f gis>2 <cis f gis cis>4 r4 |
+}
+
 keyboard = {
   \set Staff.midiInstrument = #"pad 3 (polysynth)"
   \set Staff.midiMinimumVolume = #0.4
@@ -77,6 +94,10 @@ keyboard = {
 
   \time 4/4
   \repeat volta 2 \keysIntro
-  \repeat unfold 4 \keysArpeggio
+  \repeat unfold 2 \keysArpeggio
+
+  \keysTransition
+  \tempo 4 = 160
+  \keysFast
 }
 
diff --git a/04-white-noise/parts/stick.ly b/04-white-noise/parts/stick.ly
index 6f47f34..24b551e 100644
--- a/04-white-noise/parts/stick.ly
+++ b/04-white-noise/parts/stick.ly
@@ -43,6 +43,64 @@ stickThemeRight = \relative c {
   fis4.  d   gis e8   ~ | e2 gis4 a4. r8 |
 }
 
+%% TODO
+stickBeautyBLeft = \relative c {
+  r1 | r1 | r1 | r1 |
+}
+stickBeautyBRight = \relative c {
+  %% TODO: this is terrible and I would never play this
+  <d a >2       <cis fis, >2 |
+  <gis' fis, >2 <a e, >2     |
+  d,1 | cis |
+}
+
+%% TODO
+stickSoloLeft = \relative c {
+  r1 | r1 |
+  r1 | r1 |
+  r1 | r1 |
+  r1 | r1 |
+}
+
+stickSoloRight = \relative c' {
+  \grace{a16 d} fis2 r8 gis8 a \grace{fis16} gis8 ~ |
+  gis4 e4 cis8 fis gis fis ~ |
+  fis4. r4 e8 fis b, |
+  %% TODO: bend isn't working
+  %%b\bendAfter #+2 b
+  r1 | r1 | r1 | r1 | r1 |
+
+  % %% repetition
+  % r1 | r1 |
+  % r1 | r1 |
+  % r1 | r1 |
+  % r1 | r1 |
+}
+
+%% TODO
+stickTransitionLeft = \relative fis,, {
+  \time 3/4
+  fis'8. cis d gis, | a8 gis fis r4. |
+}
+
+%% TODO
+stickTransitionRight = \relative fis {
+  \time 3/4
+  fis'8. cis d gis, | a8 gis fis r4. |
+}
+
+%% TODO
+stickFastLeft = \relative fis,, {
+  \time 4/4
+  r1 | r1 | r1 | r1 | r1 | r1 | r1 | r1 |
+}
+
+%% TODO
+stickFastRight = \relative fis {
+  \time 4/4
+  r1 | r1 | r1 | r1 | r1 | r1 | r1 | r1 |
+}
+
 stickLeft = {
   \key fis \minor
   \clef "bass_8"
@@ -52,6 +110,11 @@ stickLeft = {
   \time 4/4                 \stickThunderLeft
   \time 5/4 \repeat volta 2 \stickThemeLeft
   \time 4/4                 \stickThunderLeft
+
+  \time 4/4 \repeat volta 2 \stickBeautyBLeft
+  \stickSoloLeft
+  \stickTransitionLeft
+  \stickFastLeft
 }
 
 stickRight = {
@@ -63,12 +126,10 @@ stickRight = {
   \time 5/4 \repeat volta 2 \stickThemeRight
   \time 4/4                 \stickThunderRight
 
-  %% TODO: this is terrible and I would never play this
-  \repeat volta 2 \relative c' {
-    <d a >2 
-    <cis fis, >2 <gis' fis, >2 
-    <a e, >2 d,1 cis
-  }
+  \time 4/4 \repeat volta 2 \stickBeautyBRight
+  \stickSoloRight
+  \stickTransitionRight
+  \stickFastRight
 }
 
 stick = \new PianoStaff <<