patch::: 1.3.126.jcn3

[lilypond.git] / ly / performer.ly

diff --git a/ly/performer.ly b/ly/performer.ly
index 4529859e7ceb7324d060f62effb55cf75782fb14..c3ba784beaa22be9395adbcc81ceb0514244cc6a 100644 (file)
--- a/ly/performer.ly
+++ b/ly/performer.ly
@@ -6,11 +6,6 @@ StaffContext = \translator {
        \name Staff;
        \accepts Voice;
 
-       \accepts VoiceOne;              % ugh.
-       \accepts VoiceTwo;
-       \accepts VoiceThree;
-       \accepts VoiceFour;
-
        \consists "Key_performer";
        \consists "Time_signature_performer";
        \consists "Tempo_performer";
@@ -48,7 +43,9 @@ ThreadContext = \translator {
        \name Grace;
        \consists "Note_performer";
        \consists "Tie_performer";
-        weAreGraceContext = "1";
+        \consists "Swallow_performer";
+
+        weAreGraceContext = #t
 }
 
 \translator
@@ -76,7 +73,7 @@ PianoStaffContext = \translator {
 \translator {
        \type "Performer_group_performer";
        \consists "Lyric_performer";
-       \name LyricVoice;
+       \name LyricsVoice;
 }
 
 \translator{
@@ -86,7 +83,7 @@ PianoStaffContext = \translator {
 }
 \translator { 
        \type "Staff_performer";
-       \accepts LyricVoice;
+       \accepts LyricsVoice;
        \name Lyrics;
        \consists "Time_signature_performer";
        \consists "Tempo_performer";
@@ -125,6 +122,9 @@ ScoreContext = \translator {
        \accepts RhythmicStaff;
        \accepts ChordNames;
        \consists "Swallow_performer";
+
+       dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
+       instrumentEqualizer = #default-instrument-equaliser
 };
 \translator { \ScoreContext }