From: fred <fred>
Date: Sun, 24 Mar 2002 19:52:22 +0000 (+0000)
Subject: lilypond-0.0.78
X-Git-Tag: release/1.5.59~4200
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b8177f273b4f5eff71217c82d253784bc5e541d4;p=lilypond.git

lilypond-0.0.78
---

diff --git a/init/performer.ly b/init/performer.ly
index fa184d11e7..27fbcea67e 100644
--- 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 ac5bb9f3b5..812163e04a 100644
--- 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);