circus: Add parts.

1 files changed, 31 insertions, 6 deletions

diff --git a/03-circus/03-circus.ly b/03-circus/03-circus.ly
index 42ad6c8..4b9265f 100644
--- a/03-circus/03-circus.ly
+++ b/03-circus/03-circus.ly
@@ -8,21 +8,46 @@
 
 \include "../settings.ly"
 \include "music/bass.ly"
-\include "music/keyboard.ly"
+\include "music/keys.ly"
 \include "music/stick.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
+  } { \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 }
 >>
 
 %% 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 = 120 }
 }