Issue 4870: [midi2ly] Delay import of 'midi' module.

[lilypond.git] / lily / kievan-ligature-engraver.cc

diff --git a/lily/kievan-ligature-engraver.cc b/lily/kievan-ligature-engraver.cc
index f56e73c101e4e65d404edc593ff83e69a6e77975..42c48a551e035bef14fba51bf998b8e94d0155b1 100644 (file)
--- a/lily/kievan-ligature-engraver.cc
+++ b/lily/kievan-ligature-engraver.cc
@@ -40,12 +40,12 @@ protected:
 
 public:
   TRANSLATOR_DECLARATIONS (Kievan_ligature_engraver);
+  TRANSLATOR_INHERIT (Coherent_ligature_engraver)
 
 private:
   void fold_up_primitives (vector<Grob_info> const &primitives, Real padding, Real &min_length);
 };
 
-IMPLEMENT_TRANSLATOR_LISTENER (Kievan_ligature_engraver, ligature);
 void
 Kievan_ligature_engraver::listen_ligature (Stream_event *ev)
 {
@@ -81,7 +81,7 @@ Kievan_ligature_engraver::fold_up_primitives (vector<Grob_info> const &primitive
          first = current;
 
       // must keep track of accidentals in spacing problem
-      Grob *acc_gr = Grob::unsmob (current->get_object ("accidental-grob"));
+      Grob *acc_gr = unsmob<Grob> (current->get_object ("accidental-grob"));
       if (acc_gr && i > 0)
         {
            Interval acc_ext = acc_gr->extent (acc_gr, X_AXIS);
@@ -107,7 +107,7 @@ Kievan_ligature_engraver::fold_up_primitives (vector<Grob_info> const &primitive
       if (i < primitives.size () - 1)
         {
            Item *next = dynamic_cast<Item *> (primitives[i + 1].grob ());
-           Grob *acc_gr = Grob::unsmob (next->get_object ("accidental-grob"));
+           Grob *acc_gr = unsmob<Grob> (next->get_object ("accidental-grob"));
            if (acc_gr)
              {
                 Interval acc_ext = acc_gr->extent (acc_gr, X_AXIS);
@@ -135,8 +135,14 @@ Kievan_ligature_engraver::build_ligature (Spanner *ligature,
 
 }
 
-ADD_ACKNOWLEDGER (Kievan_ligature_engraver, rest);
-ADD_ACKNOWLEDGER (Kievan_ligature_engraver, ligature_head);
+
+void
+Kievan_ligature_engraver::boot ()
+{
+  ADD_LISTENER (Kievan_ligature_engraver, ligature);
+  ADD_ACKNOWLEDGER (Kievan_ligature_engraver, rest);
+  ADD_ACKNOWLEDGER (Kievan_ligature_engraver, ligature_head);
+}
 
 ADD_TRANSLATOR (Kievan_ligature_engraver,
                 /* doc */