white noise: Play beautiful part longer.

4 files changed, 40 insertions, 11 deletions

diff --git a/04-white-noise/music/bass.ly b/04-white-noise/music/bass.ly
index 02c1ced..ee228bb 100644
--- a/04-white-noise/music/bass.ly
+++ b/04-white-noise/music/bass.ly
@@ -4,7 +4,14 @@ bassIntro = \relative fis,, {
 }
 
 bassBeauty = \relative fis,, {
-  d4. fis fis4 | e4. gis a4                  |
+  \repeat volta 2 {
+    d4. fis fis4 | e4. gis a4                  |
+    d,4. d cis4  | fis8 fis fis fis cis' b a b |
+  }
+
+  %% quiet!
+  r1 | r1 | r1 | r1 |
+  d,4. fis fis4 | e4. gis a4                 |
   d,4. d cis4  | fis8 fis fis fis cis' b a b |
 }
 
@@ -138,7 +145,7 @@ bassMusic = {
     \time 5/4 \repeat volta 2 \bassTheme
     \time 4/4                 \bassThunder
 
-    \time 4/4 \repeat volta 2 \bassBeauty
+    \time 4/4 \bassBeauty
 
     \bassSolo
 
diff --git a/04-white-noise/music/click.ly b/04-white-noise/music/click.ly
index 183790c..8dac4f8 100644
--- a/04-white-noise/music/click.ly
+++ b/04-white-noise/music/click.ly
@@ -51,9 +51,14 @@ click = \drummode {
     bd4 hh sn hh | bd4 hh sn hh |
   }
 
+  cymr4. cymr cymr4 | cymr4. cymr cymr4 |
+  hh2 hh | hh2 hh |
+  cymr4. cymr cymr4 | cymr4. cymr cymr4 |
+  hh hh hh hh | toml8\pp\< toml toml toml\!\ff sn bd tomh toml |
+
   %% solo
   \repeat volta 2 {
-    bd4 hh sn hh | bd4 hh sn hh |
+    <bd cymc>4 hh sn hh | bd4 hh sn hh |
     bd4 hh sn hh | bd4 hh sn hh |
   }
 
diff --git a/04-white-noise/music/keys.ly b/04-white-noise/music/keys.ly
index ed029d0..566bdee 100644
--- a/04-white-noise/music/keys.ly
+++ b/04-white-noise/music/keys.ly
@@ -149,6 +149,7 @@ keyboard = {
 
   \time 4/4
   \repeat volta 2 \keysBeauty
+  \repeat unfold 2 \keysBeauty
   \repeat unfold 2 \keysArpeggio
 
   \keysTransition
diff --git a/04-white-noise/music/stick.ly b/04-white-noise/music/stick.ly
index a85cb6a..a1af610 100644
--- a/04-white-noise/music/stick.ly
+++ b/04-white-noise/music/stick.ly
@@ -45,13 +45,29 @@ stickThemeRight = \relative c {
 
 %% TODO
 stickBeautyLeft = \relative c {
-  r1 | r1 | r1 | r1 |
+  \repeat volta 2 {
+    r1 | r1 | r1 | r1 |
+  }
+  \repeat unfold 2 {
+    r1 | r1 | r1 | r1 |
+  }
 }
-stickBeautyRight = \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 |
+stickBeautyRight = \relative c'' {
+  \repeat volta 2 {
+    %% TODO: too robotic
+    %% fis8 a d   e, a cis a e    |
+    %% gis b e    gis, b fis' e b |
+    %% fis a d a  fis a d a  |
+    %% gis a cis fis, ~ fis2 |
+    r2 d8 cis d a' ~ | a gis ~ gis cis, ~ cis b ~ b4 |
+    a2 r8 b8 ~ b4 | fis1 |
+  }
+
+  %% quiet!
+  \repeat unfold 2 {
+    <a cis>4. b a4 | <gis b>4. a <e gis>4 |
+    <fis a>2 ~ q4 <e gis>4 | <fis a>1 |
+  }
 }
 
 %% TODO
@@ -170,7 +186,7 @@ stickLeft = {
   \time 5/4 \repeat volta 2 \stickThemeLeft
   \time 4/4                 \stickThunderLeft
 
-  \time 4/4 \repeat volta 2 \stickBeautyLeft
+  \time 4/4 \stickBeautyLeft
   \stickSoloLeft
   \stickTransitionLeft
   \stickFastLeft
@@ -189,7 +205,7 @@ stickRight = {
   \time 5/4 \repeat volta 2 \stickThemeRight
   \time 4/4                 \stickThunderRight
 
-  \time 4/4 \repeat volta 2 \stickBeautyRight
+  \time 4/4 \stickBeautyRight
   \stickSoloRight
   \stickTransitionRight
   \stickFastRight