circus: Fix repetitions and finish tempo track.

4 files changed, 229 insertions, 137 deletions

diff --git a/03-circus/03-circus.tempo b/03-circus/03-circus.tempo
index 3d4fff4..3334cf7 100644
--- a/03-circus/03-circus.tempo
+++ b/03-circus/03-circus.tempo
@@ -14,54 +14,42 @@ slow:       2 16/8 120  xxxXxXxXxXxXxxxX
             1 12/8 120  xXxXxXxXxXxX
             4  4/8 120  xXxX
 
-solo:       3 2/4 150 xX
-            1 3/4 150 xXx
-            3 2/4 150 xX
-            1 4/4 150 xXxX
+solo:       3 4/8 150 xXxX
+            1 6/8 150 xXxXxX
+            3 4/8 150 xXxX
+            1 8/8 150 xXxXxXxX
 
-            3 2/4 150 xX
-            1 3/4 150 xXx
-            3 2/4 150 xX
-            1 4/4 150 xXxX
+            3 4/8 150 xXxX
+            1 6/8 150 xXxXxX
+            3 4/8 150 xXxX
+            1 8/8 150 xXxXxXxX
 
 # Key change to F# minor
 
-spooky:     3 2/4 150 xX
-            1 3/4 150 xXx
-            3 2/4 150 xX
-            1 4/4 150 xXxX
+spooky:     3 4/8 150 xXxX
+            1 6/8 150 xXxXxX
+            3 4/8 150 xXxX
+            1 8/8 150 xXxXxXxX
 
-            3 2/4 150 xX
-            1 3/4 150 xXx
-            3 2/4 150 xX
-            1 4/4 150 xXxX
+            3 4/8 150 xXxX
+            1 6/8 150 xXxXxX
+            3 4/8 150 xXxX
+            1 8/8 150 xXxXxXxX
 
 # Key change to B minor
 # The drums play half time feel.
 
-keyboard:   3 2/4 150
-            1 1/4 150
-            1 4/8 150
-            3 2/4 150
-            1 8/8 150
-
-            3 2/4 150
-            1 1/4 150
-            1 4/8 150
-            3 2/4 150
-            1 8/8 150
-
-            3 2/4 150
-            1 1/4 150
-            1 4/8 150
-            3 2/4 150
-            1 8/8 150
+half:       3 2/4 150 Xx
+            1 2/8 150 Xx
+            1 4/8 150 xxxx
+            3 2/4 150 Xx
+            1 8/8 150 X.x.X.x.
 
-            3 2/4 150
-            1 1/4 150
-            1 4/8 150
-            3 2/4 150
-            1 8/8 150
+            3 2/4 150 Xx
+            1 2/8 150 Xx
+            1 4/8 150 xxxx
+            3 2/4 150 Xx
+            1 8/8 150 X.x.X.x.
 
 weird:      2 2/4 150
             1 2/8 150
@@ -87,29 +75,17 @@ ballet:     1 3/4 150
 
 # Repeat the previous section
 
-keyboard:   3 2/4 150
-            1 1/4 150
-            1 4/8 150
-            3 2/4 150
-            1 8/8 150
-
-            3 2/4 150
-            1 1/4 150
-            1 4/8 150
-            3 2/4 150
-            1 8/8 150
-
-            3 2/4 150
-            1 1/4 150
-            1 4/8 150
-            3 2/4 150
-            1 8/8 150
+half:       3 2/4 150 Xx
+            1 2/8 150 Xx
+            1 4/8 150 xxxx
+            3 2/4 150 Xx
+            1 8/8 150 X.x.X.x.
 
-            3 2/4 150
-            1 1/4 150
-            1 4/8 150
-            3 2/4 150
-            1 8/8 150
+            3 2/4 150 Xx
+            1 2/8 150 Xx
+            1 4/8 150 xxxx
+            3 2/4 150 Xx
+            1 8/8 150 X.x.X.x.
 
 weird:      2 2/4 150
             1 2/8 150
@@ -133,7 +109,6 @@ ballet:     1 3/4 150
             1 2/4 150
             1 1/4 150
 
-
 # Not sure about the arrangement here:
 
 beautiful:  1 4/4 150
@@ -143,9 +118,8 @@ beautiful:  1 4/4 150
 
             1 4/4 150
             1 3/4 150
-            1 4/4 150
             1 3/4 150
-            1 6/8 150
+            2 4/4 150
 
 repeat1:    1 4/4 150
             1 3/4 150
