X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fperformer-init.ly;h=419d52baa59ab01fa4dd6834d210b10483e27bf0;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=8094bb9043d7f3a49324bdad8debf575351167a1;hpb=4e44616a79529d2b2da85057a1cb2c225b968feb;p=lilypond.git

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 8094bb9043..419d52baa5 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -31,7 +31,7 @@
 
   \consists "Staff_performer"
   \consists "Key_performer"
-  \consists "Midi_control_function_performer"
+  \consists "Midi_control_change_performer"
 }
 
 \context {
@@ -238,6 +238,7 @@
   \accepts ChordNames
   \accepts Devnull
   \accepts DrumStaff
+  \accepts Dynamics
   \accepts FiguredBass
   \accepts GrandStaff
   \accepts GregorianTranscriptionStaff
@@ -245,7 +246,7 @@
   \accepts Lyrics
   \accepts MensuralStaff
   \accepts NoteNames
-  \accepts NullVoice
+  \accepts OneStaff
   \accepts PetrucciStaff
   \accepts PianoStaff
   \accepts RhythmicStaff
@@ -309,8 +310,10 @@
   \accepts ChordNames
   \accepts FiguredBass
   \accepts DrumStaff
+  \accepts Dynamics
   \accepts GrandStaff
   \accepts Lyrics
+  \accepts OneStaff
   \accepts PianoStaff
   \accepts RhythmicStaff
   \accepts Staff
@@ -327,6 +330,8 @@
 \context {
   \Voice			% We want all the actual performers
   \name ChordNames
+  \alias Staff			% Catch Staff-level overrides like
+				% \key, \transposition
   \consists "Staff_performer"
 }
 
@@ -340,6 +345,7 @@
   \accepts FretBoards
   \accepts GrandStaff
   \accepts Lyrics
+  \accepts OneStaff
   \accepts PianoStaff
   \accepts RhythmicStaff
   \accepts Staff
@@ -348,6 +354,27 @@
   \defaultchild Staff
 }
 
+\context {
+  \type "Performer_group"
+  \name "OneStaff"
+  \accepts "ChordNames"
+  \accepts "DrumStaff"
+  \accepts "Dynamics"
+  \accepts "FiguredBass"
+  \accepts "FretBoards"
+  \accepts "GregorianTranscriptionStaff"
+  \accepts "KievanStaff"
+  \accepts "Lyrics"
+  \accepts "MensuralStaff"
+  \accepts "NoteNames"
+  \accepts "PetrucciStaff"
+  \accepts "RhythmicStaff"
+  \accepts "Staff"
+  \accepts "TabStaff"
+  \accepts "VaticanaStaff"
+  \defaultchild "Staff"
+}
+
 \context {
   \Staff
   \name RhythmicStaff