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 92bb2347f1a593f75c6350b90afb8f6bc1d817e2..e8c23270bcf7fd42876d07e4b0cf7dbf9cc28044 100644 (file)
--- a/02-song2/02-song2.ly
+++ b/02-song2/02-song2.ly
@@ -3,26 +3,67 @@
 \header {
   title = "Song 2"
   composer = "The very pretentious elephlies"
-  arranger = "Ricardo Wurmus"
-  copyright = "2002--2015 Ricardo Wurmus"
+  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
+  indent = 2\cm
+  short-indent = 1.5\cm
+}
 
 AllMusic = <<
-  \new Staff = "keyboard"    { \keyboard }
-  \new Staff = "bass"        { \bass }
-  \new Staff = "grand stick" { \stick }
-  \new DrumStaff { \click }
+  \new PianoStaff = "keyboard"
+  \with {
+    instrumentName = #"Synthesizer"
+    shortInstrumentName = #"Synth"
+    pedalSustainStyle = #'bracket
+  } {
+    <<
+      \new Staff {
+        \clef treble
+        \keyboard
+      }
+    >>
+  }
+  \new StaffGroup = "bass"
+  \with {
+    instrumentName = #"Bass"
+    shortInstrumentName = #"Bass"
+  } { \bass }
+  \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
 %% other with regular repeats for notation.
 \score {
-  \unfoldRepeats { \AllMusic }
+  \unfoldRepeats {
+    <<
+      \AllMusic
+      \new DrumStaff { \click }
+    >>
+  }
   \midi { \tempo 4 = 90 }
 }