1 files changed, 26 insertions, 51 deletions
diff --git a/02-song2/parts/guitar.ly b/02-song2/parts/guitar.ly
index 5ea1680..3da82f7 100644
--- a/02-song2/parts/guitar.ly
+++ b/02-song2/parts/guitar.ly
@@ -1,58 +1,33 @@
-\include "parts/stick.ly"
-guitarBreak = {
-  \stickIntroLeft
-  \stickStanzaLeft
-  \stickBLeft
-  \stickStanzaLeft
-  \stickBLeft
-}
+\version "2.19.27"
 
-%% capo 2nd fret
-guitar = \relative c {
-  \transposition d'
-  \time 4/4
-  #(mmrest-of-length guitarBreak)
+\header {
+  title = "Song 2"
+  subtitle = "Acoustic Guitar"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
+}
 
-  %% 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 |
-  }
+\include "../settings.ly"
+\include "music/guitar.ly"
 
-  %% 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 |
+\score {
+  \new TabStaff = "acoustic guitar"
+  \with {
+    stringTunings = #guitar-tuning
+    \RemoveEmptyStaves
+    \tabFullNotation
+  } {
+    \tabChordRepeats
+    \compressMMRests
+    \guitar
   }
 
-  <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 |}
+  \layout {
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
   }
-  \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. |
 }