@@ -154,9 +128,8 @@ repeat1:    1 4/4 150
 
             1 4/4 150
             1 3/4 150
-            1 4/4 150
             1 3/4 150
-            1 6/8 150
+            2 4/4 150
 
 repeat2:    1 4/4 150
             1 3/4 150
@@ -165,17 +138,31 @@ repeat2:    1 4/4 150
 
             1 4/4 150
             1 3/4 150
-            1 4/4 150
             1 3/4 150
-            1 6/8 150
+            1 4/4 150
+
+pause:      4 3/4 170
+
+arp:        4 3/4 170
+            4 3/4 170
+            4 3/4 170
+            4 3/4 170
+
+            4 3/4 170
+            4 3/4 170
 
-final:      3 4/4 150
-            1 7/8 150
+drama:      8 3/4 170
+            8 3/4 170
+            8 3/4 170
 
-            3 4/4 150
-            1 7/8 150
+arp2:       4 3/4 170
+            5 3/4 170
+            4 3/4 170
+            4 3/4 170
 
-            3 4/4 150
-            1 7/8 150
+            4 3/4 170
+            4 3/4 170
 
-# TODO: the ending hasn't been written yet!
+drama2:     8 3/4 170
+            8 3/4 170
+            5 3/4 170
diff --git a/03-circus/parts/bass.ly b/03-circus/parts/bass.ly
index 2232faa..d30b2e9 100644
--- a/03-circus/parts/bass.ly
+++ b/03-circus/parts/bass.ly
@@ -79,10 +79,10 @@ bassBeauty = \relative cis, {
 
   \time 4/4
   b'4.->\sustainOff a a8-> g8 ~ |
-  \time 5/8
-  g4 r8 g8 fis |
-  \time 4/4
-  e4. r4 d8 r cis |
+  \time 6/8
+  g4. r8 g8 fis |
+  \time 9/8
+  e2 r4 d8 r cis |
 
   \repeat volta 2 {
     \time 7/8
@@ -111,16 +111,16 @@ bassBeauty = \relative cis, {
   } \alternative {
     {
       \relative cis, {
-        \time 5/8
-        g4 r8 g8 fis |
-        \time 4/4
-        e4. r4 d8 r cis |
+        \time 6/8
+        g4. r8 g8 fis |
+        \time 9/8
+        e2 r4 d8 r cis |
       }
     }
     {
       \relative cis, {
-        \time 5/8
-        g4 r8 g8 fis |
+        \time 6/8
+        g4. r8 g8 fis |
       }
     }
   }
diff --git a/03-circus/parts/keyboard.ly b/03-circus/parts/keyboard.ly
index 91048e0..1500866 100644
--- a/03-circus/parts/keyboard.ly
+++ b/03-circus/parts/keyboard.ly
@@ -141,10 +141,10 @@ keysBeautyUpper = \relative c' {
 
   \time 4/4
   b'4.-> a a8-> g8 ~ |
-  \time 5/8
-  g4 r8 g8 fis |
-  \time 4/4
-  e4. r4 d8 r cis |
+  \time 6/8
+  g4. r8 g8 fis |
+  \time 9/8
+  e2 r4 d8 r cis |
 
   \repeat volta 2 {
     \time 7/8 { r8*7 |}
@@ -157,9 +157,9 @@ keysBeautyUpper = \relative c' {
     \time 4/4
     b'4.-> a a8-> g8 ~ |
   } \alternative {
-    { \time 5/8 g4 r8 g8 fis |
-      \time 4/4 e4. r4 d8 r cis |}
-    { \time 5/8 g'4 r8 g8 fis |}
+    { \time 6/8 g4. r8 g8 fis |
+      \time 9/8 e2 r4 d8 r cis |}
+    { \time 6/8 g'4. r8 g8 fis |}
   }
 }
 
@@ -169,8 +169,8 @@ keysBeautyLower = \relative c {
     \time 3/4 { d4. cis | }
   }
   \time 4/4 { R1 |}
-  \time 5/8 R8*5 |
-  \time 4/4 R1 |
+  \time 6/8 R8*6 |
+  \time 9/8 R8*9 |
 
   \repeat volta 2 {
     \time 7/8 { b8*7 | }
@@ -182,9 +182,9 @@ keysBeautyLower = \relative c {
     }
     \time 4/4 { R1 |}
   } \alternative {
-    { \time 5/8 R8*5 |
-      \time 4/4 R1 | }
-    { \time 5/8 { R8*5 |} }
+    { \time 6/8 R8*6 |
+      \time 9/8 R8*9 | }
+    { \time 6/8 { R8*6 |} }
   }
 }
 
diff --git a/03-circus/parts/stick.ly b/03-circus/parts/stick.ly
index e33d9ab..4ea8c18 100644
--- a/03-circus/parts/stick.ly
+++ b/03-circus/parts/stick.ly
@@ -73,10 +73,10 @@ stickBeautyLeft = \relative c, {
 
   \time 4/4
   <b, d'>4.-> <a cis'> <a cis'>8-> <g b'>8 ~ |
-  \time 5/8
-  <g b'>4 r8 g8 fis |
-  \time 4/4
-  e4. r4 d8 r cis |
+  \time 6/8
+  <g b'>4. r8 g8 fis |
+  \time 9/8
+  e2 r4 d8 r cis |
 
   \repeat volta 2 {
     \time 7/8
@@ -98,16 +98,16 @@ stickBeautyLeft = \relative c, {
   } \alternative {
     {
       \relative c, {
-        \time 5/8
-        <g' b'>4 r8 g8 fis |
-        \time 4/4
-        e4. r4 d8 r cis |
+        \time 6/8
+        <g' b'>4. r8 g8 fis |
+        \time 9/8
+        e2 r4 d8 r cis |
       }
     }
     {
       \relative c, {
-        \time 5/8
-        <g' b'>4 r8 g8 fis |
+        \time 6/8
+        <g' b'>4. r8 g8 fis |
       }
     }
   }
@@ -119,8 +119,8 @@ stickBeautyRight = \relative c' {
     \time 3/4 { R2. | }
   }
   \time 4/4 { R1 |}
-  \time 5/8 R8*5 |
-  \time 4/4 R1 |
+  \time 6/8 R8*6 |
+  \time 9/8 R8*9 |
 
   \repeat volta 2 {
     \time 7/8 { R8*7 | }
@@ -132,13 +132,67 @@ stickBeautyRight = \relative c' {
     }
     \time 4/4 { R1 |}
   } \alternative {
-    { \time 5/8 R8*5 |
-      \time 4/4 R1 | }
-    { \time 5/8 { R8*5 |} }
+    { \time 6/8 R8*6 |
+      \time 9/8 R8*9 | }
+    { \time 6/8 { R8*6 |} }
   }
 }
 
+
+stickBeforeArpeggioLeft = \relative c, {
+  \time 3/4
+  e2. ~ | e2. ~ | e2. ~ | e2. |
+}
+
 stickArpeggioLeft = \relative c, {
+  e8\sustainOn b' g' ~ g4. |
+  e,8 b' g' ~ g4. |
+  e,4. g'4. | r2. |
+
+  d,8\sustainOff\sustainOn a' fis' ~ fis4.
+  d,8 a' fis' ~ fis4.
+  d,2. ~ d2.
+
+  %% repeat, but with more pathos!
+  e8\sustainOn b' g' ~ g4. |
+  e,8 b' g' ~ g4. |
+  e,8 b' g' ~ g4. |
+  e,8 b' g' ~ g4. |
+
+  d,8\sustainOff\sustainOn a' fis' ~ fis4.
+  d,8\sustainOff\sustainOn a' fis' ~ fis4.
+  d,8\sustainOff\sustainOn a' fis' ~ fis4.
+  d,8\sustainOff\sustainOn a' fis' ~ fis4.
+}
+
+stickBeforeArpeggioRight = \relative c' {
+  \time 3/4
+  r2. ~ | r2. ~ | r2. ~ | r2. |
+}
+
+stickArpeggioRight = \relative c' {
+  \time 3/4
+  r4.\sustainOn d,8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  d4 b' fis ~ | fis2.
+
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r2. r2.
+
+  %% repeat, but with more pathos!
+  r4.\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+}
+
+stickArpeggioLeftHigher = \relative c, {
   \time 3/4
   e8\sustainOn b' g' ~ g4.
   e,8 b' g' ~ g4.
@@ -151,23 +205,73 @@ stickArpeggioLeft = \relative c, {
   d,8 a' fis' ~ fis4.\sustainOff
 }
 
-stickArpeggioRight = \relative c' {
+stickArpeggioRightHigher = \relative c' {
   \time 3/4
-  \repeat unfold 8 {
-    r4.\sustainOn d,8 b' fis
-  }
+  r4.\sustainOff\sustainOn d,8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis\sustainOff
 }
 
