song2: Adjust click track.

[music/pretentious.git] / 02-song2 / 02-song2.ly

diff --git a/02-song2/02-song2.ly b/02-song2/02-song2.ly
index 0da7ec41d554ed73a9b7eaf55737aeaae615dd56..e8c23270bcf7fd42876d07e4b0cf7dbf9cc28044 100644 (file)
--- a/02-song2/02-song2.ly
+++ b/02-song2/02-song2.ly
@@ -6,10 +6,12 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "parts/bass.ly"
-\include "parts/keys.ly"
-\include "parts/stick.ly"
-\include "parts/click.ly"
+\include "../settings.ly"
+\include "music/bass.ly"
+\include "music/keys.ly"
+\include "music/stick.ly"
+\include "music/guitar.ly"
+\include "music/click.ly"
 
 \layout {
   ragged-last = ##t
@@ -18,18 +20,39 @@
 }
 
 AllMusic = <<
-  \new Staff = "keyboard"
+  \new PianoStaff = "keyboard"
   \with {
     instrumentName = #"Synthesizer"
     shortInstrumentName = #"Synth"
     pedalSustainStyle = #'bracket
-  } { \keyboard }
+  } {
+    <<
+      \new Staff {
+        \clef treble
+        \keyboard
+      }
+    >>
+  }
   \new StaffGroup = "bass"
   \with {
     instrumentName = #"Bass"
     shortInstrumentName = #"Bass"
   } { \bass }
-  \new Staff = "grand stick"     { \stick }
+  \new PianoStaff = "grand stick"
+  \with {
+    instrumentName = #"Grand Stick"
+    shortInstrumentName = #"Stick"
+    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