song2: stick: Part file for only Grand Stick.

3 files changed, 36 insertions, 11 deletions

diff --git a/02-song2/02-song2.ly b/02-song2/02-song2.ly
index 0da7ec4..4026d32 100644
--- a/02-song2/02-song2.ly
+++ b/02-song2/02-song2.ly
@@ -29,7 +29,12 @@ AllMusic = <<
     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 }
 >>
 
 %% Two scores are needed: one with unfolded repeats for MIDI and the
diff --git a/02-song2/instr/stick.ly b/02-song2/instr/stick.ly
new file mode 100644
index 0000000..ea92b50
--- /dev/null
+++ b/02-song2/instr/stick.ly
@@ -0,0 +1,27 @@
+\version "2.19.27"
+
+\header {
+  title = "Song 2"
+  subtitle = "Grand Stick"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
+}
+
+\include "parts/stick.ly"
+
+\score {
+  \new PianoStaff = "grand stick" \with {
+    pedalSustainStyle = #'bracket
+  } {
+    \compressMMRests \stick
+  }
+  \layout {
+    \tempo 4 = 90
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
+  }
+}
diff --git a/02-song2/parts/stick.ly b/02-song2/parts/stick.ly
index d206461..b17cfcb 100644
--- a/02-song2/parts/stick.ly
+++ b/02-song2/parts/stick.ly
@@ -205,14 +205,8 @@ stickFinalRight = \relative c' {
   f8 b' r8 d16 f gis1.
 }
 
-stick = \new PianoStaff \with {
-  instrumentName = #"Grand Stick"
-  shortInstrumentName = #"Stick"
-  midiInstrument = #"clav"
-  pedalSustainStyle = #'bracket
-}
-<<
-  \new Staff \relative c' {
+stick = <<
+  \new Staff = "stick right" \relative c' {
     \clef "treble_8"
     \set Staff.midiPanPosition = #-0.5
     \key b \minor
@@ -244,7 +238,7 @@ stick = \new PianoStaff \with {
   }
 
   %% staff for left hand side
-  \new Staff \relative c  {
+  \new Staff = "stick left" \relative c  {
     \clef "bass"
     \set Staff.midiPanPosition = #0.5
     \key b \minor
@@ -273,4 +267,3 @@ stick = \new PianoStaff \with {
     \stickFinalLeft
   }
 >>
-