song 1: stick: Use more volta repeats.

1 files changed, 47 insertions, 58 deletions

diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index b141ee6..9629982 100644
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -172,42 +172,36 @@ stickNastyLeft = \relative c {
   \time 6/8
   \key cis \minor
   R2.*8 | R2.*8 |
-  \repeat unfold 8 {
+  \repeat volta 8 {
     cis,8 cis' cis, r cis cis' | cis, r cis cis' cis, r |
   }
 
-  cis' cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | bis r bis bis bis r |
+  \repeat volta 3 {
+    cis' cis cis r cis cis | cis r cis cis cis r |
+    cis cis cis r cis cis | cis r cis cis cis r |
+    cis cis cis r cis cis | cis r cis cis cis r |
+    cis cis cis r cis cis |
+  } \alternative {
+    { cis r cis cis cis r |}
+    { bis r bis bis bis r |}
+  }
 
   \key e \minor
   b b b r b b | b r c c c r |
   c c c r c c | b r b b b r |
 
-  e, e e r e e | e r e e fis' g |
-  fis fis fis r fis fis | fis g a b, c b |
-
-  e, e e r e e | e r e e fis' g |
-  ais, ais ais r ais ais | a r a a a r |
-
-  e e e r e e | e r e e fis' g |
-  fis fis fis r fis fis | fis g a b, c b |
-
-  e, e e r e e | e r e e fis' g |
-
-  \time 9/8
-  fis fis fis r fis fis fis16-. r fis8 g |
+  \repeat volta 2 {
+    e, e e r e e | e r e e fis' g |
+    fis fis fis r fis fis | fis g a b, c b |
+
+    e, e e r e e | e r e e fis' g |
+  } \alternative {
+    { ais, ais ais r ais ais | a r a a a r |}
+    {
+      \time 9/8
+      fis fis fis r fis fis fis16-. r fis8 g |
+    }
+  }
 
   \time 3/4
   a2. ~ | a2. |
@@ -216,40 +210,35 @@ stickNastyLeft = \relative c {
 stickNastyRight = \relative c {
   \time 6/8
   \key cis \minor
-  \repeat unfold 2 { R2.*8 | R2.*8 |}
-
-  e8 e e r e e | e r e e e r |
-  es es es r es es | fis r fis fis fis r |
-  e e e r e e | e r e e e r |
-  e e e r e e | e r e e e r |
-
-  e8 e e r e e | e r e e e r |
-  es es es r es es | fis r fis fis fis r |
-  e e e r e e | e r e e e r |
-  e e e r e e | e r e e e r |
+  R2.*8 | R2.*8 |
+  \repeat volta 8 { R2.*2 |}
 
-  e8 e e r e e | e r e e e r |
-  es es es r es es | fis r fis fis fis r |
-  e e e r e e | e r e e e r |
-  e e e r e e | es r es es es r |
+  \repeat volta 3 {
+    e8 e e r e e | e r e e e r |
+    es es es r es es | fis r fis fis fis r |
+    e e e r e e | e r e e e r |
+    e e e r e e |
+  }
+  \alternative {
+    { e r e e e r |}
+    { es r es es es r |}
+  }
 
   \key e \minor
   e e e r e e | e r e e e r |
   e e e r e e | es r es es es r |
 
-  e e e r e e | e r e e a b |
-  a a a r a a | a b c es e es |
-
-  e, e e r e e | e r e e a b |
-  ais ais ais r ais ais | a r a a a r |
-
-  e e e r e e | e r e e a b |
-  a a a r a a | a b c es e es |
-
-  e, e e r e e | e r e e a b |
-
-  \time 9/8
-  a a a r a a a16-. r a8 b |
+  \repeat volta 2 {
+    e e e r e e | e r e e a b |
+    a a a r a a | a b c es e es |
+    e, e e r e e | e r e e a b |
+  } \alternative {
+    { ais ais ais r ais ais | a r a a a r |}
+    {
+      \time 9/8
+      a a a r a a a16-. r a8 b |
+    }
+  }
 
   \time 3/4
   c2. ~ | c2. |
@@ -315,7 +304,7 @@ stick = <<
     \clef "treble_8"
 
     \time 4/4
-    \repeat unfold 2 \stickIntroRight
+    \repeat volta 2 \stickIntroRight
     \repeat volta 2 \stickARight
     \stickAExtendedRight
     \stickATransitionRight
@@ -348,7 +337,7 @@ stick = <<
     \clef "bass"
 
     \time 4/4
-    \repeat unfold 2 \stickIntroLeft
+    \repeat volta 2 \stickIntroLeft
     \repeat volta 2 \stickALeft
     \stickAExtendedLeft
     \stickATransitionLeft