Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 454227c297392225089b8fbcb7e3fb7805bae138..4806758b002cfd7c854aa2cd6835d6c753312da9 100644 (file)
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 /*
@@ -13,9 +13,13 @@
   automatically is the end of the trill?
 */
 
+#include "engraver.hh"
+
+#include "international.hh"
 #include "note-column.hh"
 #include "side-position-interface.hh"
-#include "engraver.hh"
+
+#include "translator.icc"
 
 class Trill_spanner_engraver : public Engraver
 {
@@ -23,10 +27,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 *);
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
   Spanner *span_;
@@ -64,9 +68,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_;
@@ -78,9 +80,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];
@@ -92,12 +92,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 ()));
@@ -145,10 +145,10 @@ Trill_spanner_engraver::finalize ()
     }
 }
 
+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 */ "");