white noise: end of shifter is longer.

diff --git a/04-white-noise/music/bass.ly b/04-white-noise/music/bass.ly
index b0f0567d44db786c6e322074c4f69abf98e0e41e..c9b1638cf4c8d1ee3e32a55450f0a45aaafddc4a 100644 (file)
--- a/04-white-noise/music/bass.ly
+++ b/04-white-noise/music/bass.ly
@@ -101,10 +101,8 @@ bassShifter = \relative fis,, {
   \time 4/4
   fis4 cis8 fis4 a gis8 |
   e r e8 r8 e r4. |
-
-  fis4 cis8 fis4 a gis8 |
-  \time 2/4
-  e r e8 r8 |
+  fis4 cis8 fis4 a4. |
+  gis4 e cis cis |
 }
 
 bassEnding = \relative fis,, {

diff --git a/04-white-noise/music/click.ly b/04-white-noise/music/click.ly
index d9efb9dc6d4432db6602fb78f26882e35edc6df0..3eb1c4950e9a932fc1705bc5553277c18ce061bb 100644 (file)
--- a/04-white-noise/music/click.ly
+++ b/04-white-noise/music/click.ly
@@ -88,7 +88,7 @@ click = \drummode {
   }
 
   %% shifter
-  \repeat unfold 4 {
+  \repeat unfold 3 {
     \time 4/4
     bd4 hh hh hh |
     bd4 hh hh hh |
@@ -96,6 +96,12 @@ click = \drummode {
     \time 2/4
     bd4 bd4 |
   }
+  \time 4/4
+  bd4 hh hh hh |
+  bd4 hh hh hh |
+  bd4 hh hh hh |
+  \time 4/4
+  bd4 bd4 bd4 bd4 |
 
   %% ending
   \time 4/4

diff --git a/04-white-noise/music/keys.ly b/04-white-noise/music/keys.ly
index 8d657b2eba927ec7355ccebceb1253379d204814..76076673d274d82b6a88978f8431cef93b0c5bd4 100644 (file)
--- a/04-white-noise/music/keys.ly
+++ b/04-white-noise/music/keys.ly
@@ -98,6 +98,21 @@ keysShifter = \relative c' {
   <fis, a,>4. cis'4 <cis fis,>4.    |
   \time 2/4
   <cis e,>4 <b e,>4 |
+
+  \key e \minor
+  \time 4/4
+  <g e>4. b'4 <e, b'>4.         |
+  <d b'>4 <d a'>4 d'8 r4.       |
+  <g,, e'>4. b'4 <e, b'>4.      |
+  \time 2/4
+  <d b'>4 <d a'>4 |
+
+  \key fis \minor
+  \time 4/4
+  <fis a,>4. cis'4 <cis fis,>4.    |
+  <cis e,>4 <b e,>4 e8 r4. |
+  <fis, a,>4. cis'4 <cis fis,>4.    |
+  <cis e,>4 <b e,>4 ~ <b e,>2 |
 }
 
 keysEnding = \relative c' {
@@ -151,7 +166,7 @@ keyboard = {
   \keysFast
   \keysToto
   \transpose c d {
-    \repeat unfold 2 \keysShifter
+    \keysShifter
     \keysEnding
   }
 }

diff --git a/04-white-noise/music/stick.ly b/04-white-noise/music/stick.ly
index 3cf93d89219834f688aa7c2cf76e532b09be54d3..77a3e81af219fa92502132476056c3b619d448b6 100644 (file)
--- a/04-white-noise/music/stick.ly
+++ b/04-white-noise/music/stick.ly
@@ -179,6 +179,19 @@ stickShifterLeft = \relative c {
   fis8 a' fis, a' fis, a' fis, <fis a'> |
   \time 2/4
   <e gis'> r <e gis'> r |
+
+  \time 4/4
+  e8 g' e, g' e, g' e, <e g'> |
+  <d fis'> r <d fis'> r <d fis'> r4. |
+  e8 g' e, g' e, g' e, <e g'> |
+  \time 2/4
+  <d fis'> r <d fis'> r |
+
+  \time 4/4
+  fis8 a' fis, a' fis, a' fis, <fis a'> |
+  <e gis'> r <e gis'> r <e gis'> r4.   |
+  fis8 a' fis, a' fis, a' fis, <fis a'> |
+  <e gis'> r <e gis'> r r2 |
 }
 
 %% TODO
@@ -187,6 +200,11 @@ stickShifterRight = \relative c {
   \time 2/4 R4*2
   \time 4/4 R1*3
   \time 2/4 R4*2
+
+  \time 4/4 R1*3
+  \time 2/4 R4*2
+  \time 4/4 R1*3
+  \time 4/4 R1
 }
 
 
@@ -209,7 +227,7 @@ stickLeft = {
   \transpose c d { \stickTotoLeft }
   \stickTotoLeft
   \transpose c d {
-    \repeat unfold 2 \stickShifterLeft
+    \stickShifterLeft
   }
 }
 
@@ -231,7 +249,7 @@ stickRight = {
   \transpose c d { \stickTotoRight }
   \stickTotoRight
   \transpose c d {
-    \repeat unfold 2 \stickShifterRight
+    \stickShifterRight
   }
 }