song2: stick: Add more sections.

1 files changed, 123 insertions, 14 deletions

diff --git a/02-song2/parts/stick.ly b/02-song2/parts/stick.ly
index 37bc7aa..e0a36ef 100644
--- a/02-song2/parts/stick.ly
+++ b/02-song2/parts/stick.ly
@@ -1,22 +1,105 @@
 stickIntroLeft = \relative c {
-  <b a' d>8 r16 <b a' d>8 r16
-  <b gis' d'>4 b8 ~ <b gis' d'> b |
-  <b g' d'>8 r16 <b g' d'>8 r16
-  <b fis' d'>4 b8 ~ <b fis' d'>4  |
-
-  <b a' d>8 r16 <b a' d>8 r16
-  <b gis' d'>4 b8 ~ <b gis' d'> b |
-  <b g' d'>8 r16 <b g' d'>8 r16
-  <b fis' d'>8 ~ <b fis' d'>2     |
+  \repeat unfold 2 {
+    <b a' d>8 r16 <b a' d>8 r16
+    <b gis' d'>4 b8 ~ <b gis' d'> b |
+    <b g' d'>8 r16 <b g' d'>8 r16
+    <b fis' d'>4 b8 ~ <b fis' d'>4  |
+
+    <b a' d>8 r16 <b a' d>8 r16
+    <b gis' d'>4 b8 ~ <b gis' d'> b |
+    <b g' d'>8 r16 <b g' d'>8 r16
+    <b fis' d'>8 ~ <b fis' d'>2     |
+  }
 }
 
 stickIntroRight = \relative c' {
-  fis8. fis e4 r16 ais,16 b cis d gis, |
-  e'8.  e   d4 r4.                     |
-  fis8. fis e4 r4.                     |
-  d8.   cis b4 r4.                     |
+  %% TODO: make this solo more interesting
+  \repeat unfold 2 {
+    fis8. fis e4 r16 ais,16 b cis d gis, |
+    e'8.  e   d4 r4.                     |
+    fis8. fis e4 r4.                     |
+    d8.   cis b4 r4.                     |
+  }
+}
+
+stickStanzaLeft = \relative c {
+  \repeat unfold 2 {
+    <b fis'>8 r16 <b fis'>8 r16
+    <b fis'>4 <b fis'>8 r <b fis'>  |
+    <b g'>8 r16 <b g'>8 r16
+    <b fis'>4 <b fis'>8 ~ <b fis'>4 |
+
+    <b fis'>8 r16 <b fis'>8 r16
+    <e b>4 <e b>8 r <b fis'> |
+  } \alternative {
+    { <b g'>8 r16 <b g'>8 r16  <b fis'>2 r8 |}
+    %% TODO: find chords here
+    { g r16 a8 r16 d8 ~ d2 |}
+  }
+}
+
+stickStanzaRight = \relative c' {
+  \repeat unfold 2 {
+    <a d>8 r16 <a d>8 r16
+    <gis d'>4 r8 <gis d'> r |
+    <d' g>8 r16 <d g>8 r16
+    <d fis>4 r8 <d fis> r |
+
+    <a d>8 r16 <a d>8 r16
+    <gis d'>4 r8 <gis d'> r |
+    <d' g>8 r16 <d g>8 r16
+    <d fis>4. r4 |
+  }
+}
+
+%% TODO
+stickBLeft = \transpose c d { \relative c {
+  <b fis'>8 r16 <b fis'>8 r16
+  <e b>4 <e b>8 r <e b> |
+  <g b d'>8 r16 <g b d'>8 r16
+  <d fis'>8 ~ <d fis'>2 |
+
+  <b fis'>8 r16 <b fis'>8 r16
+  <e b>4 <e b>8 r <b fis'> |
+  { g r16 a8 r16 d8 ~ d2 |}
+}}
+
+stickBRight = \relative c' {
+  <b e>8 r16 <b e>8 r16
+  <ais e'>4 r8 <ais e'> r |
+  a8. ~ <a e'>8 a16
+  gis4 r8 <gis e'> r |
+
+  <b e>8 r16 <b e>8 r16
+  <ais e'>4 r8 <ais e'> r |
+  <e' a>8 r16 <e a>8 r16
+  <e gis>4. r4 |
+}
+
+stickTransitionLeft = \relative c {
+  \repeat volta 2 {
+    R1 | R1 | R1 | R1 |
+    %% TODO: support chords
+    %%<cis fis a>1 | <b e gis>1 |
+    %%<a d fis>1   | <a cis fis>1 |
+  }
+  \repeat volta 4 {
+    r16 <fis cis'>8 <e b'>16 <fis cis'>8 <e b'>16
+    <fis cis'>8 <fis cis'>8 r16 r4           |
+    r16 <fis cis'>8 <e b'>16 <fis cis'>8 <e b'>16
+    <fis cis'>16 r16 <fis cis'>16 <e b'>4 r8 |
+  }
 }
 
+stickTransitionRight = \relative c' {
+  \repeat volta 2 {
+    <cis fis a>1 | <b e gis>1 |
+    <a d fis>1   | <a cis fis>1 |
+  }
+  \repeat volta 4 { R1 | R1 }
+}
+
+
 
 stick = \new PianoStaff <<
   \set PianoStaff.midiInstrument = #"clav"
@@ -29,6 +112,19 @@ stick = \new PianoStaff <<
     %% intro
     \time 4/4
     \stickIntroRight
+    \stickStanzaRight
+
+    \key e \major
+    \stickBRight
+
+    \key b \minor
+    \stickStanzaRight
+
+    \key e \major
+    \stickBRight
+
+    \key fis \minor
+    \stickTransitionRight
   }
 
   %% staff for left hand side
@@ -38,7 +134,20 @@ stick = \new PianoStaff <<
 
     %% intro
     \time 4/4
-    \repeat unfold 2 \stickIntroLeft
+    \stickIntroLeft
+    \stickStanzaLeft
+
+    \key e \major
+    \stickBLeft
+
+    \key b \minor
+    \stickStanzaLeft
+
+    \key e \major
+    \stickBLeft
+
+    \key fis \minor
+    \stickTransitionLeft
   }
 >>