song 1: stick: Use more volta repeats.

1 files changed, 27 insertions, 28 deletions

diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index a5877bc..53a25df 100644
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -1,30 +1,29 @@
 \include "../../stafftab.ly"
 
 stickIntroLeft = \relative c, {
-  r8 b-1\8\f cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |
-  r8 b-1\8   cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |
-  r8 b-1\8   cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f r    |
-  e8-1\10 b'-2\11 e,-1\10 b'-2\11 dis,8-1\10 b'-2\11 dis,-1\10 b'-2\11 |
-
-  r8 b,,-1\8 cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |
-  r8 b-1\8   cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |
-  r8 b-1\8   cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f r    |
-  <e-1\10 b'-2\11>2 <dis-1\10 b'-2\11> |
+  \repeat volta 2 {
+    r8 b-1\8\f cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |
+    r8 b-1\8   cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |
+    r8 b-1\8   cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f r    |
+  } \alternative {
+    { e8-1\10 b'-2\11 e,-1\10 b'-2\11 dis,8-1\10 b'-2\11 dis,-1\10 b'-2\11 |}
+    { <e,-1\10 b'-2\11>2 <dis-1\10 b'-2\11> |}
+  }
 }
 
 stickIntroRight = \relative c {
-  \repeat unfold 3 {
-    <dis-3\5 fis-1\4 b-1\3>4 r8
-    <e-3\5 gis-1\4 cis-1\3>4 <e-3\5 gis-1\4 cis-1\3> r8 |
-  }
-  <gis-3\4 b-1\3 e-1\2>2 <dis-3\5 fis-1\4 b-1\3> |
-
-  \repeat unfold 3 {
-    <dis-3\5 fis-1\4 b-1\3>4 r8
-    <e-3\5 gis-1\4 cis-1\3>4 <e-3\5 gis-1\4 cis-1\3> r8 |
+  \repeat volta 2 {
+    \repeat unfold 3 {
+      <dis-3\5 fis-1\4 b-1\3>4 r8
+      <e-3\5 gis-1\4 cis-1\3>4 <e-3\5 gis-1\4 cis-1\3> r8 |
+    }
+  } \alternative {
+    { <gis-3\4 b-1\3 e-1\2>2 <dis-3\5 fis-1\4 b-1\3> |}
+    {
+      gis'16-1\2 a-2\2 gis8-2\2 fis-4\3 e-2\3
+      dis16-1\3 e-2\3 dis-1\3 cis-4\4 b4-2\4
+    }
   }
-  gis'16-1\2 a-2\2 gis8-2\2 fis-4\3 e-2\3
-  dis16-1\3 e-2\3 dis-1\3 cis-4\4 b4-2\4
 }
 
 stickALeft = \relative c {
@@ -291,17 +290,17 @@ stickWaltzRight = \relative c'' {
 
 stickOutroLeft = \relative c, {
   \time 4/4
-  \repeat unfold 3 { r8 b cis <cis' gis'> r q r r |}
-  <e b'>2 <dis b'> |
-  \repeat unfold 3 { r8 b cis <cis' gis'> r q r r |}
-  <e b'>2 <dis b'> |
+  \repeat volta 2 {
+    \repeat unfold 3 { r8 b cis <cis' gis'> r q r r |}
+    <e b'>2 <dis b'> |
+  }
 }
 
 stickOutroRight = \relative c' {
-  \repeat unfold 3 { <cis e>8 r r r <gis cis> r q r | }
-  <gis b e>2 <dis-3\5 fis-1\4 b-1\3> |
-  \repeat unfold 3 { <cis e>8 r r r <gis cis> r q r | }
-  <gis b e>2 <dis-3\5 fis-1\4 b-1\3> |
+  \repeat volta 2 {
+    \repeat unfold 3 { <cis e>8 r r r <gis cis> r q r | }
+    <gis b e>2 <dis-3\5 fis-1\4 b-1\3> |
+  }
 }
 
 stickEndLeft = {}