circus: New beauty part.

diff --git a/03-circus/parts/bass.ly b/03-circus/parts/bass.ly
index 02d579aefc6124c0b3317188623cfceb6d76e1af..ae8755935088c065d34c5d51fe496075ad435917 100644 (file)
--- a/03-circus/parts/bass.ly
+++ b/03-circus/parts/bass.ly
@@ -59,11 +59,49 @@ bassDance = \relative cis, {
 
 bassBeauty = \relative cis, {
   \repeat unfold 3 {
-    \time 4/4 { b,1 | }
+    \time 4/4 { b,1 |}
     %% TODO: natural harmonics
     \time 3/4 { r8 r r r r r | }
   }
-  d-. d-. d-. cis-. cis-. cis-. |
+
+  \time 4/4
+  b'4.-> a a8-> g8 ~ |
+  \time 5/8
+  g4 r8 g8 fis |
+  \time 4/4
+  e4. r4 d8 r cis |
+
+  \repeat volta 2 {
+    \time 7/8
+    b4. ~ b2 |
+    \time 3/4
+    %% TODO: natural harmonics
+    \time 3/4 { r8 r r r r r | }
+
+    \repeat unfold 2 {
+      \time 4/4 { b1 |}
+      %% TODO: natural harmonics
+      \time 3/4 { r8 r r r r r | }
+    }
+
+    \time 4/4
+    b'4.-> a a8-> g8 ~ |
+  } \alternative {
+    {
+      \relative cis, {
+        \time 5/8
+        g4 r8 g8 fis |
+        \time 4/4
+        e4. r4 d8 r cis |
+      }
+    }
+    {
+      \relative cis, {
+        \time 5/8
+        g4 r8 g8 fis |
+      }
+    }
+  }
 }
 
 bass = {
@@ -100,7 +138,7 @@ bass = {
   }
 
   %% Beauty
-  \repeat volta 2 { \bassBeauty }
+  \bassBeauty
 
   %% Arpeggio
   %% TODO

diff --git a/03-circus/parts/stick.ly b/03-circus/parts/stick.ly
index e853a1f29c922d61a0ea3315f01688d3811e81e1..e99119e90ef0fc4b94174b00e0328b983d30a194 100644 (file)
--- a/03-circus/parts/stick.ly
+++ b/03-circus/parts/stick.ly
@@ -71,7 +71,47 @@ stickBeautyLeft = \relative c, {
     g,8\sustainOff d' b'
     a, e' cis' |
   }
-  d,,-. d-. d-. cis-. cis-. cis-. |
+
+  \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 |
+
+  \repeat volta 2 {
+    \time 7/8
+    b4\sustainOn d'8 ~ d2 |
+    \time 3/4
+    g,8\sustainOff d' b'
+    a, e' cis' |
+
+    \repeat unfold 2 {
+      \time 4/4
+      b,,8\sustainOn fis' cis' d8 ~ d2 |
+      \time 3/4
+      g,8\sustainOff d' b'
+      a, e' cis' |
+    }
+
+    \time 4/4
+    <b, d'>4.-> <a cis'> <a cis'>8-> <g b'>8 ~ |
+  } \alternative {
+    {
+      \relative c, {
+        \time 5/8
+        <g' b'>4 r8 g8 fis |
+        \time 4/4
+        e4. r4 d8 r cis |
+      }
+    }
+    {
+      \relative c, {
+        \time 5/8
+        <g' b'>4 r8 g8 fis |
+      }
+    }
+  }
 }
 
 stickBeautyRight = \relative c' {
@@ -79,7 +119,24 @@ stickBeautyRight = \relative c' {
     \time 4/4 { R1 | }
     \time 3/4 { R2. | }
   }
-  { R2. | }
+  \time 4/4 { R1 |}
+  \time 5/8 R8*5 |
+  \time 4/4 R1 |
+
+  \repeat volta 2 {
+    \time 7/8 { R8*7 | }
+    \time 3/4 { R2. | }
+
+    \repeat unfold 2 {
+      \time 4/4 { R1 | }
+      \time 3/4 { R2. | }
+    }
+    \time 4/4 { R1 |}
+  } \alternative {
+    { \time 5/8 R8*5 |
+      \time 4/4 R1 | }
+    { \time 5/8 { R8*5 |} }
+  }
 }
 
 stickArpeggioLeft = \relative c, {
@@ -163,7 +220,7 @@ stick = \new PianoStaff <<
     }
 
     %% Beauty
-    \repeat volta 2 { \stickBeautyRight }
+    \stickBeautyRight
 
     %% Arpeggio
     \time 3/4 { R2. }
@@ -220,7 +277,7 @@ stick = \new PianoStaff <<
     }
 
     %% Beauty
-    \repeat volta 2 { \stickBeautyLeft }
+    \stickBeautyLeft
 
     %% Arpeggio
     \time 3/4