circus: Add parts.

6 files changed, 120 insertions, 15 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 }
 }
 
diff --git a/03-circus/music/keyboard.ly b/03-circus/music/keys.ly
index 1500866..0a9d5ad 100644
--- a/03-circus/music/keyboard.ly
+++ b/03-circus/music/keys.ly
@@ -188,9 +188,9 @@ keysBeautyLower = \relative c {
   }
 }
 
-keyboard = \new PianoStaff <<
-  \set PianoStaff.midiInstrument = #"reed organ"
+keyboard = <<
   \new Staff \relative c'  {
+    %%\set Staff.midiInstrument = #"reed organ"
     \time 2/4
     \key cis \minor
     R2 | r4 r8 <cis e g> ~ |
@@ -205,25 +205,26 @@ keyboard = \new PianoStaff <<
 
     %% Spooky!
     \key fis \minor
-    \set PianoStaff.midiInstrument = #"choir aahs"
+    %%\set Staff.midiInstrument = #"choir aahs"
     \repeat volta 2 \keysSpookyUpper
 
     %% Half time feel
     \key b \minor
     \repeat volta 2 {
-      \set PianoStaff.midiInstrument = #"reed organ"
+      %%\set Staff.midiInstrument = #"reed organ"
       \repeat volta 2 \keysHalfUpper
       \keysWeirdUpper
       \keysDanceUpper
     }
 
     %% Beauty
-    \set PianoStaff.midiInstrument = #"string ensemble 1"
+    %%\set Staff.midiInstrument = #"string ensemble 1"
     \keysBeautyUpper
   }
 
   \new Staff \relative c {
     \clef bass
+    %%\set Staff.midiInstrument = #"reed organ"
     \key cis \minor
     r2 | r2 |
     \repeat volta 2 \keyboardIntroLower
@@ -236,6 +237,7 @@ keyboard = \new PianoStaff <<
 
     %% Spooky!
     \key fis \minor
+    %%\set Staff.midiInstrument = #"choir aahs"
     \repeat volta 2 \keysSpookyLower
 
     %% Half time feel
@@ -247,6 +249,7 @@ keyboard = \new PianoStaff <<
     }
 
     %% Beauty
+    %%\set Staff.midiInstrument = #"string ensemble 1"
     \keysBeautyLower
   }
 >>
diff --git a/03-circus/music/stick.ly b/03-circus/music/stick.ly
index 95aef9b..6bc0b3f 100644
--- a/03-circus/music/stick.ly
+++ b/03-circus/music/stick.ly
@@ -303,10 +303,7 @@ stickFinalRight = \relative c {
   fis2. ~ | fis2. |
 }
 
-stick = \new PianoStaff <<
-  \set PianoStaff.midiInstrument = #"clav"
-  \set PianoStaff.pedalSustainStyle = #'bracket
-
+stick = <<
   \new Staff \relative c'  {
     \key cis \minor
     \clef "treble_8"
diff --git a/03-circus/parts/bass.ly b/03-circus/parts/bass.ly
new file mode 100644
index 0000000..3b4dc67
--- /dev/null
+++ b/03-circus/parts/bass.ly
@@ -0,0 +1,24 @@
+\version "2.19.27"
+
+\header {
+  title = "Circus"
+  subtitle = "Bass"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
+}
+
+\include "../../settings.ly"
+\include "../music/bass.ly"
+
+\score {
+  \compressMMRests { \bass }
+
+  \layout {
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
+  }
+}
diff --git a/03-circus/parts/keys.ly b/03-circus/parts/keys.ly
new file mode 100644
index 0000000..c27a121
--- /dev/null
+++ b/03-circus/parts/keys.ly
@@ -0,0 +1,28 @@
+\version "2.19.27"
+
+\header {
+  title = "Circus"
+  subtitle = "Keyboard"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
+}
+
+\include "../../settings.ly"
+\include "../music/keys.ly"
+
+\score {
+  \new PianoStaff = "keyboard" \with {
+    pedalSustainStyle = #'bracket
+  } {
+    \compressMMRests \keyboard
+  }
+  \layout {
+    \tempo 4 = 90
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
+  }
+}
diff --git a/03-circus/parts/stick.ly b/03-circus/parts/stick.ly
new file mode 100644
index 0000000..f3b72c5
--- /dev/null
+++ b/03-circus/parts/stick.ly
@@ -0,0 +1,28 @@
+\version "2.19.27"
+
+\header {
+  title = "Circus"
+  subtitle = "Grand Stick"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
+}
+
+\include "../../settings.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
+    }
+  }
+}