Issue 4997/3: Use Preinit in Music

[lilypond.git] / lily / accidental-engraver.cc

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 016433d2ba491aae4524d4791c990855ea25039e..1be735b0ed2dab1d7478370fb38d2daa59bf4be9 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -199,10 +199,7 @@ check_pitch_against_rules (Pitch const &pitch, Context *origin,
       */
       else if (scm_is_symbol (rule))
         {
-          Context *dad = origin;
-          while (dad && !dad->is_alias (rule))
-            dad = dad->get_parent_context ();
-
+          Context *dad = find_context_above (origin, rule);
           if (dad)
             origin = dad;
         }
@@ -514,11 +511,16 @@ Accidental_engraver::process_music ()
     update_local_key_signature (sig);
 }
 
-ADD_ACKNOWLEDGER (Accidental_engraver, arpeggio);
-ADD_ACKNOWLEDGER (Accidental_engraver, finger);
-ADD_ACKNOWLEDGER (Accidental_engraver, rhythmic_head);
-ADD_END_ACKNOWLEDGER (Accidental_engraver, tie);
-ADD_ACKNOWLEDGER (Accidental_engraver, note_column);
+
+void
+Accidental_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Accidental_engraver, arpeggio);
+  ADD_ACKNOWLEDGER (Accidental_engraver, finger);
+  ADD_ACKNOWLEDGER (Accidental_engraver, rhythmic_head);
+  ADD_END_ACKNOWLEDGER (Accidental_engraver, tie);
+  ADD_ACKNOWLEDGER (Accidental_engraver, note_column);
+}
 
 ADD_TRANSLATOR (Accidental_engraver,
                 /* doc */