release: 1.5.25

[lilypond.git] / ly / engraver-init.ly

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 8ed003ee386bab90b64eeccab8832955b3f4105c..1df040265a1d63f58987dd0257d680542ede4f69 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -141,9 +141,9 @@ VoiceContext = \translator {
  Must come before text_engraver, but after note_column engraver.
 
 %}
+       \consists "Text_engraver"
        \consists "Dynamic_engraver"
        \consists "Fingering_engraver"
-%      \consists "Text_engraver"
 
        \consists "Script_engraver"
        \consists "Script_column_engraver"
@@ -382,10 +382,6 @@ ScoreContext = \translator {
        tupletNumberFormatFunction = #denominator-tuplet-formatter
        
        subdivideBeams = ##f
-       extraNatural = ##t
-       autoAccidentals = #'(same-octave)
-       autoCautionaries = #'()  
-
 
        keyAccidentalOrder = #'(
          (6 . -1) (2  . -1) (5 . -1 ) (1  . -1) (4  . -1) (0  . -1) (3  . -1)