song2: stick: Delete parts played by guitar.

1 files changed, 25 insertions, 39 deletions

diff --git a/02-song2/parts/stick.ly b/02-song2/parts/stick.ly
index e4ce084..ac33e46 100644
--- a/02-song2/parts/stick.ly
+++ b/02-song2/parts/stick.ly
@@ -72,10 +72,10 @@ stickBRight = \relative c' {
   <e' a>8 r16 <fis a>8 r16 <e gis>2 r8 |
 }
 
+%% TODO: switch to acoustic guitar here
 stickTransitionLeft = \relative c, {
   \repeat volta 2 {
-    <fis cis' a>1\arpeggio | <fis cis' a>1\arpeggio |
-    <fis d' a>1\arpeggio | <fis cis' a>1\arpeggio |
+    r1 | r1 | r1 | r1 |
   }
   \repeat volta 4 {
     r16 <fis cis'>8 <e b'>16 <fis cis'>8 <e b'>16
@@ -87,8 +87,7 @@ stickTransitionLeft = \relative c, {
 
 stickTransitionRight = \relative c' {
   \repeat volta 2 {
-    <cis fis a>1\arpeggio | <b e gis>1\arpeggio |
-    <a d fis>1\arpeggio   | <a cis fis>1\arpeggio |
+    r1 | r1 | r1 | r1 |
   }
   \repeat volta 4 {
     r16 a8 gis16 a8 gis16 a8 a8 r16 r4        |
@@ -96,6 +95,7 @@ stickTransitionRight = \relative c' {
   }
 }
 
+%% TODO: this should be played by the acoustic guitar
 stickThreeLeft = \relative c, {
   \time 6/8
   \repeat unfold 2 {
@@ -110,6 +110,7 @@ stickThreeLeft = \relative c, {
   cis,16 <cis e'>8 <cis e'> r16 <cis e'>8 <cis e'> a16 b fis8 |
 }
 
+%% TODO: this should be played by the acoustic guitar
 stickThreeRight = \relative c' {
   \time 6/8
   \repeat unfold 2 {
@@ -124,50 +125,33 @@ stickThreeRight = \relative c' {
   r16 <f b>8 <f b> r16 <f b>8 <f b> r4 |
 }
 
+%% TODO: this should be played by the acoustic guitar
 stickMartaRekadoLeft = \relative c, {
-  \time 5/8
-  <fis a' e'>16 r r <fis a' e'> r <fis a' e'>8 r r16 |
-  \time 7/8
-  <gis b' fis'>4. r16 <gis b' fis'>8 <gis b' fis'>16 r4 |
-  \time 2/4
-  <fis a' e'>8. r16 b a gis a |
+  \time 5/8 r8*5 |
+  \time 7/8 r8*7 |
+  \time 2/4 r4*2 |
 
-  %% TODO
-  \time 5/8
-  <d, fis' cis'>16 r r <d fis' cis'> r <d fis' cis'>8 r r16 |
-  \time 7/8
-  <e b' gis'>4. r16 <e b' gis'>8 <e b' gis'>16 r4 |
-  \time 2/4
-  <fis a' e'>8. r16 b a gis a |
+  \time 5/8 r8*5 |
+  \time 7/8 r8*7 |
+  \time 2/4 r4*2 |
 
   \time 3/4
-  <a' e'>8. r8 <a e'>16    r16 <b fis'>8 <b fis'>8 <b fis'>16 |
-  r16 a r  a r a          r16 <b fis'>8 <b fis'>8 <b fis'>16 |
-
-  %% TODO
-  fis16 fis8 fis fis16  fis fis8 fis fis16 |
-  \time 7/8
-  fis fis8 fis d' d r r8. |
+  r4*3 | r4*3 | r4*3 |
+  \time 7/8 r8*7 |
 }
 
 stickMartaRekadoRight = \relative c' {
-  \repeat unfold 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 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
-  r16 <a d>16 r <a d>16 r r   <a d>16 <b e>8 <b e>8 <b e>16 |
-  r16 <a d> r <a d> r <a d>   <a d>16 <b e>8 <b e>8 <b e>16 |
-  %% TODO
-  fis16 fis8 fis fis16  fis fis8 fis fis16 |
-  \time 7/8
-  fis fis8 fis d' d r r8. |
+  r4*3 | r4*3 | r4*3 |
+  \time 7/8 r8*7 |
 }
 
 stickRepriseLeft = \relative c, {
@@ -225,11 +209,13 @@ stick = \new PianoStaff <<
     \stickBRight
 
     \key fis \minor
+    \set PianoStaff.midiInstrument = #"electric guitar (jazz)"
     \stickTransitionRight
     \stickThreeRight
 
     \stickMartaRekadoRight
 
+    \set PianoStaff.midiInstrument = #"clav"
     \stickRepriseRight
     \stickFinalRight
   }