release: 1.3.49

[lilypond.git] / ly / performer.ly

diff --git a/ly/performer.ly b/ly/performer.ly
index f9eafe68e2f3053412df202f56d0ab894c09e7a7..90eddae484739cbbd762436e1609a7844632877c 100644 (file)
--- a/ly/performer.ly
+++ b/ly/performer.ly
@@ -1,7 +1,7 @@
 %
 % setup for Request->Element conversion. Guru-only
 %
-\translator {
+StaffContext = \translator {
        \type "Staff_performer";
        \name Staff;
        \accepts Voice;
@@ -13,41 +13,39 @@
 
        \consists "Key_performer";
        \consists "Time_signature_performer";
+       \consists "Tempo_performer";
+       dynamicStyle = #"dynamic"
+};
+\translator { \StaffContext }
+\translator { \StaffContext
+  \name RhythmicStaff;
 }
 
-%% urg, why (needs praeludium-*.ly) these?
-\translator
-{
-       \type "Performer_group_performer";
-       \consists "Note_performer";
-        \name VoiceFour;
-}
-
-\translator
-{
-       \type "Performer_group_performer";
-       \consists "Note_performer";
-       \name VoiceThree;
-}
-\translator
-{
-       \type "Performer_group_performer";
-       \consists "Note_performer";
-        \name VoiceOne;
-}
 
-\translator
-{
+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;
+};
+\translator { \VoiceContext }
+
+GraceContext = \translator {
+       \type "Performer_group_performer";
+       \name Thread;
        \consists "Note_performer";
        \consists "Tie_performer";
-%      \accepts Grace;
-}
+};
+\translator { \GraceContext }
 
 \translator {
        \type "Grace_performer_group";
-       \name "Grace";
+       \name Grace;
        \consists "Note_performer";
        \consists "Tie_performer";
         weAreGraceContext = "1";
@@ -60,20 +58,25 @@
 
 }
 
-\translator
-{
+GrandStaffContext = \translator {
        \type "Performer_group_performer";
-       \accepts Staff;
        \name GrandStaff;
-}
+       \accepts RhythmicStaff;
+       \accepts Staff;
+};
+\translator { \GrandStaffContext }
 
-\translator {\type "Performer_group_performer";
-       \accepts Staff; \name "PianoStaff";}
+PianoStaffContext = \translator {
+        \type "Performer_group_performer";
+       \name "PianoStaff";
+       \accepts Staff;
+};
+\translator { \PianoStaffContext }
 
 \translator {
        \type "Performer_group_performer";
        \consists "Lyric_performer";
-\name LyricVoice;
+       \name LyricVoice;
 }
 
 \translator{
@@ -86,17 +89,30 @@
        \accepts LyricVoice;
        \name Lyrics;
        \consists "Time_signature_performer";
+       \consists "Tempo_performer";
 }
-\translator
-{
+
+\translator {
+       \type "Staff_performer";
+       \accepts ChordNameVoice;
+       \name ChordNames;
+}
+
+\translator {
+       \type Performer_group_performer;
+       \consists Note_performer;
+       \name ChordNameVoice;   
+}
+
+\translator {
        \type Performer_group_performer;
 
        \name StaffGroup;
        \accepts Staff;
 }
-\translator {
-       \type "Score_performer";
 
+ScoreContext = \translator {
+       \type "Score_performer";
 
        \name Score;
        instrument = "bright acoustic";
@@ -106,6 +122,9 @@
        \accepts Lyrics; 
        \accepts StaffGroup;
        \accepts ChoirStaff;
+       \accepts RhythmicStaff;
+       \accepts ChordNames;
        \consists "Swallow_performer";
-}
+};
+\translator { \ScoreContext }