X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fperformer-init.ly;h=419d52baa59ab01fa4dd6834d210b10483e27bf0;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=0942116dcef34cfc47a3d05c42cf537c78697c99;hpb=ec074a41f03cf4cd3b914daa1359dd6e0fb2012d;p=lilypond.git

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 0942116dce..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
@@ -283,6 +284,14 @@
   dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
   instrumentEqualizer = #default-instrument-equalizer
   drumPitchTable = #(alist->hash-table midiDrumPitches)
+
+  %% \quoteDuring is supposed to quote everything but we don't admit
+  %% cue events by default in order not to get multiple midi
+  %% renditions in an orchestral score.
+
+  quotedEventTypes = #'(StreamEvent)
+  quotedCueEventTypes = #'()
+
   timing = ##t
 }
 
@@ -301,8 +310,10 @@
   \accepts ChordNames
   \accepts FiguredBass
   \accepts DrumStaff
+  \accepts Dynamics
   \accepts GrandStaff
   \accepts Lyrics
+  \accepts OneStaff
   \accepts PianoStaff
   \accepts RhythmicStaff
   \accepts Staff
@@ -317,9 +328,11 @@
 }
 
 \context {
-  \type "Performer_group"
-  \consists "Staff_performer"
+  \Voice			% We want all the actual performers
   \name ChordNames
+  \alias Staff			% Catch Staff-level overrides like
+				% \key, \transposition
+  \consists "Staff_performer"
 }
 
 \context {
@@ -332,6 +345,7 @@
   \accepts FretBoards
   \accepts GrandStaff
   \accepts Lyrics
+  \accepts OneStaff
   \accepts PianoStaff
   \accepts RhythmicStaff
   \accepts Staff
@@ -340,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