From c3c24f9759267d8179c2af53287e4597f21ab4fe Mon Sep 17 00:00:00 2001
From: rekado <rekado@elephly.net>
Date: Wed, 23 Nov 2016 18:20:45 +0100
Subject: circus: Add bar before solo.

---
 03-circus/03-circus.tempo | 2 +-
 03-circus/music/bass.ly   | 2 +-
 03-circus/music/click.ly  | 2 +-
 03-circus/music/keys.ly   | 2 ++
 03-circus/music/stick.ly  | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

(limited to '03-circus')

diff --git a/03-circus/03-circus.tempo b/03-circus/03-circus.tempo
index 3334cf7..17106ee 100644
--- a/03-circus/03-circus.tempo
+++ b/03-circus/03-circus.tempo
@@ -12,7 +12,7 @@ slow:       2 16/8 120  xxxXxXxXxXxXxxxX
             1 16/8 120  xXxXxXxXxXxXxxxX
             1 16/8 120  xxxXxXxXxXxXxxxX
             1 12/8 120  xXxXxXxXxXxX
-            4  4/8 120  xXxX
+            5  4/8 120  xXxX
 
 solo:       3 4/8 150 xXxX
             1 6/8 150 xXxXxX
diff --git a/03-circus/music/bass.ly b/03-circus/music/bass.ly
index ce4a309..cb87df3 100644
--- a/03-circus/music/bass.ly
+++ b/03-circus/music/bass.ly
@@ -186,7 +186,7 @@ bassMusic = {
     \repeat volta 2 \bassA
     \alternative {
       { cis4-. gis-. | }
-      { cis4 gis     | cis gis | cis gis | cis gis |}
+      { r2 | cis4 gis | cis gis | cis gis | cis gis |}
     }
   }
 
diff --git a/03-circus/music/click.ly b/03-circus/music/click.ly
index 406eaf3..df88100 100644
--- a/03-circus/music/click.ly
+++ b/03-circus/music/click.ly
@@ -13,7 +13,7 @@ click = \drummode {
   }
   \alternative {
     { hh4 hh | }
-    { hh4 hh | hh hh | hh hh | hh8 hh hh hh |}
+    { hh4 hh | hh hh | hh hh | hh hh | hh8 hh hh hh |}
   }
 
   %% solo
diff --git a/03-circus/music/keys.ly b/03-circus/music/keys.ly
index f0a7e81..d555fcd 100644
--- a/03-circus/music/keys.ly
+++ b/03-circus/music/keys.ly
@@ -21,6 +21,7 @@ keyboardIntroLower = \relative c {
 }
 
 keysIntroEndUpper = \relative c' {
+  r2 |
   r8 <cis e gis>-. r <cis e gis>-. |
   r  <cis e gis>-. r <cis e gis>-. |
   r  <cis e gis>-. r <cis e gis>-. |
@@ -28,6 +29,7 @@ keysIntroEndUpper = \relative c' {
 }
 
 keysIntroEndLower = \relative c {
+  r2 |
   cis4-. gis'-. | cis,-. gis'-. |
   cis,-. gis'-. | cis,-. gis'-. |
 }
diff --git a/03-circus/music/stick.ly b/03-circus/music/stick.ly
index 2b7373f..1695383 100644
--- a/03-circus/music/stick.ly
+++ b/03-circus/music/stick.ly
@@ -318,7 +318,7 @@ stick = <<
     \repeat volta 2 \stickA
     \alternative {
       { r2 | }
-      { r2 | R2*3 }
+      { R2*5 }
     }
 
     %% solo
@@ -406,7 +406,7 @@ stick = <<
     \repeat volta 2 { R2*11 | }
     \alternative {
       { R2 | }
-      { R2*4 }
+      { R2*5 }
     }
 
     %% Solo
-- 
cgit v1.2.3