X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head-line-engraver.cc;h=f2d3ad8684346d826fc830c9462767254c8b13f9;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=4493ffb7b1134fb959d9f29a1becd9cf15c5d305;hpb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 4493ffb7b1..f2d3ad8684 100644
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  note-head-line-engraver.cc -- implement Note_head_line_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2000--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -13,6 +24,8 @@
 #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,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 ();
 
@@ -38,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;
@@ -51,20 +65,15 @@ void
 Note_head_line_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
   head_ = info.grob ();
-  if (to_boolean (get_property ("followVoice")))
+  Context *tr = find_context_above (context (), ly_symbol2scm ("Staff"));
+  if (tr
+      && tr != last_staff_
+      && 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_)
-	{
-	  if (last_head_)
-	    follow_ = true;
-	  last_staff_ = tr;
-	}
+      if (last_head_)
+        follow_ = true;
     }
+  last_staff_ = tr;
 }
 
 void
@@ -78,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_);
@@ -98,10 +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 "
-		" followVoice is set, staff switches also generate a line.",
-		/* create */ "Glissando VoiceFollower",
-		/* read */ "followVoice",
-		/* write */ "");
+                /* doc */
+                "Engrave a line between two note heads in a staff"
+                " switch if @code{followVoice} is set.",
+
+                /* create */
+                "VoiceFollower ",
+
+                /* read */
+                "followVoice ",
+
+                /* write */
+                ""
+               );