Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index d74ea2651f3074100cd8016d38007fe1f47de947..24f0da2b81b567496217cbce4f1b29c883a3bf0c 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.10.0"
 
 %%
 %% setup for Request->Element conversion. 
@@ -12,8 +12,6 @@
     
     \consists "Staff_performer"
     \consists "Key_performer"
-    \consists "Tempo_performer"
-    \consists "Time_signature_performer"
 }
 \context {
     \name Global
@@ -135,10 +133,13 @@
     \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
@@ -153,8 +154,6 @@
     \consists "Staff_performer" % Performer_group ?
     \consists "Lyric_performer"
     \name Lyrics
-    \consists "Time_signature_performer"
-    \consists "Tempo_performer"
 }
 
 \context{