release: 1.3.93

[lilypond.git] / ly / performer.ly

diff --git a/ly/performer.ly b/ly/performer.ly
index ff373d52197ac71af5d68ab31cd49f5a28b0d949..2b731e183cd8bea2143c1a6a1fb102e371c84231 100644 (file)
--- a/ly/performer.ly
+++ b/ly/performer.ly
@@ -6,17 +6,16 @@ StaffContext = \translator {
        \name Staff;
        \accepts Voice;
 
-       \accepts VoiceOne;              % ugh.
-       \accepts VoiceTwo;
-       \accepts VoiceThree;
-       \accepts VoiceFour;
-
        \consists "Key_performer";
        \consists "Time_signature_performer";
        \consists "Tempo_performer";
        dynamicStyle = #"dynamic"
 };
 \translator { \StaffContext }
+\translator { \StaffContext
+  \name RhythmicStaff;
+}
+
 
 VoiceContext = \translator {
        \type "Performer_group_performer";
@@ -24,19 +23,20 @@ VoiceContext = \translator {
 % All notes fall to Grace if you leave Thread out (huh?)
        \consists "Dynamic_performer";
        \consists "Span_dynamic_performer";
+       \consists "Piano_pedal_performer";
        \consists "Grace_position_performer";
        \accepts Thread;
        \accepts Grace;
 };
 \translator { \VoiceContext }
 
-GraceContext = \translator {
+ThreadContext = \translator {
        \type "Performer_group_performer";
        \name Thread;
        \consists "Note_performer";
        \consists "Tie_performer";
 };
-\translator { \GraceContext }
+\translator { \ThreadContext }
 
 \translator {
        \type "Grace_performer_group";
@@ -56,6 +56,7 @@ GraceContext = \translator {
 GrandStaffContext = \translator {
        \type "Performer_group_performer";
        \name GrandStaff;
+       \accepts RhythmicStaff;
        \accepts Staff;
 };
 \translator { \GrandStaffContext }
@@ -116,8 +117,12 @@ ScoreContext = \translator {
        \accepts Lyrics; 
        \accepts StaffGroup;
        \accepts ChoirStaff;
+       \accepts RhythmicStaff;
        \accepts ChordNames;
        \consists "Swallow_performer";
+
+       dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
+       instrumentEqualizer = #default-instrument-equaliser
 };
 \translator { \ScoreContext }