X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head-line-engraver.cc;h=c14d06fffec50ad884a90aa676f58b6de3b7efe6;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=ea38bb28243b70156cb78ee3873a968a0376a0a2;hpb=c81b75a62bd21b85642b76ce364b5016087bce24;p=lilypond.git

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index ea38bb2824..c14d06fffe 100644
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -1,125 +1,89 @@
-/*   
+/*
   note-head-line-engraver.cc -- implement Note_head_line_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+
+  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "engraver.hh"
-#include "group-interface.hh"
-#include "item.hh"
-#include "event.hh"
-#include "spanner.hh"
+#include "pointer-group-interface.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
-#include "translator-group.hh"
+#include "context.hh"
+#include "spanner.hh"
+#include "item.hh"
 
-/**
-   Create line-spanner grobs for glissandi (and possibly other) lines
-   that connect note heads.
 
+/**
+   Create line-spanner grobs for lines that connect note heads.
 
    TODO: have the line commit suicide if the notes are connected with
    either slur or beam.
-
 */
 class Note_head_line_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Note_head_line_engraver);
+  TRANSLATOR_DECLARATIONS (Note_head_line_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_acknowledged_grobs ();
-  virtual void stop_translation_timestep ();
-  virtual bool try_music (Music *);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 
 private:
-  Spanner* line_; 
-  Music* req_;
-  Music* last_req_;
-  Translator* last_staff_;
+  Spanner *line_;
+  Context *last_staff_;
   bool follow_;
-  Grob* head_;
-  Grob* last_head_;
+  Grob *head_;
+  Grob *last_head_;
 };
 
 Note_head_line_engraver::Note_head_line_engraver ()
 {
   line_ = 0;
-  req_ = 0;
-  last_req_ = 0;
   follow_ = false;
   head_ = 0;
   last_head_ = 0;
   last_staff_ = 0;
 }
 
-bool
-Note_head_line_engraver::try_music (Music* m)
-{
-  if (!req_)
-    {
-      req_ = m;
-      return true;
-    }
-  return false;
-}
-
 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")))
-	{
-	  Translator_group  * tr = daddy_trans_;
-	  while (tr && tr->type_string_ != "Staff")
-	    tr = tr->daddy_trans_ ;
-
-	  if (tr && tr->type_string_ == "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_req_) && last_head_ && head_
-      && (last_head_ != head_))
+  if (!line_ && follow_ && last_head_ && head_)
     {
       /* TODO: Don't follow if there's a beam.
 
-	 We can't do beam-stuff here, since beam doesn't exist yet.
-	 Should probably store follow_ in line_, and suicide at some
-	 later point */
+      We can't do beam-stuff here, since beam doesn't exist yet.
+      Should probably store follow_ in line_, and suicide at some
+      later point */
       if (follow_)
-	line_ = new Spanner (get_property ("VoiceFollower"));
-      else
-	line_ = new Spanner (get_property ("Glissando"));
-	  
+	line_ = make_spanner ("VoiceFollower", head_->self_scm ());
+
       line_->set_bound (LEFT, last_head_);
       line_->set_bound (RIGHT, head_);
-	  
-	  /* Note, mustn't set y-parent of breakable symbol to simple item:
-	     one of the two broken parts won't have an y-parent! */
-	  /* X parent is set by set_bound */
-      line_->set_parent (Staff_symbol_referencer::get_staff_symbol (last_head_),
-			 Y_AXIS);
-	  
-      SCM c = last_req_? last_req_->self_scm () : SCM_EOL;
-      announce_grob(line_, c);
-      last_req_ = 0;	
 
       follow_ = false;
     }
@@ -128,30 +92,28 @@ Note_head_line_engraver::process_acknowledged_grobs ()
 void
 Note_head_line_engraver::stop_translation_timestep ()
 {
-  if (line_)
-    {
-      typeset_grob (line_);
-      line_ = 0;
-    }
+  line_ = 0;
   if (head_)
     last_head_ = head_;
   head_ = 0;
-
-  if (req_)
-    {
-      last_req_ = req_;
-      req_ =0;
-    }
 }
 
+#include "translator.icc"
+
+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.",
 
+		/* create */
+		"Glissando "
+		"VoiceFollower ",
 
+		/* read */
+		"followVoice ",
 
-ENTER_DESCRIPTION(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 */       "");
+		/* write */
+		""
+		);