circus: Fix repetitions and finish tempo track.

[music/pretentious.git] / 03-circus / 03-circus.tempo

diff --git a/03-circus/03-circus.tempo b/03-circus/03-circus.tempo
index 3d4fff459bf0b07377069b6db83e294ee81c461d..3334cf7f446aa518ade6f14e382e50a176dbb2af 100644 (file)
--- 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