X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head-line-engraver.cc;h=152297d9859e25b9b1eefecc1baed79a777e8afb;hb=ceec27ef6c843705a76ac7b66cb20b7ad096cf29;hp=8dde1e86401560354110c49fb807c3d3d8884ffd;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 8dde1e8640..152297d985 100644
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -13,6 +13,9 @@
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
 #include "context.hh"
+#include "spanner.hh"
+#include "item.hh"
+
 
 /**
    Create line-spanner grobs for lines that connect note heads.
@@ -26,9 +29,9 @@ public:
   TRANSLATOR_DECLARATIONS (Note_head_line_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  PRECOMPUTED_VIRTUAL void process_acknowledged ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 
 private:
   Spanner *line_;
@@ -48,24 +51,21 @@ Note_head_line_engraver::Note_head_line_engraver ()
 }
 
 void
-Note_head_line_engraver::acknowledge_grob (Grob_info info)
+Note_head_line_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  if (Rhythmic_head::has_interface (info.grob ()))
+  head_ = info.grob ();
+  if (to_boolean (get_property ("followVoice")))
     {
-      head_ = info.grob ();
-      if (to_boolean (get_property ("followVoice")))
+      Context *tr = context ();
+      while (tr && !tr->is_alias (ly_symbol2scm ("Staff")))
+	tr = tr->get_parent_context ();
+
+      if (tr
+	  && tr->is_alias (ly_symbol2scm ("Staff")) && tr != last_staff_)
 	{
-	  Context *tr = context ();
-	  while (tr && !tr->is_alias (ly_symbol2scm ("Staff")))
-	    tr = tr->get_parent_context ();
-
-	  if (tr
-	      && tr->is_alias (ly_symbol2scm ("Staff")) && tr != last_staff_)
-	    {
-	      if (last_head_)
-		follow_ = true;
-	      last_staff_ = tr;
-	    }
+	  if (last_head_)
+	    follow_ = true;
+	  last_staff_ = tr;
 	}
     }
 }
@@ -101,11 +101,20 @@ Note_head_line_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
+ADD_ACKNOWLEDGER (Note_head_line_engraver, rhythmic_head);
 ADD_TRANSLATOR (Note_head_line_engraver,
-		/* descr */ "Engrave a line between two note heads, for example a glissando.  If "
-		" followVoice is set, staff switches also generate a line.",
-		/* creats*/ "Glissando VoiceFollower",
-		/* accepts */ "glissando-event",
-		/* acks  */ "rhythmic-head-interface",
-		/* reads */ "followVoice",
-		/* write */ "");
+		/* doc */
+		"Engrave a line between two note heads, for example a"
+		" glissando.  If @code{followVoice} is set, staff switches"
+		" also generate a line.",
+
+		/* create */
+		"Glissando "
+		"VoiceFollower ",
+
+		/* read */
+		"followVoice ",
+
+		/* write */
+		""
+		);