* lily/parser.yy (chord_body_element): add DRUM_PITCH to chords

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

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index b3e27bb34b90efb53899c9e9e5bd2288c3307af9..244f0eb5e4f1b3e13ec41fa9c1032a3afbdcb501 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,129 +1,143 @@
 \version "2.1.19"
 
-%
-% setup for Request->Element conversion. Guru-only
-%
+                               %
+                               % setup for Request->Element conversion. Guru-only
+                               %
 \translator {
-       \type "Staff_performer"
-       \name Staff
-       \accepts Voice
+    \type "Staff_performer"
+    \name Staff
+    \accepts Voice
 
-       \consists "Key_performer"
-       \consists "Tempo_performer"
-       \consists "Time_signature_performer"
+    \consists "Key_performer"
+    \consists "Tempo_performer"
+    \consists "Time_signature_performer"
 
 }
-
 \translator {
-       \type "Performer_group_performer"
-       \name Voice
-       \consists "Dynamic_performer"
-       \consists "Span_dynamic_performer"
-       \consists "Tie_performer"
-       \consists "Piano_pedal_performer"
-       \accepts "Voice"
+    \StaffContext
+    \name DrumStaff
+    \accepts DrumVoice
 }
 
 \translator {
-       \type "Performer_group_performer"
-       \name Voice
-       \consists "Note_performer"
+    \type "Performer_group_performer"
+    \name Voice
+    \consists "Dynamic_performer"
+    \consists "Span_dynamic_performer"
+    \consists "Tie_performer"
+    \consists "Piano_pedal_performer"
 }
 
 \translator {
-       \type "Performer_group_performer"
-       \name FiguredBass 
-       \consists "Swallow_performer"
+    \VoiceContext
+    \name DrumVoice
 }
 
 \translator {
-       \type "Performer_group_performer"
-       \name GrandStaff
-       \accepts RhythmicStaff
-       \accepts Staff
+    \type "Performer_group_performer"
+    \name Voice
+    \consists "Note_performer"
 }
 
 \translator {
-        \type "Performer_group_performer"
-       \name "PianoStaff"
-       \accepts Staff
+    \type "Performer_group_performer"
+    \name FiguredBass 
+    \consists "Swallow_performer"
 }
 
 \translator {
-        \type "Performer_group_performer"
-       \name "TabVoice"
-       \consists "Swallow_performer"
+    \type "Performer_group_performer"
+    \name GrandStaff
+    \accepts RhythmicStaff
+    \accepts Staff
 }
 
 \translator {
-        \type "Performer_group_performer"
-       \name "Devnull"
-       \consists "Swallow_performer"
+    \type "Performer_group_performer"
+    \name "PianoStaff"
+    \accepts Staff
+    \accepts DrumStaff
 }
+
 \translator {
-        \type "Performer_group_performer"
-       \name "TabStaff"
-       \accepts "TabVoice"
+    \type "Performer_group_performer"
+    \name "TabVoice"
+    \consists "Swallow_performer"
 }
 
 \translator {
-       \type "Score_performer"
-
-       \name Score
-       \alias Timing
-       instrument = #"bright acoustic"
-       \accepts Staff
-       \accepts GrandStaff
-       \accepts PianoStaff
-       \accepts TabStaff
-       \accepts StaffGroup
-       \accepts Devnull
-       \accepts ChoirStaff
-       \accepts RhythmicStaff
-       \accepts ChordNames
-       \accepts FiguredBass
+    \type "Performer_group_performer"
+    \name "Devnull"
+    \consists "Swallow_performer"
+}
+\translator {
+    \type "Performer_group_performer"
+    \name "TabStaff"
+    \accepts "TabVoice"
+}
 
-       \alias "Timing"
-       \consists "Timing_translator"
-       \consists "Swallow_performer"
-       
-       dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
-       instrumentEqualizer = #default-instrument-equalizer
+\translator {
+    \type "Score_performer"
+
+    \name Score
+    \alias Timing
+    instrument = #"bright acoustic"
+    \accepts Staff
+    \accepts DrumStaff
+    \accepts GrandStaff
+    \accepts PianoStaff
+    \accepts TabStaff
+    \accepts Staff
+    \accepts StaffGroup
+    \accepts Devnull
+    \accepts ChoirStaff
+    \accepts RhythmicStaff
+    \accepts ChordNames
+    \accepts FiguredBass
+
+    \alias "Timing"
+    \consists "Timing_translator"
+    \consists "Swallow_performer"
+    
+    dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
+    instrumentEqualizer = #default-instrument-equalizer
 }
 
 
 \translator {
-       \type "Staff_performer" % Performer_group_performer ?
-       \consists "Lyric_performer"
-       \name LyricsVoice
-       \consists "Time_signature_performer"
-       \consists "Tempo_performer"
+    \type "Staff_performer" % Performer_group_performer ?
+    \consists "Lyric_performer"
+    \name LyricsVoice
+    \consists "Time_signature_performer"
+    \consists "Tempo_performer"
 }
 
 \translator{
-       \type "Performer_group_performer"
-       \name ChoirStaff
-       \accepts Staff
+    \type "Performer_group_performer"
+    \name ChoirStaff
+    \accepts Staff
+    \accepts DrumStaff
 }
 
 
 \translator {
-       \type "Staff_performer"
-       \accepts ChordNameVoice
-       \name ChordNames
+    \type "Staff_performer"
+    \accepts ChordNameVoice
+    \name ChordNames
 }
 
 \translator {
-       \type "Performer_group_performer"
-       \consists "Note_performer"
-       \name ChordNameVoice    
+    \type "Performer_group_performer"
+    \consists "Note_performer"
+    \name ChordNameVoice       
 }
 
 \translator {
-       \type "Performer_group_performer"
+    \type "Performer_group_performer"
 
-       \name StaffGroup
-       \accepts Staff
+    \name StaffGroup
+    \accepts Staff
+    \accepts DrumStaff
 }
 
 \translator { \StaffContext \name RhythmicStaff }