release: 1.3.49

[lilypond.git] / ly / performer.ly

diff --git a/ly/performer.ly b/ly/performer.ly
index 44e3272c53d8605c7a6a59af76b1e20bef150eb5..90eddae484739cbbd762436e1609a7844632877c 100644 (file)
--- a/ly/performer.ly
+++ b/ly/performer.ly
@@ -14,33 +14,21 @@ StaffContext = \translator {
        \consists "Key_performer";
        \consists "Time_signature_performer";
        \consists "Tempo_performer";
+       dynamicStyle = #"dynamic"
 };
 \translator { \StaffContext }
-
-%% urg, why (needs praeludium-*.ly) these?
-\translator
-{
-       \type "Performer_group_performer";
-       \consists "Note_performer";
-        \name VoiceFour;
+\translator { \StaffContext
+  \name RhythmicStaff;
 }
 
-\translator
-{
-       \type "Performer_group_performer";
-       \consists "Note_performer";
-       \name VoiceThree;
-}
-\translator {
-       \type "Performer_group_performer";
-       \consists "Note_performer";
-        \name VoiceOne;
-}
 
 VoiceContext = \translator {
        \type "Performer_group_performer";
        \name Voice;
 % 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;
@@ -73,6 +61,7 @@ GraceContext = \translator {
 GrandStaffContext = \translator {
        \type "Performer_group_performer";
        \name GrandStaff;
+       \accepts RhythmicStaff;
        \accepts Staff;
 };
 \translator { \GrandStaffContext }
@@ -133,6 +122,7 @@ ScoreContext = \translator {
        \accepts Lyrics; 
        \accepts StaffGroup;
        \accepts ChoirStaff;
+       \accepts RhythmicStaff;
        \accepts ChordNames;
        \consists "Swallow_performer";
 };