From 5dfc6ede4c5ff452d4d28af8ce3cc9546a6aa71e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 27 Feb 2017 11:57:40 +0100
Subject: song 1: keys: Use more volta repeats.

---
 01-song1/music/keys.ly | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
index c3eb31e..5bb51e6 100644
--- a/01-song1/music/keys.ly
+++ b/01-song1/music/keys.ly
@@ -1,6 +1,4 @@
-keysIntro = {
-  \repeat unfold 16 R1 |
-}
+keysIntro = { R1*16 |}
 
 keysA = \relative c'' {
   \key cis \minor
@@ -32,13 +30,13 @@ keysATransition = \relative c' {
 
 keysATransitionVariant = \relative c' {
   \time 4/4
-  \repeat unfold 4 { cis'8 gis e e' c4-. cis4-. | }
+  \repeat volta 4 { cis'8 gis e e' c4-. cis4-. | }
   <e, gis c>8-. r r q-. r r r r | r q4. r2 |
 }
 
 keysATransitionPreOutro = \relative c' {
   \time 4/4
-  \repeat unfold 3 { cis'8 gis e e' c4-. cis4-. | }
+  \repeat volta 3 { cis'8 gis e e' c4-. cis4-. | }
   r1 |
 }
 
@@ -71,7 +69,7 @@ keysVerseHarder = \keysVerse
 keysNasty = \relative c' {
   \time 6/8
   \key cis \minor
-  \repeat unfold 2 {
+  \repeat volta 3 {
     <gis cis e>2. ~ | <gis cis e>2.   |
     <a bis dis>2.   | <a bis dis fis> |
     <gis cis e>   ~ | <gis cis e> ~   |
@@ -83,16 +81,6 @@ keysNasty = \relative c' {
     <e gis cis>   ~ | <e gis cis>     |
   }
 
-  <gis cis e>2. ~ | <gis cis e>2.   |
-  <a bis dis>2.   | <a bis dis fis> |
-  <gis cis e>   ~ | <gis cis e> ~   |
-  <gis cis e>   ~ | <gis cis e>     |
-
-  <gis cis e>2. ~ | <gis cis e>2.   |
-  <a bis dis>2.   | <fis a bis dis> |
-  <e gis cis>   ~ | <e gis cis> ~   |
-  <e gis cis>   ~ | <e gis cis>     |
-
   <gis cis e>2. ~ | <gis cis e>     |
   <a bis dis>     | <a bis dis fis> |
   <gis cis e> ~   | <gis cis e>     |
@@ -137,9 +125,9 @@ keysWaltz = \relative c'' {
 keysOutro = \relative c' {
   \time 4/4
   \set PianoStaff.midiInstrument = #"lead 8 (bass+lead)"
-  \repeat unfold 3 { cis8 b, cis gis' e' gis, e' gis, |}
+  \repeat volta 3 { cis8 b, cis gis' e' gis, e' gis, |}
   <b e gis>2 <b dis fis> |
-  \repeat unfold 3 { cis8 b, cis gis' e' gis, e' gis, |}
+  \repeat volta 3 { cis8 b, cis gis' e' gis, e' gis, |}
   <e' gis b>2 <dis fis b> |
 }
 
-- 
cgit v1.2.3