+stickArpeggioRightLonger = \relative c' {
+  \time 3/4
+  r4.\sustainOn d,8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  d4 b' fis ~ | fis2.
+
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r2. r2. r2.
+
+  %% repeat, but with more pathos!
+  r4.\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+  r4.\sustainOff\sustainOn d8 b' fis
+}
+
+stickArpeggioLeftLonger = \relative c, {
+  e8\sustainOn b' g' ~ g4. |
+  e,8 b' g' ~ g4. |
+  e,4. g'4. | r2. |
+
+  d,8\sustainOff\sustainOn a' fis' ~ fis4.
+  d,8 a' fis' ~ fis4.
+  d,2. ~ d2. ~ d2.
+
+  %% repeat, but with more pathos!
+  e8\sustainOn b' g' ~ g4. |
+  e,8 b' g' ~ g4. |
+  e,8 b' g' ~ g4. |
+  e,8 b' g' ~ g4. |
+
+  d,8\sustainOff\sustainOn a' fis' ~ fis4.
+  d,8\sustainOff\sustainOn a' fis' ~ fis4.
+  d,8\sustainOff\sustainOn a' fis' ~ fis4.
+  d,8\sustainOff\sustainOn a' fis' ~ fis4.
+}
+
+
 stickDramaLeft = \relative c, {
   \key b \minor
   \time 3/4
   \repeat unfold 2 {
-    <e b' g'>2\sustainOff r4
+    <e b' g'>2 r4
     <e b' g'>2 r4
     <e b' g'>2 r4
     <e b' g'>2 r4
     <b fis' d'>2 r4
-    b8 fis' cis' d4.
+    b8 fis' cis' d4. ~ | d2. ~ | d2. |
   }
   <a e' cis'>2.\arpeggio ~ | <a e' cis'>2. ~ | <a e' cis'>2. ~ | <a e' cis'>2. |
   <e b' gis'>2.\arpeggio ~ | <e b' gis'>2. ~ | <e b' gis'>2. ~ | <e b' gis'>2. |
@@ -176,8 +280,8 @@ stickDramaRight = \relative c' {
   \key cis \minor
   \time 3/4
   \repeat unfold 2 {
-    cis2\sustainOff b4 | cis2 b4 | cis2 b4 | cis4 d cis |
-    b fis2 ~ | fis2. |
+    cis2 b4 | cis2 b4 | cis2 b4 | cis4 d cis |
+    b fis2 ~ | fis2. ~ | fis2. ~ | fis2. |
   }
   cis'2. ~ cis2. ~ cis2. b2 a4
   gis2. ~ gis2. ~ gis2. ~ gis2.
@@ -272,18 +376,19 @@ stick = \new PianoStaff <<
     \stickBeautyRight
 
     %% Arpeggio
+    \tempo 4 = 170
     \key e \minor
+    \stickBeforeArpeggioRight
+
     \stickArpeggioRight
+    \key fis \minor
+    \transpose c d { \stickArpeggioRightHigher }
+    \stickDramaRight
 
-    \repeat volta 2 {
-      \stickArpeggioRight
-      \stickArpeggioRight
-      \key fis \minor
-      \transpose c d { \stickArpeggioRight }
-    } \alternative {
-      { \stickDramaRight }
-      { \stickFinalRight }
-    }
+    \stickArpeggioRightLonger
+    \key fis \minor
+    \transpose c d { \stickArpeggioRightHigher }
+    \stickDramaRight
   }
 
   %% staff for left hand side
@@ -332,16 +437,16 @@ stick = \new PianoStaff <<
 
     %% Arpeggio
     \key e \minor
+    \stickBeforeArpeggioLeft
+
     \stickArpeggioLeft
+    \key fis \minor
+    \transpose c d { \stickArpeggioLeftHigher }
+    \stickDramaLeft
 
-    \repeat volta 2 {
-      \stickArpeggioLeft
-      \stickArpeggioLeft
-      \key fis \minor
-      \transpose c d { \stickArpeggioLeft }
-    } \alternative {
-      { \stickDramaLeft }
-      { \stickFinalLeft }
-    }
+    \stickArpeggioLeftLonger
+    \key fis \minor
+    \transpose c d { \stickArpeggioLeftHigher }
+    \stickDramaLeft
   }
 >>