song1: Change extension of "A" section.

4 files changed, 58 insertions, 26 deletions

diff --git a/01-song1/music/bass.ly b/01-song1/music/bass.ly
index 271e2df..77b7e0a 100644
--- a/01-song1/music/bass.ly
+++ b/01-song1/music/bass.ly
@@ -29,15 +29,17 @@ bassA = \relative fis,, {
 
 bassAExtended = \relative fis,, {
   \time 4/4
-  cis4. dis e4 ~ | e8 fis4. e4 dis |
-  %% more intense!
-  \repeat unfold 4 {
-    cis4. dis e4 ~ | e8 fis4. e4 dis |
-  }
+  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 cis8 cis cis cis cis cis |
+
+  %% TODO
+  e,8 e e e fis gis a4 ~ | a1 ~ |
 }
 
 bassATransition = \relative fis,, {
-  \time 4/4 cis1 ~ | cis |
+  \time 4/4 a1 ~ | a |
 }
 
 bassVerse = \relative fis, {
diff --git a/01-song1/music/click.ly b/01-song1/music/click.ly
index 4c91b8f..4e1f736 100644
--- a/01-song1/music/click.ly
+++ b/01-song1/music/click.ly
@@ -31,10 +31,12 @@ click = \drummode {
 
   %% A extended
   \time 4/4 \repeat unfold 2 { <bd hh>4 hh hh hh | }
-  \time 4/4 \repeat unfold 6 { <bd hh>8 hh <sn hh> hh <bd hh> hh <sn hh> hh | }
+  \time 4/4 \repeat unfold 2 {
+    sn8 bd bd sn bd bd sn bd | bd sn bd bd sn bd sn bd |
+  }
   \time 4/4
-  sn8 bd bd sn bd bd sn bd | bd sn bd bd sn bd sn bd |
-  sn8 bd bd sn bd bd sn bd | bd sn bd bd sn4 bd |
+  <cymc bd hh>4 hh hh hh | <bd hh> hh hh hh |
+  <bd hh> hh hh hh | <bd hh> hh hh hh |
 
   %% Verse
   \tempo 4 = 175
diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
index 3915e42..9fcc515 100644
--- a/01-song1/music/keys.ly
+++ b/01-song1/music/keys.ly
@@ -18,12 +18,12 @@ keysA = \relative c'' {
 
 keysAExtended = \relative c' {
   \time 4/4
-  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
+  cis8 e gis  c, dis fis cis4 ~ | cis2 r |
 
-  %% TODO: more intense!
-  \repeat unfold 4 {
-    <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
-  }
+  cis8 e gis  c, dis fis cis4 ~ | cis2 r |
+  cis8  e gis  c, dis fis cis4 ~ | cis2 r |
+
+  gis'8 e b  dis e b <a cis e>4\arpeggio ~ | <a cis e>1 |
 }
 
 keysATransition = {
diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index 8fe2acf..89656be 100644
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -48,28 +48,56 @@ stickARight = \relative c {
   cis'4-2 ~ | cis2 cis4-.-2 c-.-1 |
 }
 
-stickAExtendedLeft = \relative c {
+stickAExtendedLeft = \relative c' {
   \time 4/4
-  r8 r   cis r  r   cis r r   | cis r r   cis  r cis r  cis |
-  %% more intense!
-  \repeat unfold 4 {
-    r8 cis cis r  cis cis r cis | cis r cis cis  r cis r cis |
-  }
+  %% Notes come from the right.  The left hand only supports the right
+  %% hand line.
+  r1 | r1 |
+
+  r2 r4 e4 ~ | e2 e4-. dis-. |
+  r1 | r1 |
+
+  r1 | r1 |
 }
 
 stickAExtendedRight = \relative c' {
   \time 4/4
-  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
-  \repeat unfold 4 {
-    <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
-  }
+  e8-1 cis-3 \change Staff = "stick left" gis-1
+  \change Staff = "stick right"
+  fis'-2 c-1 \change Staff = "stick left" a-2
+  \change Staff = "stick right"
+  <e' gis>4 ~ | <e gis>4.
+
+  \change Staff = "stick left"
+  e8-2
+  \change Staff = "stick right"
+  fis-2
+  \change Staff = "stick left"
+  dis-1
+  \change Staff = "stick right"
+  c-1
+  \change Staff = "stick left"
+  e-2 |
+  \change Staff = "stick right"
+
+  cis8-2 gis-1 e-3
+  \change Staff = "stick left" dis'-1 \change Staff = "stick right" c-2 fis,-1
+  cis'4-2 ~ | cis2 cis4-.-2 c-.-1 |
+
+  e8-1 cis-3 \change Staff = "stick left" gis-1
+  \change Staff = "stick right"
+  fis'-2 c-1 \change Staff = "stick left" a-2
+  \change Staff = "stick right"
+  <e' gis>4 ~ | <e gis>2 r8 fis gis a |
+
+  b8 gis e fis gis e <e a cis>4\arpeggio ~ | <e a cis>1 ~
 }
 
 stickATransitionLeft = \relative c {
-  \time 4/4 cis1 ~ | cis1 |
+  \time 4/4 r1 | r1 |
 }
 stickATransitionRight = \relative c' {
-  \time 4/4 <cis e>1 ~ | <cis e> |
+  \time 4/4 <e a cis>1 ~ | <e a cis> |
 }
 
 stickVerseLeft = \relative c {