X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fperformer-init.ly;h=b48bd5454d01ba1b6ca7c53d4ff44ae7300e5f18;hb=f0781acda2e0c2ef936a2c4c2f90b57f989faf6c;hp=748e29229c7659e3f3e3c04712e25de8e52cc2b1;hpb=8d7a55721e3305f745c0b24c367de002dd197825;p=lilypond.git

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 748e29229c..b48bd5454d 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,126 +1,200 @@
-\version "1.3.146"
-%
-% setup for Request->Element conversion. Guru-only
-%
-StaffContext = \translator {
-	\type "Staff_performer"
-	\name Staff
-	\accepts Voice
-
-	\consists "Key_performer"
-	\consists "Tempo_performer"
-	\consists "Time_signature_performer"
-
+\version "2.10.0"
+
+%%
+%% setup for Request->Element conversion. 
+%%
+\context {
+    \type "Performer_group"
+    \name Staff
+    \accepts Voice
+    \accepts CueVoice
+    \defaultchild Voice
+    
+    \consists "Staff_performer"
+    \consists "Key_performer"
 }
-\translator { \StaffContext }
-\translator { \StaffContext
-  \name RhythmicStaff
+\context {
+    \name Global
+    \accepts Score
+\description "Hard coded entry point for LilyPond. Cannot be tuned."
+    }
+
+\context {
+    \Staff
+    \name DrumStaff
+    midiInstrument = #"drums"
+    \accepts DrumVoice
+    \defaultchild DrumVoice
 }
 
-
-VoiceContext = \translator {
-	\type "Performer_group_performer"
-	\name Voice
-	\consists "Dynamic_performer"
-	\consists "Span_dynamic_performer"
-	\consists "Piano_pedal_performer"
-	\accepts "Thread"
+\context {
+    \type "Performer_group"
+    \name Voice
+    \consists "Dynamic_performer"    
+    \consists "Tie_performer"
+    \consists "Piano_pedal_performer"
+    \consists "Note_performer"
+    \consists "Beam_performer"
+    \consists "Slur_performer"
 }
-\translator { \VoiceContext }
 
-ThreadContext = \translator {
-	\type "Performer_group_performer"
-	\name Thread
-	\consists "Note_performer"
-	\consists "Tie_performer"
+\context {
+  \Voice
+  \name CueVoice
+  \alias Voice
 }
-\translator { \ThreadContext }
 
-% retain for compatibility reasons (FIXME: convert-ly)
-\translator {
-	\type "Performer_group_performer"
-	\name Grace
+\context {
+  \Voice
+  \name VaticanaVoice
+  \alias Voice
 }
 
-\translator
-{
-	\type "Performer_group_performer"
-	\name VoiceTwo\consists "Note_performer"
+\context {
+    \Voice
+    \remove "Note_performer"
+    \consists "Drum_note_performer" 
+    \name DrumVoice
+}
 
+\context {
+    \type "Performer_group"
+    \name FiguredBass 
+    \consists "Swallow_performer"
 }
 
-GrandStaffContext = \translator {
-	\type "Performer_group_performer"
-	\name GrandStaff
-	\accepts RhythmicStaff
-	\accepts Staff
+\context {
+    \type "Performer_group"
+    \name GrandStaff
+    \accepts RhythmicStaff
+    \accepts Staff
+    \defaultchild Staff
 }
-\translator { \GrandStaffContext }
 
-PianoStaffContext = \translator {
-        \type "Performer_group_performer"
-	\name "PianoStaff"
-	\accepts Staff
+\context {
+    \type "Performer_group"
+    \name "PianoStaff"
+    \accepts Staff
+    \accepts DrumStaff
+    \defaultchild Staff
 }
-\translator { \PianoStaffContext }
 
-\translator {
-	\type "Performer_group_performer"
-	\consists "Lyric_performer"
-	\name LyricsVoice
+\context {
+    \type "Performer_group"
+    \name "TabVoice"
+    \consists "Swallow_performer"
 }
 
-\translator{
-	\type "Performer_group_performer"
-	\name ChoirStaff
-	\accepts Staff
+\context {
+    \type "Performer_group"
+    \name "Devnull"
+    \consists "Swallow_performer"
 }
-\translator { 
-	\type "Staff_performer"
-	\accepts LyricsVoice
-	\name Lyrics
-	\consists "Time_signature_performer"
-	\consists "Tempo_performer"
+\context {
+    \type "Performer_group"
+    \name "TabStaff"
+    \accepts "TabVoice"
+    \defaultchild "TabVoice"
 }
 
-\translator {
-	\type "Staff_performer"
-	\accepts ChordNameVoice
-	\name ChordNames
+\context {
+    \type "Performer_group"
+    \name "VaticanaStaff"
+    \alias "Staff"
+    \denies "Voice"
+    \accepts "VaticanaVoice"
+    \defaultchild "VaticanaVoice"
 }
 
-\translator {
-	\type Performer_group_performer
-	\consists Note_performer
-	\name ChordNameVoice	
+\context {
+    \type "Score_performer"
+
+    \name Score
+    
+    melismaBusyProperties = #default-melisma-properties
+    instrumentName = #"bright acoustic"
+
+    %% quarter = 60
+    tempoWholesPerMinute = #(ly:make-moment 15 1)
+    
+    \accepts Staff
+    \accepts DrumStaff
+    \accepts GrandStaff
+    \accepts PianoStaff
+    \accepts TabStaff
+    \accepts Staff
+    \accepts StaffGroup
+    \accepts Devnull
+    \accepts ChoirStaff
+    \accepts RhythmicStaff
+    \accepts ChordNames
+    \accepts FiguredBass
+    \accepts Lyrics
+    \accepts VaticanaStaff
+
+    \consists "Time_signature_performer"
+    \consists "Control_track_performer"
+    \consists "Tempo_performer"
+    \consists "Timing_translator"
+    \consists "Swallow_performer"
+    
+    \defaultchild "Staff"
+    
+    dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
+    instrumentEqualizer = #default-instrument-equalizer
+    drumPitchTable = #(alist->hash-table midiDrumPitches)
+    timing = ##t 
+}
+
+
+\context {
+    \type "Performer_group"
+    \consists "Staff_performer" % Performer_group ?
+    \consists "Lyric_performer"
+    \name Lyrics
 }
 
-\translator {
-	\type Performer_group_performer
+\context{
+    \type "Performer_group"
+    \name ChoirStaff
+    \accepts Staff
+    \accepts DrumStaff
+    \defaultchild Staff
 
-	\name StaffGroup
-	\accepts Staff
 }
 
-ScoreContext = \translator {
-	\type "Score_performer"
 
-	\name Score
-	instrument = #"bright acoustic"
-	\accepts Staff
-	\accepts GrandStaff
-	\accepts PianoStaff
-	\accepts Lyrics 
-	\accepts StaffGroup
-	\accepts ChoirStaff
-	\accepts RhythmicStaff
-	\accepts ChordNames
 
-	\consists "Timing_translator"
-	\consists "Swallow_performer"
-	
-	dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
-	instrumentEqualizer = #default-instrument-equalizer
+\context {
+    \type "Performer_group"
+    \consists "Staff_performer"
+    \accepts ChordNameVoice
+    \name ChordNames
 }
-\translator { \ScoreContext }
+
+\context {
+    \type "Performer_group"
+    \consists "Note_performer"
+    \name ChordNameVoice	
+}
+
+\context {
+    \type "Performer_group"
+
+    \name StaffGroup
+    \accepts Staff
+    \accepts DrumStaff
+    \accepts TabStaff
+    \accepts RhythmicStaff
+    \accepts GrandStaff
+    \accepts PianoStaff
+    \accepts Lyrics
+    \accepts ChordNames
+    \accepts FiguredBass
+
+    \defaultchild Staff
+}
+
+\context { \Staff \name RhythmicStaff }
+