X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglissando-engraver.cc;h=c1288efaf352a7c6aa9e6572efb8947e4e3af56a;hb=1e631c87d1f5c1e5c448c8604e1d2f7b2ff9b5be;hp=795570866f4453a85f839935fde711dc0c43c453;hpb=947454c5cc430a9627262de4f25274a64789d3c2;p=lilypond.git

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 795570866f..c1288efaf3 100644
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -1,13 +1,12 @@
-/*   
+/*
   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>
- */
+
+  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "warn.hh"
-#include "event.hh"
 #include "spanner.hh"
 #include "rhythmic-head.hh"
 #include "engraver.hh"
@@ -28,9 +27,9 @@ protected:
   virtual bool try_music (Music *);
   virtual void process_music ();
 private:
-  Spanner *line_; 
-  Spanner *last_line_; 
-  Music* event_;
+  Spanner *line_;
+  Spanner *last_line_;
+  Music *event_;
 };
 
 Glissando_engraver::Glissando_engraver ()
@@ -40,7 +39,7 @@ Glissando_engraver::Glissando_engraver ()
 }
 
 bool
-Glissando_engraver::try_music (Music* m)
+Glissando_engraver::try_music (Music *m)
 {
   if (!event_)
     {
@@ -55,39 +54,35 @@ Glissando_engraver::process_music ()
 {
   if (event_)
     {
-      line_ = make_spanner ("Glissando");
-      announce_grob (line_, event_->self_scm ());
+      line_ = make_spanner ("Glissando", event_->self_scm ());
     }
 }
 
-
 void
 Glissando_engraver::acknowledge_grob (Grob_info info)
 {
-  if (Rhythmic_head::has_interface (info.grob_))
+  if (Rhythmic_head::has_interface (info.grob ()))
     {
-      Grob * g = info.grob_;
+      Grob *g = info.grob ();
       if (line_)
 	line_->set_bound (LEFT, g);
 
       if (last_line_)
 	last_line_->set_bound (RIGHT, g);
-    }    
+    }
 }
 
-
 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;
@@ -99,24 +94,22 @@ 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;
     }
 }
 
-
-
-ENTER_DESCRIPTION (Glissando_engraver,
-/* descr */       "Engrave a glissandi",
-/* creats*/       "Glissando",
-/* accepts */     "glissando-event",
-/* acks  */       "rhythmic-head-interface",
-/* reads */       "followVoice",
-/* write */       "");
+ADD_TRANSLATOR (Glissando_engraver,
+		/* descr */ "Engrave a glissandi",
+		/* creats*/ "Glissando",
+		/* accepts */ "glissando-event",
+		/* acks  */ "rhythmic-head-interface",
+		/* reads */ "followVoice",
+		/* write */ "");