X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglissando-engraver.cc;h=da9c0a1156117ae984ce94494c010c433c5fa220;hb=4275096e4a15134ab277b72d9828959d4f5712f1;hp=6c177c43baecfef3400e3cf1fc07b46f1c961b93;hpb=e540311d3f5799216c91d203080f63b65cccde07;p=lilypond.git

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 6c177c43ba..da9c0a1156 100644
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -1,36 +1,38 @@
-/*   
+/*
   note-head-line-engraver.cc -- implement Note_head_line_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
 
-#include "warn.hh"
-#include "event.hh"
-#include "spanner.hh"
-#include "rhythmic-head.hh"
+  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
 #include "engraver.hh"
 
-/**
-   Create line-spanner grobs for glissandi lines that connect note
-   heads.
-*/
+#include "international.hh"
+#include "rhythmic-head.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+#include "item.hh"
+
+#include "translator.icc"
+
 class Glissando_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Glissando_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
+  DECLARE_TRANSLATOR_LISTENER (glissando);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
   virtual void finalize ();
-  virtual void stop_translation_timestep ();
-  virtual bool try_music (Music *);
-  virtual void process_music ();
+
+  void stop_translation_timestep ();
+  void process_music ();
 private:
-  Spanner *line_; 
-  Spanner *last_line_; 
-  Music* event_;
+  Spanner *line_;
+  Spanner *last_line_;
+  Stream_event *event_;
 };
 
 Glissando_engraver::Glissando_engraver ()
@@ -39,54 +41,45 @@ Glissando_engraver::Glissando_engraver ()
   event_ = 0;
 }
 
-bool
-Glissando_engraver::try_music (Music* m)
+IMPLEMENT_TRANSLATOR_LISTENER (Glissando_engraver, glissando);
+void
+Glissando_engraver::listen_glissando (Stream_event *ev)
 {
-  if (!event_)
-    {
-      event_ = m;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 void
 Glissando_engraver::process_music ()
 {
   if (event_)
-    {
-      line_ = make_spanner ("Glissando", event_->self_scm ());
-    }
+    line_ = make_spanner ("Glissando", event_->self_scm ());
 }
 
-
 void
-Glissando_engraver::acknowledge_grob (Grob_info info)
+Glissando_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  if (Rhythmic_head::has_interface (info.grob_))
-    {
-      Grob * g = info.grob_;
-      if (line_)
-	line_->set_bound (LEFT, g);
+  Grob *g = info.grob ();
+  if (line_)
+    line_->set_bound (LEFT, g);
 
-      if (last_line_)
-	last_line_->set_bound (RIGHT, g);
-    }    
+  if (last_line_)
+    {
+      last_line_->set_bound (RIGHT, g);
+      announce_end_grob (last_line_, g->self_scm ());
+    }      
 }
 
-
 void
 Glissando_engraver::stop_translation_timestep ()
 {
   if (last_line_ && last_line_->get_bound (RIGHT))
     {
-      typeset_grob (last_line_);
-      last_line_ =0;
+      last_line_ = 0;
     }
   if (line_)
     {
-      if ( last_line_)
-	programming_error ("Overwriting glissando.");
+      if (last_line_)
+	programming_error ("overwriting glissando");
       last_line_ = line_;
     }
   line_ = 0;
@@ -98,24 +91,29 @@ Glissando_engraver::finalize ()
 {
   if (line_)
     {
-      String msg = _("Unterminated glissando.");
-      
+      string msg = _ ("unterminated glissando");
+
       if (event_)
 	event_->origin ()->warning (msg);
       else
 	warning (msg);
-      
+
       line_->suicide ();
-      line_ =0;
+      line_ = 0;
     }
 }
 
+ADD_ACKNOWLEDGER (Glissando_engraver, rhythmic_head);
+ADD_TRANSLATOR (Glissando_engraver,
+		/* doc */
+		"Engrave glissandi.",
+
+		/* create */
+		"Glissando ",
 
+		/* read */
+		"",
 
-ENTER_DESCRIPTION (Glissando_engraver,
-/* descr */       "Engrave a glissandi",
-/* creats*/       "Glissando",
-/* accepts */     "glissando-event",
-/* acks  */       "rhythmic-head-interface",
-/* reads */       "followVoice",
-/* write */       "");
+		/* write */
+		""
+		);