release: 1.1.13

[lilypond.git] / init / performer.ly

diff --git a/init/performer.ly b/init/performer.ly
index a45e0ce2716b585597303a18cf4ad4cde76a55fe..105243f5c52385410776b933dfa927b2ad39e46c 100644 (file)
--- a/init/performer.ly
+++ b/init/performer.ly
@@ -1,51 +1,68 @@
 %
 % setup for Request->Element conversion. Guru-only
 %
-
-Staff =        \translator {
+\translator {
        \type "Staff_performer";
        \accepts Voice;
+       \name Staff;
        \consists "Key_performer";
-       \consists "Meter_performer";
+       \consists "Time_signature_performer";
 }
 
-
-Thread =\translator
+\translator
 {
        \type "Performer_group_performer";
+       \name Thread ;
        \consists "Note_performer";
 }
-
-Voice = \translator
+\translator
 {
        \type "Performer_group_performer";
        \accepts Thread;
+\name Voice;
 }
-
-Grandstaff = \translator
+\translator
 {
        \type "Performer_group_performer";
        \accepts Staff;
-}
 
-Lyric_voice = \translator {
+\name GrandStaff;}
+
+\translator {
        \type "Performer_group_performer";
        \consists "Lyric_performer";
+\name LyricVoice;
 }
 
-
-Lyrics = \translator { 
+\translator{
+       \type "Performer_group_performer";
+       \name ChoirStaff;
+       \accepts Staff;
+}
+\translator { 
        \type "Staff_performer";
-       \accepts Lyric_voice;
-       \consists "Meter_performer";
+       \accepts LyricVoice;
+       \name Lyrics;
+       \consists "Time_signature_performer";
 }
+\translator
+{
+       \type Performer_group_performer;
 
-Score = \translator {
+       \name StaffGroup;
+       \accepts Staff;
+}
+\translator {
        \type "Score_performer";
+
+
+       \name Score;
        instrument = piano;
        \accepts Staff;
-       \accepts Grandstaff;
+       \accepts GrandStaff;
        \accepts Lyrics; 
+       \accepts StaffGroup;
+       \accepts ChoirStaff;
        \consists "Swallow_performer";
 }