song 2: keys: Collapse repeats.

1 files changed, 33 insertions, 46 deletions

diff --git a/02-song2/music/keys.ly b/02-song2/music/keys.ly
index 7abbd81..4935e77 100644
--- a/02-song2/music/keys.ly
+++ b/02-song2/music/keys.ly
@@ -1,6 +1,3 @@
-keysA = { R1*8 }
-keysB = { R1*4 }
-
 keysTransitionA = \relative c' {
   \repeat volta 2 {
     <cis fis a>1 | <b e gis>1   |
@@ -10,11 +7,7 @@ keysTransitionA = \relative c' {
 
 keysTransitionB = \relative c' {
   %% TODO: change this.  Also play fast arpeggios in the breaks?
-  \repeat volta 2 {
-    r16 fis8 e16 fis8 e16 fis8 fis8 r16 r4      |
-    r16 fis8 e16 fis8 e16 fis16 r16 fis16 e4 r8 |
-  }
-  \repeat volta 2 {
+  \repeat volta 4 {
     r16 fis8 e16 fis8 e16 fis8 fis8 r16 r4      |
     r16 fis8 e16 fis8 e16 fis16 r16 fis16 e4 r8 |
   }
@@ -22,55 +15,55 @@ keysTransitionB = \relative c' {
 
 keysCrescendo = \relative c' {
   \time 6/8
-  <fis a cis fis>2.\p ~ |
+  <fis a cis fis>2. ~ |
   <e a cis fis>2. ~ |
   <fis a d>2. ~ |
   <fis a cis>2. ~ |
 
-  <cis fis a cis>2.\fff ~ |
+  <cis fis a cis>2. ~ |
   <fis gis cis>2. ~ |
   <fis b cis>2. ~ |
   <fis a cis>2. |
 }
 
 keysThree = {
-  \time 6/8
-  \repeat volta 2 { R2.*2 }
-  R2.*4
+  \time 6/8 R2.*8
 }
 
 keysMartaRekado = \relative c' {
-  \repeat unfold 2 {
+  \repeat volta 2 {
     \time 5/8
     cis''16 a fis cis r cis8 fis a16  |
     \time 7/8
     gis8 e b e16 e8 fis16 r16 b,8 e16 |
-  } \alternative {
-    { \time 2/4 cis8. a16 b a gis a |}
-    { \time 2/4 cis8. a16 b a gis a |}
+    \time 2/4 cis8. a16 b a gis a |
   }
 
   \time 3/4
-  d,, fis a d fis a
-  gis e b e gis b  |
-  a fis d fis a cis
-  b gis e b gis e |
-
-  %% TODO
-  fis2.\glissando | fis,2. |
-
-  d'16 fis a d fis a
-  gis e b e gis b  |
-  a fis d fis a cis
-  b gis e b e' fis ~ |
-
-  fis2.\glissando |
-  \time 4/4 fis,16 ~ fis8 ~ fis r d' d r r8. |
+  \repeat volta 2 {
+    \ottava #-1 d,,16 fis a
+    \ottava #0 d fis a
+    gis e b e gis b  |
+  } \alternative {
+    \relative c' {
+      a'16 fis d fis a cis
+      b gis e \ottava #-1 b gis e |
+      %% TODO
+      fis2.\glissando | fis,2. |
+      \ottava #0
+    }
+    \relative c' {
+      a'16 fis d fis a cis
+      b gis e b e' fis ~ |
+      fis2.\glissando |
+    }
+  }
+  \time 4/4 fis16 ~ fis8 ~ fis r d' d r16 r4 |
 }
 
 keysReprise = \relative c' {
   \time 4/4
-  \repeat unfold 3 {
+  \repeat volta 3 {
     <cis fis a cis>2 ~               <es fis a cis>2  |
     <c f a d>4. ~ <cis fis a cis>8 ~ <cis fis a cis>2 |
     <fis a cis fis>2 ~               <es a cis fis>2  |
@@ -89,25 +82,19 @@ keysFinal = \relative c' {
     <cis a>16 r8 <b gis>16 r8 a16 gis fis\sustainOn cis a gis fis4\sustainOff
   }
 
-  <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
-  <a d fis>8 r <a d fis> r16 <a cis e>8. a8 <a cis e> r |
-  <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
-  f8 b r8 d16 f gis1.\trill
+  \repeat volta 2 {
+    <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
+  } \alternative {
+    { <a d fis>8 r <a d fis> r16 <a cis e>8. a8 <a cis e> r |}
+    { f8 b r8 d16 f gis1.\trill }
+  }
 }
 
 keyboard = \relative c' {
     %% Intro
     \time 4/4
     \key b \minor
-    R1*8
-
-    \repeat volta 2 {
-      \inStaffSegno % start repeat
-      \key b \minor
-      \keysA
-      \key e \major
-      \keysB
-    }
+    R1*32
 
     \set Staff.midiInstrument = #"pad 2 (warm)"
     \key fis \minor