release: 1.1.64

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 10adf06a5534ae50e9142c99f189aad57f36295d..7cca986936e887d0d148aaa14f3dc693969d58eb 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -9,14 +9,18 @@ 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";
 
 
@@ -78,10 +82,11 @@ RhythmicStaffContext=\translator{
 \translator{\RhythmicStaffContext}
 VoiceContext = \translator {
        \type "Engraver_group_engraver";
+       dynamicPadding = "5.0";
        \consists "Dynamic_engraver";   % must come before text_engraver.
        \name Voice ;
-       \consists "Local_key_engraver";
-       
+
+       \consists "Tie_engraver";
        \consists "Breathing_sign_engraver";
        \consists "Rest_engraver";
        \consists "Dot_column_engraver";
@@ -94,13 +99,14 @@ VoiceContext = \translator {
 %      \consists "Multi_measure_rest_engraver";
 
        % ugh.  Order matters here.
+       \consists "Melisma_engraver";
+       textScriptPadding = "3.0";
        \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";
@@ -114,21 +120,22 @@ GraceContext=\translator {
        \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}
@@ -190,6 +197,7 @@ StaffGroupContext= \translator {
        \consists "Separating_line_group_engraver";
        \consists "Lyric_engraver";
        \consists "Extender_engraver";
+       \consists "Hyphen_engraver";
 }
 
 \translator {