Issue 4865/2: Rewrite of new translator initializations

[lilypond.git] / lily / completion-note-heads-engraver.cc

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index f5abe73e435cc70ef311055201cdf9fb817951a0..e7a5dbc5606d5966f5bacd70da2c3016b6daac83 100644 (file)
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -39,8 +39,6 @@ using namespace std;
 
 #include "translator.icc"
 
-using std::vector;
-
 /*
   How does this work?
 
@@ -91,7 +89,6 @@ Completion_heads_engraver::initialize ()
   is_first_ = false;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Completion_heads_engraver, note);
 void
 Completion_heads_engraver::listen_note (Stream_event *ev)
 {
@@ -166,7 +163,7 @@ Completion_heads_engraver::make_note_head (Stream_event *ev)
   Item *note = make_item ("NoteHead", ev->self_scm ());
   Pitch *pit = unsmob<Pitch> (ev->get_property ("pitch"));
 
-  int pos = pit->steps ();
+  int pos = pit ? pit->steps () : 0;
   SCM c0 = get_property ("middleCPosition");
   if (scm_is_number (c0))
     pos += scm_to_int (c0);
@@ -309,6 +306,12 @@ Completion_heads_engraver::Completion_heads_engraver ()
   tie_column_ = 0;
 }
 
+void
+Completion_heads_engraver::boot ()
+{
+  ADD_LISTENER (Completion_heads_engraver, note);
+}
+
 ADD_TRANSLATOR (Completion_heads_engraver,
                 /* doc */
                 "This engraver replaces @code{Note_heads_engraver}.  It plays"