From 89f33292cf05448bbd7ae2ff7ef2d3c0da6b97be Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 27 Feb 2017 19:18:26 +0100
Subject: song 2: stick: Use volta repeats.

---
 02-song2/music/stick.ly | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
index adfcfb8..512b937 100644
--- a/02-song2/music/stick.ly
+++ b/02-song2/music/stick.ly
@@ -5,7 +5,7 @@ stickBreak = \unfoldRepeats \guitar
 
 stickRepriseLeft = \relative c, {
   \time 4/4
-  \repeat unfold 3 {
+  \repeat volta 3 {
     <fis cis'>8 r16 <b fis'>16 r16 <fis cis'> <fis dis' a'>8 ~
     <fis dis' a'>8 fis <dis' a'> fis, <f d' a'> r16 <f d' a'>8 r16 <fis cis' a'>8 ~
     <fis cis' a'>2 |
@@ -20,14 +20,23 @@ stickRepriseLeft = \relative c, {
 
 stickRepriseRight = \relative c' {
   \time 4/4
-  \repeat unfold 3 {
+  \repeat volta 3 {
     r8 <a cis fis>16-. r r r <a cis fis>8 ~
     <a cis fis>4 ~ <a cis fis>4
     <f' a d>8 r16 <f a d>8 r16 <fis gis cis>8 ~ <fis a cis>2 |
-
-    r8 <a, cis fis>16-. r r r <dis fis b>8 ~
-    <dis fis b>4 ~ <dis fis b>4
-    <a d f>8 r16 <a d f>8 r16 <a cis fis>4. ~ <a cis fis>4 |
+  } \alternative {
+    {
+      r8 <a, cis fis>16-. r r r <dis fis b>8 ~
+      <dis fis b>4 ~ <dis fis b>4
+      <a d f>8 r16 <a d f>8 r16 <a cis fis>4. ~ <a cis fis>4 |
+    }
+    %% Same.  Need to use alternative here in order to match the notes
+    %% for the left hand.
+    {
+      r8 <a, cis fis>16-. r r r <dis fis b>8 ~
+      <dis fis b>4 ~ <dis fis b>4
+      <a d f>8 r16 <a d f>8 r16 <a cis fis>4. ~ <a cis fis>4 |
+    }
   }
 }
 
-- 
cgit v1.2.3