lilypond-0.0.78

diff --git a/init/performer.ly b/init/performer.ly
index fa184d11e7728be5273e5ce514c23fc6d5889154..27fbcea67e77e482e8e570d0920b2a1a72a381cd 100644 (file)
--- a/init/performer.ly
+++ b/init/performer.ly
@@ -1,30 +1,46 @@
 %
 % setup for Request->Element conversion. Guru-only
 %
+staff_perf =   \requesttranslator {
+               Performer "Staff_performer"
+               \alias "Staff";
 
-\requesttranslator {
+               \contains\requesttranslator{
+                       Performer "Performer_group_performer"
+                       \alias "Voice_group";
+                       \contains\requesttranslator{
+                               Performer "Performer_group_performer"
+                               \consists "Note_performer";
+                       }
+               }
+               \consists "Key_performer";
+               \consists "Meter_performer";
+       }
+
+default_midi_perf = \requesttranslator {
        Performer "Score_performer"
        \alias "Score";
-%      \consists "Clef_performer";
-%      \consists "Key_performer";
-%      \consists "Meter_performer";
+
 %      \consists "Tempo_performer";
 
-       \contains\requesttranslator {
+       \contains \requesttranslator{ \staff_perf }
+       \contains\requesttranslator{
+               Performer "Performer_group_performer"
+               \alias "Piano";
+               \contains\requesttranslator{\staff_perf}
+       }
+       \contains\requesttranslator{
                Performer "Staff_performer"
-               \alias "Midi";
-               \contains\requesttranslator{
-                       Performer "Voice_group_performer"
-                       \alias "Voice_group";
+               \alias "Lyric";
+               \contains\requesttranslator {
+                       Performer "Performer_group_performer"
                        \contains\requesttranslator{
                                Performer "Performer_group_performer"
                                \consists "Lyric_performer";
-                               \consists "Note_performer";
-                               
                        }
                }
-               \consists "Key_performer";
                \consists "Meter_performer";
-               \consists "Swallow_performer";
        }
+       \consists "Swallow_performer";
 }
+

diff --git a/lily/meter-performer.cc b/lily/meter-performer.cc
index ac5bb9f3b5ca4efdeeb350bb3910584e93943c85..812163e04a39fbc8662cd02df66c20257c031208 100644 (file)
--- a/lily/meter-performer.cc
+++ b/lily/meter-performer.cc
@@ -10,8 +10,6 @@
 #include "command-request.hh"
 #include "midi-item.hh"
 
-
-
 IMPLEMENT_IS_TYPE_B1(Meter_performer,Performer);
 ADD_THIS_PERFORMER(Meter_performer);