song 2: Use guitar instead of stick.

2 files changed, 57 insertions, 175 deletions

diff --git a/02-song2/music/guitar.ly b/02-song2/music/guitar.ly
index e284d36..4412b8f 100644
--- a/02-song2/music/guitar.ly
+++ b/02-song2/music/guitar.ly
@@ -1,14 +1,6 @@
-\include "../music/stick.ly"
-guitarBreak = {
-  \stickStanzaLeft
-  \stickBLeft
-  \stickStanzaLeft
-  \stickBLeft
-}
-
 %% TODO
 guitarIntro = \relative c {
-  \repeat unfold 2 {
+  \repeat volta 2 {
     <b a' d>8 r16 q8 r16
     <b gis' d'>4 b8 ~ q b |
     <b d' g>8 r16 q8 r16
@@ -21,14 +13,54 @@ guitarIntro = \relative c {
   }
 }
 
+guitarStanza = \relative c {
+  \repeat volta 2 {
+    <b a' d>8 r16 q8 r16
+    <b gis' d'>4 b8 ~ q b |
+    <b d' g>8 r16 q8 r16
+    <b d' fis>4 b8 ~ q4  |
+
+    <b a' d>8 r16 q8 r16
+    <e, gis' d'>4 e8 ~ q fis |
+  } \alternative {
+    %% TODO: this was moved from stick.ly; adjust.
+    { <b' g'>8 r16 q8 r16  <b fis'>2 r8 |}
+    %% TODO: full d-major chord at the end
+    { <b g' d'>8 r16 <a e'>8 r16 <d, a'>8 ~ <d a'>2 |}
+  }
+}
+%% TODO: this was moved from stick.ly; adjust.
+guitarB = \relative c' {
+  <e b cis, >8. q8. <e ais, cis,>4 cis,8 <e' ais, >8 cis, |
+  <e' a, c, >8. q8. <e b gis b, >4 b8 b' r8 |
+  <e, b cis, >8. q8. <e ais, cis, >4 cis,8 <e' ais, >8 cis, |
+  <a'' e cis a a, >8. q8. <gis e b gis e e, >8*5_"D.S." \bar "|."
+
+  % <b e>8\arpeggio r16 <b e>8 r16
+  % <ais e'>4 r8 <ais e'> r |
+  % a8. ~ <a e'>8 a16 gis2 r8 |
+
+  % <b e>8 r16 <b e>8 r16 <ais e'>4 r8 <ais e'> r |
+  % <e' a>8 r16 <fis a>8 r16 <e gis>2 r8 |
+}
+
 %% capo 2nd fret
 guitar = \relative c {
   \time 4/4
+  \key b \minor
   \guitarIntro
 
+  \repeat volta 2 {
+    \inStaffSegno % start repeat
+    \key b \minor
+    \guitarStanza
+    \key e \major
+    \guitarB
+  }
+
+  \key fis \minor
   %% add capo 2nd fret
   \transposition d'
-  #(mmrest-of-length guitarBreak)
 
   %% transition
   \repeat volta 2 { R1*4 }
@@ -44,20 +76,16 @@ guitar = \relative c {
   }
 
   %% crescendo
+  %% TODO: fix the dynamics ramp
   \time 6/8
-  d16\5\ppppp\< e8\5 e8\5 e16\5 d16\5 e8\5 e8\5 e16\5 |
-  d16\5         e8\5 e8\5 e16\5 d16\5 e8\5 e8\5 e16\5 |
-  d16\5         e8\5 e8\5 e16\5 d16\5 e8\5 e8\5 e16\5 |
-  d16\5         e8\5 e8\5 e16\5 d16\5 e8\5 e8\5 e16\5 |
-
-  d16\5   <e,\6 e'\5>8 q8 q16
-  d'16\5  <e,\6 e'\5>8 q8 q16 |
-  d'16\5  <e,\6 e'\5>8 q8 q16
-  d'16\5  <e,\6 e'\5>8 q8 q16 |
-  d'16\5  <e,\6 e'\5>8 q8 q16
-  d'16\5  <e,\6 e'\5>8 q8 q16 |
-  d'16\5  <e,\6 e'\5>8 q8 q16
-  d'16\5  <e,\6 e'\5>8 q8 q16\!\fff |
+  \set countPercentRepeats = ##t
+  \repeat percent 4 {
+    d16\5\ppppp\< e8\5 e8\5 e16\5 d16\5 e8\5 e8\5 e16\5 |
+  }
+  \repeat percent 4 {
+    d16\5   <e,\6 e'\5>8 q8 q16
+    d'16\5  <e,\6 e'\5>8 q8 q16\!\fff |
+  }
 
   %% three
   \time 6/8
@@ -76,7 +104,7 @@ guitar = \relative c {
   r16 <b\5 es\4 a\3 d\2>8 q r16 q8 q r8 |
 
   %% marta rekado
-  \repeat unfold 2 {
+  \repeat volta 2 {
     \time 5/8 <d\5 fis\4>16 <e\5 g\4>8 q q q16 q16 <fis\5 a\4>16 ~ |
     \time 7/8 q16 q8 q q <e\5 g\4> q q16 q16 <fis\5 a\4> |
   } \alternative {
diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
index f755c39..4815944 100644
--- a/02-song2/music/stick.ly
+++ b/02-song2/music/stick.ly
@@ -1,115 +1,7 @@
 \include "../stafftab.ly"
+\include "../music/guitar.ly"
 
-stickStanzaLeft = \relative c {
-  \repeat unfold 2 {
-    <b fis'>8 r16 q8 r16
-    <b fis'>4 q8 r q  |
-    <b g'>8 r16 q8 r16
-    <b fis'>4 q8 ~ q4 |
-
-    <b fis'>8 r16 q8 r16
-    <e b>4 q8 r q |
-  } \alternative {
-    { <b g'>8 r16 q8 r16  <b fis'>2 r8 |}
-    { <b g' d'>8 r16 <a e'>8 r16 <d, a'>8 ~ <d a'>2 |}
-  }
-}
-
-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 |
-  } \alternative {
-    { <d' g>8 r16 <d g>8 r16 <d fis>2 r8 |}
-    { <d  g>8 r16 <d g>8 r16 <d fis>8 ~ <d fis>2 |}
-  }
-}
-
-stickBLeft = \relative c {
-  \repeat unfold 2 {
-    <cis gis'>4.\arpeggio <fis, cis'>4\arpeggio\sustainOn fis4 cis'8\sustainOff |
-  } \alternative {
-    { a,8 cis'4 e,4\sustainOn b'8 gis' e,\sustainOff |}
-    { cis' r16 dis8 r16 e8 ~ e2 |}
-  }
-}
-
-stickBRight = \relative c' {
-  <b e>8\arpeggio r16 <b e>8 r16
-  <ais e'>4 r8 <ais e'> r |
-  a8. ~ <a e'>8 a16 gis2 r8 |
-
-  <b e>8 r16 <b e>8 r16 <ais e'>4 r8 <ais e'> r |
-  <e' a>8 r16 <fis a>8 r16 <e gis>2 r8 |
-}
-
-%% switch to acoustic guitar here
-stickTransitionLeft = \relative c, {
-  \repeat volta 2 { R1*4 }
-  \repeat volta 2 { R1*2 }
-  \repeat volta 2 { R1*2 }
-}
-
-stickTransitionRight = \relative c' {
-  \repeat volta 2 { R1*4 }
-  \repeat volta 2 { R1*2 }
-  \repeat volta 2 { R1*2 }
-}
-
-stickCrescendoLeft = \relative c, {
-  \time 6/8
-  \repeat unfold 8 { R2. |}
-}
-
-stickCrescendoRight = \relative c' {
-  \time 6/8
-  \repeat unfold 8 { R2. |}
-}
-
-stickThreeLeft = \relative c, {
-  \time 6/8
-  \repeat volta 2 { R2.*2 }
-  R2.*4
-}
-
-stickThreeRight = \relative c' {
-  \time 6/8
-  \repeat volta 2 { R2.*2 }
-  R2.*4
-}
-
-stickMartaRekadoLeft = \relative c, {
-  \time 5/8 R8*5 |
-  \time 7/8 R8*7 |
-  \time 2/4 R4*2 |
-
-  \time 5/8 R8*5 |
-  \time 7/8 R8*7 |
-  \time 2/4 R4*2 |
-
-  \time 3/4
-  R4*3 | R4*3 | R4*3 | R4*3 | R4*3 | R4*3 | R4*3 |
-  \time 4/4 R8*8 |
-}
-
-stickMartaRekadoRight = \relative c' {
-  \time 5/8 R8*5 |
-  \time 7/8 R8*7 |
-  \time 2/4 R4*2 |
-
-  \time 5/8 R8*5 |
-  \time 7/8 R8*7 |
-  \time 2/4 R4*2 |
-
-  \time 3/4
-  R4*3 | R4*3 | R4*3 |  R4*3 | R4*3 | R4*3 | R4*3 |
-  \time 4/4 R8*8 |
-}
+stickBreak = \unfoldRepeats \guitar
 
 stickRepriseLeft = \relative c, {
   \time 4/4
@@ -211,27 +103,7 @@ stick = <<
 
     %% intro
     \time 4/4
-    R1*8
-    \stickStanzaRight
-
-    \key e \major
-    \stickBRight
-
-    \key b \minor
-    \stickStanzaRight
-
-    \key e \major
-    \stickBRight
-
-    \key fis \minor
-    \set PianoStaff.midiInstrument = #"electric guitar (jazz)"
-    \stickTransitionRight
-    \stickCrescendoRight
-    \stickThreeRight
-
-    \stickMartaRekadoRight
-
-    \set PianoStaff.midiInstrument = #"clav"
+    #(mmrest-of-length stickBreak)
     \stickRepriseRight
     \stickFinalRight
   }
@@ -240,30 +112,12 @@ stick = <<
   \new StaffTab = "stick left" \relative c  {
     \clef "bass"
     \set Staff.midiPanPosition = #0.5
-    \key b \minor
     \set Staff.stringTunings = #stick-matched-reciprocal-tuning
+    \key b \minor
 
     %% intro
     \time 4/4
-    R1*8
-    \stickStanzaLeft
-
-    \key e \major
-    \stickBLeft
-
-    \key b \minor
-    \stickStanzaLeft
-
-    \key e \major
-    \stickBLeft
-
-    \key fis \minor
-    \stickTransitionLeft
-    \stickCrescendoLeft
-    \stickThreeLeft
-
-    \stickMartaRekadoLeft
-
+    #(mmrest-of-length stickBreak)
     \stickRepriseLeft
     \stickFinalLeft
   }