X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head-line-engraver.cc;h=c14d06fffec50ad884a90aa676f58b6de3b7efe6;hb=3dc994a95c8adc1db1d8064c762719da6ac78385;hp=a7becd06ef97ada235420047603942a340a35342;hpb=77d72a6b9e7e551dc4a3b365099f9fea339f9c72;p=lilypond.git

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index a7becd06ef..c14d06fffe 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--2008 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.
@@ -51,20 +54,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
@@ -100,9 +102,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 "
-		" followVoice is set, staff switches also generate a line.",
-		/* create */ "Glissando VoiceFollower",
-		/* accept */ "glissando-event",
-		/* read */ "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 */
+		""
+		);