X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fperformer-init.ly;h=b48bd5454d01ba1b6ca7c53d4ff44ae7300e5f18;hb=ba16526a792dc8d4ef4d9ec025c3f1d19d5d165f;hp=bad1bd4155f72d2cdb6eff5503f934fb1163f911;hpb=99720923effaa38725040c546cc4cbb9eb034a31;p=lilypond.git

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index bad1bd4155..b48bd5454d 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,85 +1,109 @@
-\version "2.2.0"
+\version "2.10.0"
 
-				%
-				% setup for Request->Element conversion. Guru-only
-				%
+%%
+%% setup for Request->Element conversion. 
+%%
 \context {
-    \type "Staff_performer"
+    \type "Performer_group"
     \name Staff
     \accepts Voice
-
+    \accepts CueVoice
+    \defaultchild Voice
+    
+    \consists "Staff_performer"
     \consists "Key_performer"
-    \consists "Tempo_performer"
-    \consists "Time_signature_performer"
 }
 \context {
     \name Global
     \accepts Score
 \description "Hard coded entry point for LilyPond. Cannot be tuned."
     }
+
 \context {
-    \StaffContext
+    \Staff
     \name DrumStaff
     midiInstrument = #"drums"
     \accepts DrumVoice
+    \defaultchild DrumVoice
 }
 
 \context {
-    \type "Performer_group_performer"
+    \type "Performer_group"
     \name Voice
-    \consists "Dynamic_performer"
-    \consists "Span_dynamic_performer"
+    \consists "Dynamic_performer"    
     \consists "Tie_performer"
     \consists "Piano_pedal_performer"
     \consists "Note_performer"
     \consists "Beam_performer"
     \consists "Slur_performer"
-    \consists "Melisma_translator"
 }
 
+\context {
+  \Voice
+  \name CueVoice
+  \alias Voice
+}
+
+\context {
+  \Voice
+  \name VaticanaVoice
+  \alias Voice
+}
 
 \context {
-    \VoiceContext
+    \Voice
     \remove "Note_performer"
     \consists "Drum_note_performer" 
     \name DrumVoice
 }
 
 \context {
-    \type "Performer_group_performer"
+    \type "Performer_group"
     \name FiguredBass 
     \consists "Swallow_performer"
 }
 
 \context {
-    \type "Performer_group_performer"
+    \type "Performer_group"
     \name GrandStaff
     \accepts RhythmicStaff
     \accepts Staff
+    \defaultchild Staff
 }
 
 \context {
-    \type "Performer_group_performer"
+    \type "Performer_group"
     \name "PianoStaff"
     \accepts Staff
     \accepts DrumStaff
+    \defaultchild Staff
 }
 
 \context {
-    \type "Performer_group_performer"
+    \type "Performer_group"
     \name "TabVoice"
     \consists "Swallow_performer"
 }
 
 \context {
-    \type "Performer_group_performer"
+    \type "Performer_group"
     \name "Devnull"
     \consists "Swallow_performer"
 }
 \context {
-    \type "Performer_group_performer"
+    \type "Performer_group"
     \name "TabStaff"
     \accepts "TabVoice"
+    \defaultchild "TabVoice"
+}
+
+\context {
+    \type "Performer_group"
+    \name "VaticanaStaff"
+    \alias "Staff"
+    \denies "Voice"
+    \accepts "VaticanaVoice"
+    \defaultchild "VaticanaVoice"
 }
 
 \context {
@@ -88,7 +112,11 @@
     \name Score
     
     melismaBusyProperties = #default-melisma-properties
-    instrument = #"bright acoustic"
+    instrumentName = #"bright acoustic"
+
+    %% quarter = 60
+    tempoWholesPerMinute = #(ly:make-moment 15 1)
+    
     \accepts Staff
     \accepts DrumStaff
     \accepts GrandStaff
@@ -102,52 +130,71 @@
     \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) 
+    drumPitchTable = #(alist->hash-table midiDrumPitches)
+    timing = ##t 
 }
 
 
 \context {
-    \type "Staff_performer" % Performer_group_performer ?
+    \type "Performer_group"
+    \consists "Staff_performer" % Performer_group ?
     \consists "Lyric_performer"
     \name Lyrics
-    \consists "Time_signature_performer"
-    \consists "Tempo_performer"
 }
 
 \context{
-    \type "Performer_group_performer"
+    \type "Performer_group"
     \name ChoirStaff
     \accepts Staff
     \accepts DrumStaff
+    \defaultchild Staff
+
 }
 
 
+
 \context {
-    \type "Staff_performer"
+    \type "Performer_group"
+    \consists "Staff_performer"
     \accepts ChordNameVoice
     \name ChordNames
 }
 
 \context {
-    \type "Performer_group_performer"
+    \type "Performer_group"
     \consists "Note_performer"
     \name ChordNameVoice	
 }
 
 \context {
-    \type "Performer_group_performer"
+    \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 { \StaffContext \name RhythmicStaff }
+\context { \Staff \name RhythmicStaff }