X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head-line-engraver.cc;h=f2d3ad8684346d826fc830c9462767254c8b13f9;hb=8522deaaf7844bcd4604ed61e6073d99feb1c518;hp=7d5062a28779541d43f232d877dada64284e261e;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 7d5062a287..f2d3ad8684 100644
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include "spanner.hh"
 #include "item.hh"
 
-
 /**
    Create line-spanner grobs for lines that connect note heads.
 
@@ -40,7 +39,7 @@ public:
   TRANSLATOR_DECLARATIONS (Note_head_line_engraver);
 
 protected:
-  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void acknowledge_rhythmic_head (Grob_info);
   void process_acknowledged ();
   void stop_translation_timestep ();
 
@@ -52,7 +51,8 @@ private:
   Grob *last_head_;
 };
 
-Note_head_line_engraver::Note_head_line_engraver ()
+Note_head_line_engraver::Note_head_line_engraver (Context *c)
+  : Engraver (c)
 {
   line_ = 0;
   follow_ = false;
@@ -65,13 +65,9 @@ void
 Note_head_line_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
   head_ = info.grob ();
-  Context *tr = context ();
-
-  while (tr && !tr->is_alias (ly_symbol2scm ("Staff")))
-    tr = tr->get_parent_context ();
-
+  Context *tr = find_context_above (context (), ly_symbol2scm ("Staff"));
   if (tr
-      && tr->is_alias (ly_symbol2scm ("Staff")) && tr != last_staff_
+      && tr != last_staff_
       && to_boolean (get_property ("followVoice")))
     {
       if (last_head_)
@@ -91,7 +87,7 @@ Note_head_line_engraver::process_acknowledged ()
       Should probably store follow_ in line_, and suicide at some
       later point */
       if (follow_)
-	line_ = make_spanner ("VoiceFollower", head_->self_scm ());
+        line_ = make_spanner ("VoiceFollower", head_->self_scm ());
 
       line_->set_bound (LEFT, last_head_);
       line_->set_bound (RIGHT, head_);
@@ -111,20 +107,23 @@ Note_head_line_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER (Note_head_line_engraver, rhythmic_head);
+void
+Note_head_line_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Note_head_line_engraver, rhythmic_head);
+}
+
 ADD_TRANSLATOR (Note_head_line_engraver,
-		/* doc */
-		"Engrave a line between two note heads, for example a"
-		" glissando.  If @code{followVoice} is set, staff switches"
-		" also generate a line.",
+                /* doc */
+                "Engrave a line between two note heads in a staff"
+                " switch if @code{followVoice} is set.",
 
-		/* create */
-		"Glissando "
-		"VoiceFollower ",
+                /* create */
+                "VoiceFollower ",
 
-		/* read */
-		"followVoice ",
+                /* read */
+                "followVoice ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );