Clean up inconsistencies in engraver-init.ly and performer-init.ly

[lilypond.git] / ly / performer-init.ly

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 645c8ee45a79a03422b5e974dc2cb292ea3dc5c3..0942116dcef34cfc47a3d05c42cf537c78697c99 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -16,7 +16,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.17.14"
+\version "2.19.16"
 
 %%
 %% setup for Request->Element conversion.
@@ -24,9 +24,9 @@
 \context {
   \type "Performer_group"
   \name Staff
-  \accepts Voice
   \accepts CueVoice
   \accepts NullVoice
+  \accepts Voice
   \defaultchild Voice
 
   \consists "Staff_performer"
@@ -42,45 +42,56 @@
 }
 
 \context {
-  \type "Performer_group"
+  \Staff
   \name KievanStaff
+  \alias Staff
   \denies Voice
   \accepts KievanVoice
   \defaultchild KievanVoice
-  \alias Staff
-  \consists "Staff_performer"
-  \consists "Key_performer"
-  \consists "Midi_control_function_performer"
 }
 
 \context {
-  \type "Performer_group"
+  \Staff
   \name VaticanaStaff
   \alias Staff
   \denies Voice
   \accepts VaticanaVoice
   \defaultchild VaticanaVoice
-  \consists "Staff_performer"
-  \consists "Key_performer"
-  \consists "Midi_control_function_performer"
 }
 
 \context {
-  \type "Performer_group"
+  \Staff
   \name MensuralStaff
+  \alias Staff
   \denies Voice
   \accepts MensuralVoice
   \defaultchild MensuralVoice
+}
+
+\context {
+  \Staff
+  \name PetrucciStaff
   \alias Staff
-  \consists "Staff_performer"
-  \consists "Key_performer"
-  \consists "Midi_control_function_performer"
+  \denies Voice
+  \accepts PetrucciVoice
+  \defaultchild PetrucciVoice
+}
+
+\context {
+  \Staff
+  \name GregorianTranscriptionStaff
+  \alias Staff
+  \denies Voice
+  \accepts GregorianTranscriptionVoice
+  \defaultchild GregorianTranscriptionVoice
 }
 
 \context {
   \Staff
   \name DrumStaff
+  \alias Staff
   midiInstrument = #"drums"
+  \denies Voice
   \accepts DrumVoice
   \defaultchild DrumVoice
 }
@@ -103,46 +114,46 @@
 }
 
 \context {
-  \type "Performer_group"
+  \Voice
   \name VaticanaVoice
   \alias Voice
-  \consists "Dynamic_performer"
-  \consists "Tie_performer"
-  \consists "Note_performer"
-  \consists "Beam_performer"
-  autoBeaming = ##f  % needed for consistent melismata with engravers
-  \consists "Slur_performer"
+  autoBeaming = ##f  % needed for consistent melismata with engravers"
 }
 
 \context {
-  \type "Performer_group"
+  \Voice
   \name KievanVoice
   \alias Voice
-  \consists "Dynamic_performer"
-  \consists "Tie_performer"
-  \consists "Note_performer"
-  \consists "Beam_performer"
-  autoBeaming = ##f  % needed for consistent melismata with engravers
-  \consists "Slur_performer"
+  autoBeaming = ##f  % needed for consistent melismata with engravers"
 }
 
 \context {
-  \type "Performer_group"
+  \Voice
   \name MensuralVoice
   \alias Voice
-  \consists "Dynamic_performer"
-  \consists "Tie_performer"
-  \consists "Note_performer"
-  \consists "Beam_performer"
   autoBeaming = ##f  % needed for consistent melismata with engravers
-  \consists "Slur_performer"
 }
 
 \context {
   \Voice
+  \name PetrucciVoice
+  \alias Voice
+  autoBeaming = ##f  % needed for consistent melismata with engravers
+}
+
+\context {
+  \Voice
+  \name GregorianTranscriptionVoice
+  \alias Voice
+  autoBeaming = ##f  % needed for consistent melismata with engravers
+}
+
+\context {
+  \Voice
+  \name DrumVoice
+  \alias Voice
   \remove "Note_performer"
   \consists "Drum_note_performer"
-  \name DrumVoice
 }
 
 \context {
@@ -153,33 +164,40 @@
 \context {
   \type "Performer_group"
   \name FretBoards
+  \alias Staff
 }
 
 \context {
   \type "Performer_group"
   \name GrandStaff
+  \accepts ChordNames
+  \accepts DrumStaff
+  \accepts Dynamics
+  \accepts FiguredBass
+  \accepts Lyrics
   \accepts RhythmicStaff
   \accepts Staff
-  \accepts Dynamics
+  \accepts TabStaff
   \defaultchild Staff
 }
 
 \context {
-  \type "Performer_group"
-  \name "PianoStaff"
-  \accepts Staff
-  \accepts DrumStaff
-  \defaultchild Staff
+  \GrandStaff
+  \name PianoStaff
+  \alias GrandStaff
 }
 
 \context {
   \Voice
   \name TabVoice
+  \alias Voice
 }
 
 \context {
   \type "Performer_group"
-  \name "Devnull"
+  \name Devnull
+  \alias Voice
+  \alias Staff
 }
 
 \context {
@@ -198,6 +216,7 @@
   \name TabStaff
   midiInstrument = #"acoustic guitar (nylon)"
   \alias Staff
+  \denies Voice
   \accepts TabVoice
   \defaultchild TabVoice
   autoBeaming = ##f  % needed for consistent melismata with engravers
@@ -215,23 +234,26 @@
   %% quarter = 60
   tempoWholesPerMinute = #(ly:make-moment 15/1)
 
-  \accepts Staff
+  \accepts ChoirStaff
+  \accepts ChordNames
+  \accepts Devnull
   \accepts DrumStaff
+  \accepts FiguredBass
   \accepts GrandStaff
-  \accepts PianoStaff
-  \accepts TabStaff
-  \accepts StaffGroup
-  \accepts Devnull
+  \accepts GregorianTranscriptionStaff
+  \accepts KievanStaff
+  \accepts Lyrics
+  \accepts MensuralStaff
+  \accepts NoteNames
   \accepts NullVoice
-  \accepts ChoirStaff
+  \accepts PetrucciStaff
+  \accepts PianoStaff
   \accepts RhythmicStaff
-  \accepts ChordNames
-  \accepts FiguredBass
   \accepts FretBoards
-  \accepts Lyrics
+  \accepts Staff
+  \accepts StaffGroup
+  \accepts TabStaff
   \accepts VaticanaStaff
-  \accepts KievanStaff
-  \accepts MensuralStaff
 
   \consists "Time_signature_performer"
   \consists "Control_track_performer"
@@ -275,47 +297,59 @@
 \context{
   \type "Performer_group"
   \name ChoirStaff
-  \accepts Staff
+  \accepts ChoirStaff
+  \accepts ChordNames
+  \accepts FiguredBass
   \accepts DrumStaff
+  \accepts GrandStaff
+  \accepts Lyrics
+  \accepts PianoStaff
+  \accepts RhythmicStaff
+  \accepts Staff
+  \accepts StaffGroup
   \defaultchild Staff
 }
 
 \context {
   \type "Performer_group"
   \consists "Staff_performer"
-  \accepts ChordNameVoice
-  \defaultchild ChordNameVoice
-  \name ChordNames
+  \name NoteNames
 }
 
 \context {
-  \Voice
-  \name ChordNameVoice
+  \type "Performer_group"
+  \consists "Staff_performer"
+  \name ChordNames
 }
 
 \context {
   \type "Performer_group"
   \name StaffGroup
-  \accepts Staff
-  \accepts DrumStaff
-  \accepts TabStaff
-  \accepts RhythmicStaff
-  \accepts GrandStaff
-  \accepts PianoStaff
-  \accepts Lyrics
+  \accepts ChoirStaff
   \accepts ChordNames
+  \accepts DrumStaff
   \accepts FiguredBass
   \accepts FretBoards
+  \accepts GrandStaff
+  \accepts Lyrics
+  \accepts PianoStaff
+  \accepts RhythmicStaff
+  \accepts Staff
+  \accepts StaffGroup
+  \accepts TabStaff
   \defaultchild Staff
 }
 
 \context {
   \Staff
   \name RhythmicStaff
+  \alias Staff
+  \defaultchild Voice
 }
 
 \context {
   \type "Performer_group"
   \name Dynamics
+  \alias Voice
   \consists "Piano_pedal_performer"
 }