X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglissando-engraver.cc;h=488d22e2f0db69d44779503ead11cdd291ca5b95;hb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;hp=7f4f1823bd869145d186addffdfc0a5a2a2a3b6c;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 7f4f1823bd..488d22e2f0 100644
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -3,33 +3,36 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "warn.hh"
-#include "spanner.hh"
-#include "rhythmic-head.hh"
 #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:
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
+  DECLARE_TRANSLATOR_LISTENER (glissando);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
   virtual void finalize ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  virtual bool try_music (Music *);
-  PRECOMPUTED_VIRTUAL void process_music ();
+
+  void stop_translation_timestep ();
+  void process_music ();
 private:
   Spanner *line_;
   Spanner *last_line_;
-  Music *event_;
+  Stream_event *event_;
 };
 
 Glissando_engraver::Glissando_engraver ()
@@ -38,24 +41,18 @@ 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
@@ -66,7 +63,10 @@ Glissando_engraver::acknowledge_rhythmic_head (Grob_info info)
     line_->set_bound (LEFT, g);
 
   if (last_line_)
-    last_line_->set_bound (RIGHT, g);
+    {
+      last_line_->set_bound (RIGHT, g);
+      announce_end_grob (last_line_, g->self_scm ());
+    }      
 }
 
 void
@@ -91,7 +91,7 @@ Glissando_engraver::finalize ()
 {
   if (line_)
     {
-      String msg = _ ("unterminated glissando");
+      string msg = _ ("unterminated glissando");
 
       if (event_)
 	event_->origin ()->warning (msg);
@@ -103,12 +103,17 @@ Glissando_engraver::finalize ()
     }
 }
 
-#include "translator.icc"
-
-ADD_ACKNOWLEDGER(Glissando_engraver,rhythmic_head);
+ADD_ACKNOWLEDGER (Glissando_engraver, rhythmic_head);
 ADD_TRANSLATOR (Glissando_engraver,
-		/* descr */ "Engrave a glissandi",
-		/* creats*/ "Glissando",
-		/* accepts */ "glissando-event",
-		/* reads */ "followVoice",
-		/* write */ "");
+		/* doc */
+		"Engrave glissandi.",
+
+		/* create */
+		"Glissando ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);