song2: Add guitar part.

4 files changed, 125 insertions, 51 deletions

diff --git a/02-song2/02-song2.ly b/02-song2/02-song2.ly
index 4026d32..c07f456 100644
--- a/02-song2/02-song2.ly
+++ b/02-song2/02-song2.ly
@@ -9,6 +9,7 @@
 \include "parts/bass.ly"
 \include "parts/keys.ly"
 \include "parts/stick.ly"
+\include "parts/guitar.ly"
 \include "parts/click.ly"
 
 \layout {
@@ -35,6 +36,14 @@ AllMusic = <<
     midiInstrument = #"clav"
     pedalSustainStyle = #'bracket
   } { \stick }
+  \new TabStaff = "acoustic guitar"
+  \with {
+    stringTunings = #guitar-tuning
+    \RemoveEmptyStaves
+    \tabFullNotation
+    instrumentName = #"Acoustic Guitar"
+    shortInstrumentName = #"Guitar"
+  } { \tabChordRepeats \guitar }
 >>
 
 %% Two scores are needed: one with unfolded repeats for MIDI and the
diff --git a/02-song2/instr/guitar.ly b/02-song2/instr/guitar.ly
new file mode 100644
index 0000000..c5bb6dc
--- /dev/null
+++ b/02-song2/instr/guitar.ly
@@ -0,0 +1,33 @@
+\version "2.19.27"
+
+\header {
+  title = "Song 2"
+  subtitle = "Acoustic Guitar"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
+}
+
+\include "../settings.ly"
+\include "parts/guitar.ly"
+
+\score {
+  \new TabStaff = "acoustic guitar"
+  \with {
+    stringTunings = #guitar-tuning
+    \RemoveEmptyStaves
+    \tabFullNotation
+  } {
+    \tabChordRepeats
+    \compressMMRests
+    \guitar
+  }
+
+  \layout {
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
+  }
+}
diff --git a/02-song2/parts/guitar.ly b/02-song2/parts/guitar.ly
new file mode 100644
index 0000000..5ea1680
--- /dev/null
+++ b/02-song2/parts/guitar.ly
@@ -0,0 +1,58 @@
+\include "parts/stick.ly"
+guitarBreak = {
+  \stickIntroLeft
+  \stickStanzaLeft
+  \stickBLeft
+  \stickStanzaLeft
+  \stickBLeft
+}
+
+%% capo 2nd fret
+guitar = \relative c {
+  \transposition d'
+  \time 4/4
+  #(mmrest-of-length guitarBreak)
+
+  %% transition
+  \repeat volta 2 { R1*4 }
+  \repeat volta 4 {
+    r16 <b e>8 <a d>16 <b e>8 <a d>16
+    <b e>8 <b e>8 r16 r4           |
+    r16 <b e>8 <a d>16 <b e>8 <a d>16
+    <b e>16 r16 <b e>16 <a d>4 r8 |
+  }
+
+  %% three
+  \time 6/8
+  \repeat unfold 2 {
+    <d\5 fis\4>16  <e\5 g\4>8 q q16   q16 <fis\5 a\4>8 q q16 |
+    q16 <g\5 b\4>8 q r16 a,8\5 <a\5 a'\4 cis\3 g'\2> q |
+  }
+
+  <c\5 e\4 g\3 d'\2>16 q r q r q
+  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
+  r16 <c\5 e\4 g\3 d'\2> r q r q
+  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
+
+  <c\5 e\4 g\3 d'\2>16 q r q r q
+  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
+  r16 <b\5 es\4 a\3 d\2>8 q r16 q8 q r8 |
+
+  %% marta rekado
+  \repeat unfold 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 {
+    { \time 2/4 r16 <fis\5 a\4>8 q r r16 |}
+    { \time 2/4 r16 <fis\5 a\4>8 q r r16 |}
+  }
+  \time 3/4
+  <c\5 e\4 g\3 d'\2>16 q r q r q
+  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
+  r16 <c\5 e\4 g\3 d'\2> r q r q
+  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
+  %% TODO
+  <e,\6 e'\5 d\4 g\3 g'\2 e\1>2.\arpeggio |
+  \time 7/8
+  r16 r8 r <c'\5 e\4 g\3 c'\2> q r r8. |
+}
diff --git a/02-song2/parts/stick.ly b/02-song2/parts/stick.ly
index 65f26ef..17b1c5c 100644
--- a/02-song2/parts/stick.ly
+++ b/02-song2/parts/stick.ly
@@ -72,84 +72,58 @@ stickBRight = \relative c' {
   <e' a>8 r16 <fis a>8 r16 <e gis>2 r8 |
 }
 
-%% TODO: switch to acoustic guitar here
+%% switch to acoustic guitar here
 stickTransitionLeft = \relative c, {
-  \repeat volta 2 {
-    r1 | r1 | r1 | r1 |
-  }
-  \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 |
-  }
+  \repeat volta 2 { R1*4 }
+  \repeat volta 4 { R1*2 }
 }
 
 stickTransitionRight = \relative c' {
-  \repeat volta 2 {
-    r1 | r1 | r1 | r1 |
-  }
-  \repeat volta 4 {
-    r16 a8 gis16 a8 gis16 a8 a8 r16 r4        |
-    r16 a8 gis16 a8 gis16 a16 r16 a16 gis4 r8 |
-  }
+  \repeat volta 2 { R1*4 }
+  \repeat volta 4 { R1*2 }
 }
 
 %% TODO: this should be played by the acoustic guitar
 stickThreeLeft = \relative c, {
   \time 6/8
-  \repeat unfold 2 {
-    b'16  cis8 cis cis16   fis16 gis8 gis gis16 |
-    gis16 a8   a   r16     r8 <a dis> <a dis> |
-  }
-
-  <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 |
-  <a e'>8. r8 <a e'>16    r16 <b fis'>8 <b fis'>8 <b fis'>16 |
-  cis,16 <cis e'>8 <cis e'> r16 <cis e'>8 <cis e'> r8 |
+  \repeat unfold 2 { R2.*2 }
+  R2.*4
 }
 
 %% TODO: this should be played by the acoustic guitar
 stickThreeRight = \relative c' {
   \time 6/8
-  \repeat unfold 2 {
-    gis16 a8 a a16  a16 b8 b b16 |
-    b16 cis8   cis   r16 r8 <a dis> <a dis> |
-  }
-
-  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 |
-  r8. <a d>8 <a d>16          <a d>16 <b e>8 <b e>8 <b e>16 |
-  r16 <f b>8 <f b> r16 <f b>8 <f b> r8 |
+  \repeat unfold 2 { R2.*2 }
+  R2.*4
 }
 
 %% TODO: this should be played by the acoustic guitar
 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 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 |
-  \time 7/8 r8*7 |
+  R4*3 | R4*3 | R4*3 |
+  \time 7/8 R8*7 |
 }
 
 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 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 |
-  \time 7/8 r8*7 |
+  R4*3 | R4*3 | R4*3 |
+  \time 7/8 R8*7 |
 }
 
 stickRepriseLeft = \relative c, {