song 1: bass: Use more repeats and better rests.

1 files changed, 35 insertions, 30 deletions

diff --git a/01-song1/music/bass.ly b/01-song1/music/bass.ly
index 6fad056..a030002 100644
--- a/01-song1/music/bass.ly
+++ b/01-song1/music/bass.ly
@@ -16,17 +16,19 @@ bassA = \relative fis,, {
   r b r cis r r|
 
   \time 2/4
-  cis,4 cis | cis'4 r8 b | r b r r |
+  cis,4 cis | cis'4 r8 b | r b r4 |
   \time 4/4
-  cis8 cis cis c c c cis4 ~ | cis2 r4 r4 |
+  cis8 cis cis c c c cis4 ~ | cis2 r2 |
 }
 
 bassAExtended = \relative fis,, {
   \time 4/4
-  cis'8 cis cis c c c cis4 ~ | cis2 r4 r4 |
-
-  cis8  cis cis c c c cis4 ~ | cis2 r4 r4 |
-  cis8  cis cis c c c cis4 ~ | cis4-. cis4-. cis4-. cis4-. |
+  \repeat volta 3 {
+    cis'8 cis cis c c c cis4 ~ |
+  } \alternative {
+    { cis2 r2 | }
+    { cis4-. cis4-. cis4-. cis4-. |}
+  }
 }
 
 bassATransition = \relative fis,, {
@@ -36,15 +38,20 @@ bassATransition = \relative fis,, {
 
 bassATransitionVariant = \relative fis, {
   \time 4/4
-  cis8  r r cis8 e'4 dis | cis,8 r r e'8 c4 cis |
-  cis,8 r r cis8 e'4 dis | cis,8 r r e'8 c4 cis |
-  cis8-. r r cis-. r r r r | r cis,4. r2 |
+  \repeat volta 2 {
+    cis8 r r cis8 e'4 dis | cis,8 r r e'8 c4 cis |
+  }
+  cis8-. r r cis-. r2 | r8 cis,4. r2 |
 }
 
 bassATransitionVariantPreOutro = \relative fis,, {
   \time 4/4
-  cis8  r r cis8 e'4 dis | cis,8 r r e'8 c4 cis |
-  cis,8 r r cis8 e'4 dis | cis,1 |
+  \repeat volta 2 {
+    cis8  r r cis8 e'4 dis |
+  } \alternative {
+    { cis,8 r r e'8 c4 cis |}
+    { cis,1 |}
+  }
 }
 
 bassVerse = \relative fis, {
@@ -87,21 +94,19 @@ bassNasty = \relative c, {
   b b b r b b | b r c c c r |
   a a a r a a | es' r es es es 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 |
-  \time 3/4
-  a2. ~ | a2. |
+  \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. |
+    }
+  }
 }
 
 %% TODO
@@ -123,10 +128,10 @@ bassWaltz = \relative c, {
 
 bassEnd = \relative fis, {
   \time 4/4
-  \repeat unfold 3 { cis8 cis cis cis cis cis cis cis |}
-  e e e e b b b b |
-  \repeat unfold 3 { cis8 cis cis cis cis cis cis cis |}
-  e e e e fis fis fis gis |
+  \repeat percent 3 { cis8 cis cis cis cis cis cis cis |}
+  { e e e e b b b b |}
+  \repeat percent 3 { cis8 cis cis cis cis cis cis cis |}
+  {e e e e fis fis fis gis |}
 }