X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head-line-engraver.cc;h=046a26423126567b9bfcd33e7979e49f8f1276ba;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=152297d9859e25b9b1eefecc1baed79a777e8afb;hpb=2eb63c6977706ba261e4ee0674c734a34b3ee904;p=lilypond.git

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 152297d985..046a264231 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--2007 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"
@@ -16,7 +27,6 @@
 #include "spanner.hh"
 #include "item.hh"
 
-
 /**
    Create line-spanner grobs for lines that connect note heads.
 
@@ -54,20 +64,19 @@ void
 Note_head_line_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
   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_
+      && 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
@@ -81,7 +90,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_);
@@ -103,18 +112,18 @@ 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.",
+                /* 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 ",
+                /* create */
+                "Glissando "
+                "VoiceFollower ",
 
-		/* read */
-		"followVoice ",
+                /* read */
+                "followVoice ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );