X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fperformer-init.ly;h=d22c42277531198414fcad979d63ea8ef534905a;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=726ffaa6613e926bfd88ae08413b9e94c470a7d7;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 726ffaa661..d22c422775 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -7,11 +7,12 @@
     \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
@@ -38,6 +39,7 @@
     \consists "Note_performer"
     \consists "Beam_performer"
     \consists "Slur_performer"
+    \consists "Melisma_translator"
 }
 
 \context {
@@ -46,12 +48,6 @@
   \alias Voice
 }
 
-\context {
-  \Voice
-  \name VaticanaVoice
-  \alias Voice
-}
-
 \context {
     \Voice
     \remove "Note_performer"
@@ -99,26 +95,13 @@
     \defaultchild "TabVoice"
 }
 
-\context {
-    \type "Performer_group"
-    \name "VaticanaStaff"
-    \alias "Staff"
-    \denies "Voice"
-    \accepts "VaticanaVoice"
-    \defaultchild "VaticanaVoice"
-}
-
 \context {
     \type "Score_performer"
 
     \name Score
     
     melismaBusyProperties = #default-melisma-properties
-    instrumentName = #"bright acoustic"
-
-    %% quarter = 60
-    tempoWholesPerMinute = #(ly:make-moment 15 1)
-    
+    instrument = #"bright acoustic"
     \accepts Staff
     \accepts DrumStaff
     \accepts GrandStaff
@@ -132,14 +115,10 @@
     \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
@@ -154,6 +133,8 @@
     \consists "Staff_performer" % Performer_group ?
     \consists "Lyric_performer"
     \name Lyrics
+    \consists "Time_signature_performer"
+    \consists "Tempo_performer"
 }
 
 \context{
@@ -186,13 +167,6 @@
     \name StaffGroup
     \accepts Staff
     \accepts DrumStaff
-    \accepts TabStaff
-    \accepts RhythmicStaff
-    \accepts GrandStaff
-    \accepts PianoStaff
-    \accepts Lyrics
-    \accepts ChordNames
-    \accepts FiguredBass
 
     \defaultchild Staff
 }