X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head-line-engraver.cc;h=4b21bb27673a5bf62fee58851947c79e3ebe5024;hb=ed3e5abd8003297e02e3f90dc8755e33a6619135;hp=9298b72db9581509efaeceff733417988fd35b89;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 9298b72db9..4b21bb2767 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--2011 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
@@ -64,13 +64,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_)
@@ -113,12 +109,10 @@ Note_head_line_engraver::stop_translation_timestep ()
 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.",
+                "Engrave a line between two note heads in a staff"
+                " switch if @code{followVoice} is set.",
 
                 /* create */
-                "Glissando "
                 "VoiceFollower ",
 
                 /* read */