Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index fd93042b283c42f4c7a812877c1bc04ff1648623..844af53736d41ee467acc036e79b47d938c85412 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,15 @@
   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 "stream-event.hh"
+#include "spanner.hh"
+
+#include "translator.icc"
 
 class Trill_spanner_engraver : public Engraver
 {
@@ -23,84 +29,75 @@ public:
   TRANSLATOR_DECLARATIONS (Trill_spanner_engraver);
 protected:
   virtual void finalize ();
-  virtual void acknowledge_grob (Grob_info);
-  virtual bool try_music (Music *);
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_TRANSLATOR_LISTENER (trill_span);
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
   Spanner *span_;
   Spanner *finished_;
-  Music *current_req_;
-  Drul_array<Music *> req_drul_;
+  Stream_event *current_event_;
+  Drul_array<Stream_event *> event_drul_;
   void typeset_all ();
 };
 
 Trill_spanner_engraver::Trill_spanner_engraver ()
 {
   finished_ = 0;
-  current_req_ = 0;
+  current_event_ = 0;
   span_ = 0;
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
+  event_drul_[START] = 0;
+  event_drul_[STOP] = 0;
 }
 
-bool
-Trill_spanner_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Trill_spanner_engraver, trill_span);
+void
+Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
 {
-  if (m->is_mus_type ("trill-span-event"))
-    {
-      Direction d = to_dir (m->get_property ("span-direction"));
-      req_drul_[d] = m;
-      return true;
-    }
-
-  return false;
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  ASSIGN_EVENT_ONCE (event_drul_[d], ev);
 }
 
 void
 Trill_spanner_engraver::process_music ()
 {
-  if (req_drul_[STOP])
+  if (event_drul_[STOP])
     {
       if (!span_)
-       {
-         req_drul_[STOP]->origin ()->warning (_ ("can't find start of trill spanner"));
-       }
+       event_drul_[STOP]->origin ()->warning (_ ("cannot find start of trill spanner"));
       else
        {
          finished_ = span_;
          span_ = 0;
-         current_req_ = 0;
+         current_event_ = 0;
        }
     }
 
-  if (req_drul_[START])
+  if (event_drul_[START])
     {
-      if (current_req_)
-       {
-         req_drul_[START]->origin ()->warning (_ ("already have a trill spanner"));
-       }
+      if (current_event_)
+       event_drul_[START]->origin ()->warning (_ ("already have a trill spanner"));
       else
        {
-         current_req_ = req_drul_[START];
-         span_ = make_spanner ("TrillSpanner", req_drul_[START]->self_scm ());
+         current_event_ = event_drul_[START];
+         span_ = make_spanner ("TrillSpanner", event_drul_[START]->self_scm ());
          Side_position_interface::set_axis (span_, Y_AXIS);
-         req_drul_[START] = 0;
+         event_drul_[START] = 0;
        }
     }
 }
 
 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_));
+         Side_position_interface::add_support (spans[i], info.grob ());
+         add_bound_item (spans[i], info.grob ());
        }
     }
 }
@@ -129,8 +126,8 @@ Trill_spanner_engraver::stop_translation_timestep ()
     }
 
   typeset_all ();
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
+  event_drul_[START] = 0;
+  event_drul_[STOP] = 0;
 }
 
 void
@@ -139,16 +136,14 @@ Trill_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     {
-      current_req_->origin ()->warning (_ ("unterminated trill spanner"));
-      span_->suicide ();
-      span_ = 0;
+      finished_ = span_;
+      typeset_all ();
     }
 }
 
+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 an event.",
+               /* create */ "TrillSpanner",
+               /* read */ "",
                /* write */ "");