white noise: Play beautiful part longer.

[music/pretentious.git] / 04-white-noise / music / stick.ly

diff --git a/04-white-noise/music/stick.ly b/04-white-noise/music/stick.ly
index a85cb6a34fd380e9e6457ce62c7d56d11287edd2..a1af61002435b99cd7142195c52be3c27bde9c70 100644 (file)
--- 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