Merge commit 'origin' into beamlets2

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

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index d22c42277531198414fcad979d63ea8ef534905a..3803396b2075b07e814fdb07448b865d24e4b81d 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.12.0"
 
 %%
 %% setup for Request->Element conversion. 
@@ -7,12 +7,11 @@
     \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
@@ -31,15 +30,12 @@
 \context {
     \type "Performer_group"
     \name Voice
-    % 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 "Dynamic_performer"    
     \consists "Tie_performer"
     \consists "Piano_pedal_performer"
     \consists "Note_performer"
     \consists "Beam_performer"
     \consists "Slur_performer"
-    \consists "Melisma_translator"
 }
 
 \context {
@@ -48,6 +44,12 @@
   \alias Voice
 }
 
+\context {
+  \Voice
+  \name VaticanaVoice
+  \alias Voice
+}
+
 \context {
     \Voice
     \remove "Note_performer"
@@ -95,13 +97,26 @@
     \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
-    instrument = #"bright acoustic"
+    instrumentName = #"bright acoustic"
+
+    %% quarter = 60
+    tempoWholesPerMinute = #(ly:make-moment 15 1)
+    
     \accepts Staff
     \accepts DrumStaff
     \accepts GrandStaff
@@ -115,10 +130,14 @@
     \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
@@ -133,8 +152,6 @@
     \consists "Staff_performer" % Performer_group ?
     \consists "Lyric_performer"
     \name Lyrics
-    \consists "Time_signature_performer"
-    \consists "Tempo_performer"
 }
 
 \context{
@@ -167,6 +184,13 @@
     \name StaffGroup
     \accepts Staff
     \accepts DrumStaff
+    \accepts TabStaff
+    \accepts RhythmicStaff
+    \accepts GrandStaff
+    \accepts PianoStaff
+    \accepts Lyrics
+    \accepts ChordNames
+    \accepts FiguredBass
 
     \defaultchild Staff
 }