6 files changed, 109 insertions, 8 deletions
diff --git a/01-song1/01-song1.ly b/01-song1/01-song1.ly
index d01d88a..0dba940 100644
--- a/01-song1/01-song1.ly
+++ b/01-song1/01-song1.ly
@@ -14,10 +14,31 @@
 \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 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
diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
index 232dfed..a88db68 100644
--- a/01-song1/music/keys.ly
+++ b/01-song1/music/keys.ly
@@ -142,7 +142,7 @@ keysEnd = \relative c {
 }
 
 
-keyboard = \new PianoStaff <<
+keyboard = <<
   \new Staff \relative c' {
     \clef "treble_8"
     %% Intro
diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index c10b8c5..8f5271d 100644
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -265,10 +265,7 @@ stickEndRight = {}
 
 
 
-stick = \new PianoStaff <<
-  \set PianoStaff.midiInstrument = #"clav"
-  \set PianoStaff.pedalSustainStyle = #'bracket
-
+stick = <<
   \new Staff \relative c' {
     \set Staff.midiPanPosition = #-0.7
     \key cis \minor
diff --git a/01-song1/parts/bass.ly b/01-song1/parts/bass.ly
new file mode 100644
index 0000000..c11763b
--- /dev/null
+++ b/01-song1/parts/bass.ly
@@ -0,0 +1,25 @@
+\version "2.19.27"
+
+\header {
+  title = "Song 1"
+  subtitle = "Bass"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
+}
+
+\include "../../settings.ly"
+\include "../music/common.ly"
+\include "../music/bass.ly"
+
+\score {
+  \compressMMRests { \bass }
+
+  \layout {
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
+  }
+}
diff --git a/01-song1/parts/keys.ly b/01-song1/parts/keys.ly
new file mode 100644
index 0000000..4770cfc
--- /dev/null
+++ b/01-song1/parts/keys.ly
@@ -0,0 +1,29 @@
+\version "2.19.27"
+
+\header {
+  title = "Song 1"
+  subtitle = "Keyboard"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
+}
+
+\include "../../settings.ly"
+\include "../music/common.ly"
+\include "../music/keys.ly"
+
+\score {
+  \new PianoStaff = "keyboard" \with {
+    pedalSustainStyle = #'bracket
+  } {
+    \tempo 4 = 90
+    \compressMMRests { \keyboard }
+  }
+  \layout {
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
+  }
+}
diff --git a/01-song1/parts/stick.ly b/01-song1/parts/stick.ly
new file mode 100644
index 0000000..83c2c75
--- /dev/null
+++ b/01-song1/parts/stick.ly
@@ -0,0 +1,29 @@
+\version "2.19.27"
+
+\header {
+  title = "Song 1"
+  subtitle = "Grand Stick"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
+}
+
+\include "../../settings.ly"
+\include "../music/common.ly"
+\include "../music/stick.ly"
+
+\score {
+  \new PianoStaff = "grand stick" \with {
+    pedalSustainStyle = #'bracket
+  } {
+    \compressMMRests \stick
+  }
+  \layout {
+    \tempo 4 = 90
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
+  }
+}