From 7373d36392b382610929575ecd18ac08bcba7103 Mon Sep 17 00:00:00 2001
From: rekado <rekado@elephly.net>
Date: Wed, 21 Oct 2015 16:05:42 +0200
Subject: circus: keys: Align intro repeats with bass.

---
 03-circus/parts/keyboard.ly | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to '03-circus/parts')

diff --git a/03-circus/parts/keyboard.ly b/03-circus/parts/keyboard.ly
index f720ebc..5936bce 100644
--- a/03-circus/parts/keyboard.ly
+++ b/03-circus/parts/keyboard.ly
@@ -9,7 +9,6 @@ keyboardIntroUpper = \relative c' {
 
   <dis fis ais>8 r r <d fis ais>8 ~ <d fis ais>2 |
   <dis fis ais>8 r r <d fis ais>8 ~ <d fis ais>2 |
-  r2 |
 }
 
 keyboardIntroLower = \relative c {
@@ -19,7 +18,18 @@ keyboardIntroLower = \relative c {
   cis-. gis-.
   dis8 r r d ~ d2 |
   dis8 r r d ~ d2 |
-  r2 |
+}
+
+keysIntroEndUpper = \relative c' {
+  r8 <cis e gis>-. r <cis e gis>-. |
+  r  <cis e gis>-. r <cis e gis>-. |
+  r  <cis e gis>-. r <cis e gis>-. |
+  r  <cis e gis>-. r <cis e gis>-. |
+}
+
+keysIntroEndLower = \relative c {
+  cis4-. gis-. | cis-. gis-. |
+  cis-.  gis-. | cis-. gis-. |
 }
 
 keyboard = \new PianoStaff <<
@@ -28,15 +38,21 @@ keyboard = \new PianoStaff <<
     \time 2/4
     \key cis \minor
     r4 r8 <cis e g> ~ |
-    \keyboardIntroUpper
-    \keyboardIntroUpper
+    \repeat volta 2 \keyboardIntroUpper
+    \alternative {
+      { r2   | }
+      { \keysIntroEndUpper }
+    }
   }
 
   \new Staff \relative c {
     \clef bass
     \key cis \minor
     r2 |
-    \keyboardIntroLower
-    \keyboardIntroLower
+    \repeat volta 2 \keyboardIntroLower
+    \alternative {
+      { r2   | }
+      { \keysIntroEndLower }
+    }
   }
 >>
-- 
cgit v1.2.3