song2: keys: Don't declare Staff.

diff --git a/02-song2/parts/keys.ly b/02-song2/parts/keys.ly
index 01242bc..7a385a1 100644 (file)
--- a/02-song2/parts/keys.ly
+++ b/02-song2/parts/keys.ly
@@ -71,13 +71,7 @@ keysFinal = \relative c' {
   f8 b r8 d16 f gis1.\trill
 }
 
-keyboard = \new PianoStaff \with {
-  instrumentName = #"Synthesizer"
-  shortInstrumentName = #"Synth"
-  pedalSustainStyle = #'bracket
-}
-<<
-  \new Staff \relative c' {
+keyboard = \relative c' {
     %% Intro
     \time 4/4
     \key b \minor
@@ -90,17 +84,16 @@ keyboard = \new PianoStaff \with {
       \keysB
     }
 
-    \set PianoStaff.midiInstrument = #"choir aahs"
+    \set Staff.midiInstrument = #"choir aahs"
     \key fis \minor
     \keysTransition
     \keysThree
 
-    \set PianoStaff.midiInstrument = #"lead 8 (bass+lead)"
+    \set Staff.midiInstrument = #"lead 8 (bass+lead)"
     \keysMartaRekado
 
-    \set PianoStaff.midiInstrument = #"string ensemble 1"
+    \set Staff.midiInstrument = #"string ensemble 1"
     \keysReprise
-    \set PianoStaff.midiInstrument = #"electric piano 1"
+    \set Staff.midiInstrument = #"electric piano 1"
     \keysFinal
   }
->>