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

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 555ac18ec1..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--2005 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,9 +39,9 @@ public:
   TRANSLATOR_DECLARATIONS (Note_head_line_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_acknowledged_grobs ();
-  virtual void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 
 private:
   Spanner *line_;
@@ -48,30 +61,26 @@ Note_head_line_engraver::Note_head_line_engraver ()
 }
 
 void
-Note_head_line_engraver::acknowledge_grob (Grob_info info)
+Note_head_line_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  if (Rhythmic_head::has_interface (info.grob ()))
+  head_ = info.grob ();
+  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")))
     {
-      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_)
-	    {
-	      if (last_head_)
-		follow_ = true;
-	      last_staff_ = tr;
-	    }
-	}
+      if (last_head_)
+        follow_ = true;
     }
+  last_staff_ = tr;
 }
 
 void
-Note_head_line_engraver::process_acknowledged_grobs ()
+Note_head_line_engraver::process_acknowledged ()
 {
   if (!line_ && follow_ && last_head_ && head_)
     {
@@ -81,7 +90,7 @@ Note_head_line_engraver::process_acknowledged_grobs ()
       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_);
@@ -99,11 +108,22 @@ Note_head_line_engraver::stop_translation_timestep ()
   head_ = 0;
 }
 
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Note_head_line_engraver, rhythmic_head);
 ADD_TRANSLATOR (Note_head_line_engraver,
-		/* descr */ "Engrave a line between two note heads, for example a glissando.  If "
-		" followVoice is set, staff switches also generate a line.",
-		/* creats*/ "Glissando VoiceFollower",
-		/* accepts */ "glissando-event",
-		/* acks  */ "rhythmic-head-interface",
-		/* reads */ "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 */
+                ""
+               );