From c3cf767f791b5a4cec59700f2ec2bdfa709894c7 Mon Sep 17 00:00:00 2001
From: rekado <rekado@elephly.net>
Date: Fri, 13 May 2016 20:06:29 +0200
Subject: song1: Increase tempo of nasty part.

...also hold longer before waltz.
---
 01-song1/01-song1.tempo | 12 +++++++-----
 01-song1/parts/bass.ly  |  6 +++++-
 01-song1/parts/click.ly |  9 ++++++++-
 01-song1/parts/keys.ly  |  7 ++++++-
 01-song1/parts/stick.ly | 14 ++++++++++++--
 5 files changed, 38 insertions(+), 10 deletions(-)

(limited to '01-song1')

diff --git a/01-song1/01-song1.tempo b/01-song1/01-song1.tempo
index a1afa49..97c15a5 100644
--- a/01-song1/01-song1.tempo
+++ b/01-song1/01-song1.tempo
@@ -37,14 +37,16 @@ a-extend2:  2 4/4 180
             6 4/4 180
             4 4/4 180
 
-pause:     4 12/8 180  X..x..x..x..
+pause:     4 12/8 185  X..x..x..x..
 
-nasty:    20 12/8 180 X..x..x..x..
+nasty:    20 12/8 185 X..x..x..x..
 # louder and more harmony
-           8 12/8 180 X..x..x..x..
+           8 12/8 185 X..x..x..x..
 # key change
-           8 12/8 180  X..x..x..x..
-            5 6/8 180  X..x..
+           8 12/8 185  X..x..x..x..
+            2 6/8 185  X..x..
+            1 9/8 185
+            2 3/4 180
 
 waltz:     15 3/4 180
 
diff --git a/01-song1/parts/bass.ly b/01-song1/parts/bass.ly
index 62ca187..3d67d23 100644
--- a/01-song1/parts/bass.ly
+++ b/01-song1/parts/bass.ly
@@ -110,7 +110,11 @@ bassNasty = \relative c, {
   fis fis fis r fis fis | fis g a b c b |
 
   e, e e r e e | e r e e fis g |
-  fis fis fis r fis fis | fis16-. r fis8 g a4. ~ | a2. |
+
+  \time 9/8
+  fis fis fis r fis fis fis16-. r fis8 g |
+  \time 3/4
+  a2. ~ | a2. |
 }
 
 %% TODO
diff --git a/01-song1/parts/click.ly b/01-song1/parts/click.ly
index 640761b..4c91b8f 100644
--- a/01-song1/parts/click.ly
+++ b/01-song1/parts/click.ly
@@ -66,6 +66,7 @@ click = \drummode {
 
   %% Nasty pause
   \time 6/8
+  \tempo 4 = 185
   <cymc wbh>4. wbl4.|
   wbl4. wbl4. |
 
@@ -121,5 +122,11 @@ click = \drummode {
   bd4. bd | bd bd |
 
   bd4. bd | bd bd |
-  bd8 bd bd r bd bd | bd16-. r bd8 bd bd4. | r2. |
+
+  \time 9/8
+  bd8 bd bd r bd bd bd16-. r bd8 bd |
+
+  \tempo 4 = 180
+  \time 3/4
+  bd2. | r2. |
 }
diff --git a/01-song1/parts/keys.ly b/01-song1/parts/keys.ly
index b2ee541..232dfed 100644
--- a/01-song1/parts/keys.ly
+++ b/01-song1/parts/keys.ly
@@ -99,7 +99,12 @@ keysNasty = \relative c' {
   <b e g> ~ | <b e g> |
   <c dis fis a> | <a c dis fis> |
   <b e g> ~ | <b e g> |
-  <c dis fis a>4 r2 | r4. <c dis fis a>4. ~ | <c dis fis a>2. |
+
+  \time 9/8
+  <c dis fis a>4 r2 r4. |
+
+  \time 3/4
+  <c dis fis a>2. ~ | <c dis fis a>2. |
 }
 
 keysWaltz = \relative c'' {
diff --git a/01-song1/parts/stick.ly b/01-song1/parts/stick.ly
index 374ad1c..c10b8c5 100644
--- a/01-song1/parts/stick.ly
+++ b/01-song1/parts/stick.ly
@@ -153,7 +153,12 @@ stickNastyLeft = \relative c {
   fis fis fis r fis fis | fis g a b, c b |
 
   e, e e r e e | e r e e fis' g |
-  fis fis fis r fis fis | fis16-. r fis8 g a4. ~ | a2. |
+
+  \time 9/8
+  fis fis fis r fis fis fis16-. r fis8 g |
+
+  \time 3/4
+  a2. ~ | a2. |
 }
 
 stickNastyRight = \relative c {
@@ -190,7 +195,12 @@ stickNastyRight = \relative c {
   a a a r a a | a b c es e es |
 
   e, e e r e e | e r e e a b |
-  a a a r a a | a16-. r a8 b c4. ~ | c2. |
+
+  \time 9/8
+  a a a r a a a16-. r a8 b |
+
+  \time 3/4
+  c2. ~ | c2. |
 }
 
 stickWaltzLeft = \relative c {
-- 
cgit v1.2.3