merge (2nd try -- argh git.el)

[lilypond.git] / lily / note-head-line-engraver.cc

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 8dde1e86401560354110c49fb807c3d3d8884ffd..4493ffb7b1134fb959d9f29a1becd9cf15c5d305 100644 (file)
--- 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -26,9 +26,9 @@ public:
   TRANSLATOR_DECLARATIONS (Note_head_line_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  PRECOMPUTED_VIRTUAL void process_acknowledged ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 
 private:
   Spanner *line_;
@@ -48,24 +48,21 @@ 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 ();
+  if (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_)
        {
-         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;
        }
     }
 }
@@ -101,11 +98,10 @@ Note_head_line_engraver::stop_translation_timestep ()
 
 #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 "
+               /* doc */ "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",
+               /* create */ "Glissando VoiceFollower",
+               /* read */ "followVoice",
                /* write */ "");