From 9692ad3350778358ca260731d3834906fe251a7b Mon Sep 17 00:00:00 2001
From: rekado <rekado@elephly.net>
Date: Wed, 4 Nov 2015 21:57:53 +0100
Subject: circus: Add drum count-in.

---
 03-circus/03-circus.ly      | 3 +++
 03-circus/parts/bass.ly     | 2 +-
 03-circus/parts/keyboard.ly | 4 ++--
 03-circus/parts/stick.ly    | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to '03-circus')

diff --git a/03-circus/03-circus.ly b/03-circus/03-circus.ly
index 8dd744c..11d2584 100644
--- a/03-circus/03-circus.ly
+++ b/03-circus/03-circus.ly
@@ -15,6 +15,9 @@ AllMusic = <<
   \new Staff = "keyboard"    { \keyboard }
   \new Staff = "bass"        { \bass }
   \new Staff = "grand stick" { \stick }
+  \new DrumStaff {
+    { \drummode { hh4 hh hh hh } }
+  }
 >>
 
 %% Two scores are needed: one with unfolded repeats for MIDI and the
diff --git a/03-circus/parts/bass.ly b/03-circus/parts/bass.ly
index 2878af6..15a665f 100644
--- a/03-circus/parts/bass.ly
+++ b/03-circus/parts/bass.ly
@@ -134,7 +134,7 @@ bass = {
 
   %% Intro
   \time 2/4
-  \relative cis, { r4 r8 cis, ~ | }
+  \relative cis, { R2 | r4 r8 cis, ~ | }
   \relative cis, {
     \repeat volta 2 \bassA
     \alternative {
diff --git a/03-circus/parts/keyboard.ly b/03-circus/parts/keyboard.ly
index 65c193d..3ac49ef 100644
--- a/03-circus/parts/keyboard.ly
+++ b/03-circus/parts/keyboard.ly
@@ -188,7 +188,7 @@ keyboard = \new PianoStaff <<
   \new Staff \relative c'  {
     \time 2/4
     \key cis \minor
-    r4 r8 <cis e g> ~ |
+    R2 | r4 r8 <cis e g> ~ |
     \repeat volta 2 \keyboardIntroUpper
     \alternative {
       { r2   | }
@@ -219,7 +219,7 @@ keyboard = \new PianoStaff <<
   \new Staff \relative c {
     \clef bass
     \key cis \minor
-    r2 |
+    r2 | r2 |
     \repeat volta 2 \keyboardIntroLower
     \alternative {
       { r2   | }
diff --git a/03-circus/parts/stick.ly b/03-circus/parts/stick.ly
index e76b374..3f70cc6 100644
--- a/03-circus/parts/stick.ly
+++ b/03-circus/parts/stick.ly
@@ -213,7 +213,7 @@ stick = \new PianoStaff <<
 
     %% intro
     \time 2/4
-    \relative c'' { r4 r8 g ~ | }
+    \relative c'' { R2 | r4 r8 g ~ | }
     \repeat volta 2 \stickA
     \alternative {
       { r2 | }
@@ -267,7 +267,7 @@ stick = \new PianoStaff <<
     \clef "bass_8"
 
     %% intro
-    \time 2/4 { R2 | }
+    \time 2/4 { R2 | R2 |}
     %% TODO: empty
     \repeat volta 2 { R2*11 | }
     \alternative {
-- 
cgit v1.2.3