song1: shorten nasty part.

4 files changed, 34 insertions, 9 deletions

diff --git a/01-song1/parts/bass.ly b/01-song1/parts/bass.ly
index c422729..ed6457e 100644
--- a/01-song1/parts/bass.ly
+++ b/01-song1/parts/bass.ly
@@ -69,7 +69,7 @@ bassVerseHarder = \bassVerse
 bassNasty = \relative c, {
   \time 6/8
   \key cis \minor
-  \repeat unfold 2 \repeat volta 2 {
+  \repeat unfold 2 {
     R2. | R2. |
     R2. | R2. |
     R2. | R2. |
@@ -84,6 +84,11 @@ bassNasty = \relative c, {
   cis8 cis cis r cis cis | cis r cis cis cis r |
   cis cis cis r cis cis | cis r cis cis cis r |
   cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+
+  cis8 cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
   cis cis cis r cis cis | bis r bis bis bis r |
 
   \key e \minor
diff --git a/01-song1/parts/click.ly b/01-song1/parts/click.ly
index 32d5455..b9c6542 100644
--- a/01-song1/parts/click.ly
+++ b/01-song1/parts/click.ly
@@ -63,7 +63,7 @@ click = \drummode {
 
   %% Nasty
   \time 6/8
-  \repeat unfold 2 \repeat volta 2 {
+  \repeat unfold 2 {
     bd4. bd | bd bd |
     bd4. bd | bd bd |
     bd4. bd | bd bd |
@@ -80,6 +80,11 @@ click = \drummode {
   bd4. bd | bd bd |
   bd4. bd | bd bd |
 
+  <bd cymc>4. bd | bd bd |
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+
   %% key change here
   bd4. bd | bd bd |
   bd4. bd | bd bd |
diff --git a/01-song1/parts/keys.ly b/01-song1/parts/keys.ly
index da3297e..fcb1e7e 100644
--- a/01-song1/parts/keys.ly
+++ b/01-song1/parts/keys.ly
@@ -59,7 +59,7 @@ keysVerseHarder = \keysVerse
 keysNasty = \relative c' {
   \time 6/8
   \key cis \minor
-  \repeat unfold 2 \repeat volta 2 {
+  \repeat unfold 2 {
     <gis cis e>2. ~ | <gis cis e>2.   |
     <a bis dis>2.   | <a bis dis fis> |
     <gis cis e>   ~ | <gis cis e> ~   |
@@ -71,6 +71,11 @@ keysNasty = \relative c' {
     <e gis cis>   ~ | <e gis cis>     |
   }
 
+  <gis cis e>2. ~ | <gis cis e>2.   |
+  <a bis dis>2.   | <a bis dis fis> |
+  <gis cis e>   ~ | <gis cis e> ~   |
+  <gis cis e>   ~ | <gis cis e>     |
+
   <gis cis e>2. ~ | <gis cis e>     |
   <a bis dis>     | <a bis dis fis> |
   <gis cis e> ~   | <gis cis e>     |
diff --git a/01-song1/parts/stick.ly b/01-song1/parts/stick.ly
index 031498b..fe968c8 100644
--- a/01-song1/parts/stick.ly
+++ b/01-song1/parts/stick.ly
@@ -119,13 +119,19 @@ stickVerseHarderRight = \stickVerseRight
 stickNastyLeft = \relative c {
   \time 6/8
   \key cis \minor
-  \repeat volta 2 { R2.*8 | R2.*8 |}
-  \repeat volta 2 \repeat unfold 8 {
+  R2.*8 | R2.*8 |
+  \repeat unfold 8 {
     cis,8 cis' cis, r cis cis' | cis, r cis cis' cis, r |
   }
+
   cis' cis cis r cis cis | cis r cis cis cis r |
   cis cis cis r cis cis | cis r cis cis cis r |
   cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
   cis cis cis r cis cis | bis r bis bis bis r |
 
   \key e \minor
@@ -148,13 +154,17 @@ stickNastyLeft = \relative c {
 stickNastyRight = \relative c {
   \time 6/8
   \key cis \minor
-  \repeat volta 2 { R2.*8 | R2.*8 |}
-  \repeat volta 2 \repeat unfold 2 {
-    r2.*8
-  }
+  \repeat unfold 2 { R2.*8 | R2.*8 |}
+
   e8 e e r e e | e r e e e r |
   es es es r es es | fis r fis fis fis r |
   e e e r e e | e r e e e r |
+  e e e r e e | e r e e e r |
+
+  e8 e e r e e | e r e e e r |
+  es es es r es es | fis r fis fis fis r |
+
+  e e e r e e | e r e e e r |
   e e e r e e | es r es es es r |
 
   \key e \minor