* lily/midi-item.cc (name): new method.

[lilypond.git] / lily / trill-spanner-engraver.cc

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index b5572185612a3e0b0daf84bf7e99dcd24dc216f8..7ee181dd58af5f38eb163a58bc3816b67e7dea12 100644 (file)
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -25,10 +25,10 @@ public:
   TRANSLATOR_DECLARATIONS (Trill_spanner_engraver);
 protected:
   virtual void finalize ();
-  virtual void acknowledge_grob (Grob_info);
+  DECLARE_ACKNOWLEDGER (note_column);
   virtual bool try_music (Music *);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
   Spanner *span_;
@@ -66,9 +66,7 @@ Trill_spanner_engraver::process_music ()
   if (event_drul_[STOP])
     {
       if (!span_)
-       {
-         event_drul_[STOP]->origin ()->warning (_ ("can't find start of trill spanner"));
-       }
+       event_drul_[STOP]->origin ()->warning (_ ("can't find start of trill spanner"));
       else
        {
          finished_ = span_;
@@ -80,9 +78,7 @@ Trill_spanner_engraver::process_music ()
   if (event_drul_[START])
     {
       if (current_event_)
-       {
-         event_drul_[START]->origin ()->warning (_ ("already have a trill spanner"));
-       }
+       event_drul_[START]->origin ()->warning (_ ("already have a trill spanner"));
       else
        {
          current_event_ = event_drul_[START];
@@ -94,12 +90,12 @@ Trill_spanner_engraver::process_music ()
 }
 
 void
-Trill_spanner_engraver::acknowledge_grob (Grob_info info)
+Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
   Spanner *spans[2] ={span_, finished_};
   for (int i = 0; i < 2; i++)
     {
-      if (spans[i] && Note_column::has_interface (info.grob ()))
+      if (spans[i])
        {
          Side_position_interface::add_support (spans[i], info.grob ());
          add_bound_item (spans[i], dynamic_cast<Item *> (info.grob ()));
@@ -146,11 +142,10 @@ Trill_spanner_engraver::finalize ()
       span_ = 0;
     }
 }
-
+ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
 ADD_TRANSLATOR (Trill_spanner_engraver,
-               /* descr */ "Create trill spanner from a Music.",
-               /* creats*/ "TrillSpanner",
-               /* accepts */ "trill-span-event",
-               /* acks  */ "note-column-interface",
-               /* reads */ "",
+               /* doc */ "Create trill spanner from a Music.",
+               /* create */ "TrillSpanner",
+               /* accept */ "trill-span-event",
+               /* read */ "",
                /* write */ "");