release: 1.1.62

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 4be101d52dd77032e9acad07b56dd87b7e8c4bce..4c21a7d1f5826eb1e0d35f2f5d830cf93058cbd5 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -9,31 +9,21 @@ StaffContext=\translator {
        voltaVisibility = "1";
 
        \consists "Multi_measure_rest_engraver";
-       \consists "Repeat_engraver";
        \consists "Bar_engraver";
+ % Bar_engraver must be first so default bars aren't overwritten
+% with empty ones.
+       \consists "Repeat_engraver";
        \consists "Clef_engraver";
        \consists "Key_engraver";
        \consists "Time_signature_engraver";
        \consists "Staff_symbol_engraver";
        \consists "Collision_engraver";
        \consists "Rest_collision_engraver";
+       \consists "Local_key_engraver";
+
        \consistsend "Axis_group_engraver";
 
-%{
-       Uncomment to get bar numbers on single staff systems:
-       
-       The Bar_number_engraver puts a number over a staff created
-       at the same level of hierarchy.  This why you have to add it
-       here separately if you want to have numbers on single staff
-       systems: The Bar_number_engraver in Score_engraver will only
-       put numbers on bars that are Score ("system") wide.  Such
-       bars are only created when the toplevel system has multiple
-       children-staffs.
 
-%}
-%{
-       \consists "Bar_number_engraver";
-%}
 
 %{
        The Staff_margin_engraver puts the name of the instrument
@@ -77,6 +67,7 @@ StaffContext=\translator {
 RhythmicStaffContext=\translator{
        \type "Engraver_group_engraver";
        numberOfStaffLines  = "1";
+       barSize = \staffheight;
        \consists "Pitch_squash_engraver";
        \consists "Separating_line_group_engraver";     
        \name RhythmicStaff;
@@ -93,27 +84,27 @@ VoiceContext = \translator {
        \type "Engraver_group_engraver";
        \consists "Dynamic_engraver";   % must come before text_engraver.
        \name Voice ;
-       beamAuto = "1";
-       \consists "Local_key_engraver";
-       
+
+       \consists "Tie_engraver";
        \consists "Breathing_sign_engraver";
        \consists "Rest_engraver";
        \consists "Dot_column_engraver";
        \consists "Stem_engraver";
        \consists "Beam_engraver";
+       beamAuto = "1";
        \consists "Auto_beam_engraver";
        \include "auto-beam-settings.ly";
 %      \consists "Abbreviation_beam_engraver";
 %      \consists "Multi_measure_rest_engraver";
 
        % ugh.  Order matters here.
+       \consists "Melisma_engraver";
        \consists "Text_engraver";
        \consists "Script_engraver";
        \consists "Script_column_engraver";
        \consists "Rhythmic_column_engraver";
        \consists "Font_size_engraver";
        \consists "Slur_engraver";
-       \consists "Tie_engraver";
        \consists "Tuplet_engraver";
        \consists "Grace_position_engraver";
        \consists "Skip_req_swallow_translator";
@@ -125,18 +116,26 @@ GraceContext=\translator {
        \type "Grace_engraver_group";
        \name "Grace";
        \consists "Note_heads_engraver";
+       \consists "Local_key_engraver";
        \consists "Stem_engraver";
-       \consists "Slur_engraver";
-       \consists "Timing_engraver";    %UGH.
        \consists "Beam_engraver";
+       beamAuto = "1";
+       \consists "Slur_engraver";
+       \consists "Auto_beam_engraver";
+       \include "auto-beam-settings.ly";
        \consists "Align_note_column_engraver";
        \consists "Font_size_engraver";
        \consists "Rhythmic_column_engraver";
-       
+       \consists "Dynamic_engraver";
+
+       stemStyle = "grace";
+       weAreGraceContext = "1";
        fontSize = "-1";
        stemLength = "6.0";
        verticalDirection = "1";
+       graceAccidentalSpace= 1.5 * \interline;
 };
+
 \translator{\GraceContext}
 \translator {\VoiceContext}
 
@@ -196,6 +195,7 @@ StaffGroupContext= \translator {
        \consists "Separating_line_group_engraver";
        \consists "Lyric_engraver";
        \consists "Extender_engraver";
+       \consists "Hyphen_engraver";
 }
 
 \translator {