release: 1.1.45

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 123d8fb627272caf7d83fe340a9c569aeac4b9a4..492d6b981b5314ea227c461255991318ee6c0018 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -50,6 +50,7 @@ StaffContext=\translator {
 
 
        \consists "Separating_line_group_engraver";
+       \consists "Font_size_engraver";
          
        \accepts "Voice";
        dynamicStyle = "dynamic";
@@ -59,15 +60,16 @@ StaffContext=\translator {
 \translator {
        \type "Engraver_group_engraver";
        \name ChoirStaff;
-       \consists "Vertical_align_engraver";
        alignmentReference = \center;   
        \consists "Staff_group_bar_engraver";
+
        \consistsend "Axis_group_engraver";
        \accepts "Staff";
        \accepts "RhythmicStaff";
        \accepts "GrandStaff";
        \accepts "PianoStaff";
-       
+
+               
        \accepts "Lyrics";
        \accepts "ChordNames";
 }
@@ -90,7 +92,7 @@ RhythmicStaffContext=\translator{
 \translator{\RhythmicStaffContext}
 VoiceContext = \translator {
        \type "Engraver_group_engraver";
-       \consists "Dynamic_engraver";
+       \consists "Dynamic_engraver";   % must come before text_engraver.
        \name Voice ;
        beamAuto = "1";
        
@@ -100,7 +102,7 @@ VoiceContext = \translator {
        \consists "Beam_engraver";
        \consists "Auto_beam_engraver";
        \include "auto-beam-settings.ly";
-       \consists "Abbreviation_beam_engraver";
+%      \consists "Abbreviation_beam_engraver";
 %      \consists "Multi_measure_rest_engraver";
 
        % ugh.  Order matters here.
@@ -112,31 +114,39 @@ VoiceContext = \translator {
        \consists "Slur_engraver";
        \consists "Tie_engraver";
        \consists "Tuplet_engraver";    
-       \consists "Note_heads_engraver" ;       
        \consists "Skip_req_swallow_translator";
+       \accepts Thread; % bug if you leave out this!
 };
 
 \translator {\VoiceContext}
 
+ThreadContext = \translator{
+       \type Engraver_group_engraver;
+       \consists "Note_heads_engraver" ;       
+       \name Thread;
+};
+
+\translator{\ThreadContext}
 GrandStaffContext=\translator{
        \type "Engraver_group_engraver";
        \name GrandStaff;
        \consists "Span_bar_engraver";
-       \consists "Vertical_align_engraver";
        \consists "Piano_bar_engraver";
-       alignmentReference = \center;
-       minVerticalAlign = 1.5*\staffheight;
 
-       \consistsend "Axis_group_engraver";
+
        \accepts "Staff";
 
 };
 \translator{\GrandStaffContext}
 
 PianoStaffContext = \translator{\GrandStaffContext
+       alignmentReference = \center;
+
+       \consists "Vertical_align_engraver";
        minVerticalAlign = 3.0*\staffheight;
        maxVerticalAlign = 3.0*\staffheight;
 
+%      \consistsend "Axis_group_engraver";
        \name "PianoStaff";
        
 };
@@ -144,8 +154,7 @@ PianoStaffContext = \translator{\GrandStaffContext
 StaffGroupContext= \translator {
        \type "Engraver_group_engraver";
        \consists "Span_bar_engraver";
-       \consists "Vertical_align_engraver";
-       alignmentReference = \center;
+
        
        \consists "Staff_group_bar_engraver";
        \name StaffGroup;
@@ -156,8 +165,6 @@ StaffGroupContext= \translator {
        
        \accepts "Lyrics";
        \accepts "ChordNames";
-       \consistsend "Axis_group_engraver";
-
 };
 \translator { \StaffGroupContext }
 
@@ -169,13 +176,13 @@ StaffGroupContext= \translator {
        \consists "Separating_line_group_engraver";
        \consists "Lyric_engraver";
        \consists "Extender_engraver";
-       \consists "Beam_req_swallow_translator";
 }
 
 \translator {
        \type "Engraver_group_engraver";
        \name Lyrics;
-       \consists "Vertical_align_engraver";
+       \consists Vertical_align_engraver;%need this for getting folded repeats right.
+
        \consistsend "Axis_group_engraver";
        
        \accepts "LyricVoice";
@@ -194,7 +201,6 @@ StaffGroupContext= \translator {
 ChordNameContext = \translator {
        \type "Engraver_group_engraver";
        \name ChordNames;
-       \consists "Vertical_align_engraver";
        \accepts "ChordNameVoice";
        \consistsend "Axis_group_engraver";
        };