X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fperformer-init.ly;h=ee0872fb51d9ba9b2d6e0245f13adc692213482a;hb=9304da2bf474a2aa4658e5de035fcbdc534aa99b;hp=c02cf3b7bc8449eb69c39e79499aaf5caab591ef;hpb=8144751cb757612145b419a3ef53c972c1703747;p=lilypond.git

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index c02cf3b7bc..ee0872fb51 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,13 +1,15 @@
-\version "2.3.8"
+\version "2.7.6"
 
-				%
-				% setup for Request->Element conversion. Guru-only
-				%
+%%
+%% setup for Request->Element conversion. 
+%%
 \context {
-    \type "Staff_performer"
+    \type "Performer_group"
     \name Staff
     \accepts Voice
-
+    \defaultchild Voice
+    
+    \consists "Staff_performer"
     \consists "Key_performer"
     \consists "Tempo_performer"
     \consists "Time_signature_performer"
@@ -17,18 +19,21 @@
     \accepts Score
 \description "Hard coded entry point for LilyPond. Cannot be tuned."
     }
+
 \context {
     \Staff
     \name DrumStaff
     midiInstrument = #"drums"
     \accepts DrumVoice
+    \defaultchild DrumVoice
 }
 
 \context {
-    \type "Performer_group_performer"
+    \type "Performer_group"
     \name Voice
-    \consists "Dynamic_performer"
+    % The order of the dynamic performers is significant: absolute dynamic events must override crescendo events in midi.
     \consists "Span_dynamic_performer"
+    \consists "Dynamic_performer"
     \consists "Tie_performer"
     \consists "Piano_pedal_performer"
     \consists "Note_performer"
@@ -37,6 +42,11 @@
     \consists "Melisma_translator"
 }
 
+\context {
+  \Voice
+  \name CueVoice
+  \alias Voice
+}
 
 \context {
     \Voice
@@ -46,40 +56,43 @@
 }
 
 \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 {
@@ -105,15 +118,19 @@
     
     \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"
@@ -121,31 +138,37 @@
 }
 
 \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
+
+    \defaultchild Staff
 }
 
 \context { \Staff \name RhythmicStaff }