X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head-line-engraver.cc;h=57ad1be1246abc0710a360fa4b6dc2d83de26a1f;hb=4f7187ac9efe404e0c5653fde88ebe972340e9c6;hp=2a6336f89dafb4601d22a9b2a29535fc85db93af;hpb=8f3edf3cc6aab40cd2aedde70c75ad01f6a34d5e;p=lilypond.git

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 2a6336f89d..57ad1be124 100644
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -3,13 +3,13 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "engraver.hh"
 #include "group-interface.hh"
 #include "item.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "spanner.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
@@ -18,9 +18,7 @@
 #include "translator-group.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.
@@ -29,19 +27,15 @@
 class Note_head_line_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Note_head_line_engraver ();
+  TRANSLATOR_DECLARATIONS(Note_head_line_engraver);
 
 protected:
   virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
-  virtual bool try_music (Music *);
 
 private:
   Spanner* line_; 
-  Request* req_;
-  Request* last_req_;
   Translator* last_staff_;
   bool follow_;
   Grob* head_;
@@ -51,41 +45,25 @@ private:
 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_)
-    {
-      if (Glissando_req *r = dynamic_cast<Glissando_req*> (m))
-	{
-	  req_ = r;
-	  return true;
-	}
-    }
-  return false;
-}
-
 void
 Note_head_line_engraver::acknowledge_grob (Grob_info info)
 {
-  if (Rhythmic_head::has_interface (info.elem_l_))
+  if (Rhythmic_head::has_interface (info.grob_))
     {
-      head_ = info.elem_l_;
-      if (to_boolean (get_property ("followThread")))
+      head_ = info.grob_;
+      if (to_boolean (get_property ("followVoice")))
 	{
-	  Translator_group  * tr = daddy_trans_l_;
-	  while (tr && tr->type_str_ != "Staff")
-	    tr = tr->daddy_trans_l_ ;
+	  Translator_group  * tr = daddy_trans_;
+	  while (tr && tr->type_string_ != "Staff")
+	    tr = tr->daddy_trans_ ;
 
-	  if (tr && tr->type_str_ == "Staff" && tr != last_staff_)
+	  if (tr && tr->type_string_ == "Staff" && tr != last_staff_)
 	    {
 	      if (last_head_)
 		follow_ = true;
@@ -97,10 +75,9 @@ Note_head_line_engraver::acknowledge_grob (Grob_info info)
 
 
 void
-Note_head_line_engraver::create_grobs ()
+Note_head_line_engraver::process_acknowledged_grobs ()
 {
-  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.
 
@@ -108,21 +85,12 @@ Note_head_line_engraver::create_grobs ()
 	 Should probably store follow_ in line_, and suicide at some
 	 later point */
       if (follow_)
-	line_ = new Spanner (get_property ("FollowThread"));
-      else
-	line_ = new Spanner (get_property ("Glissando"));
+	line_ = new Spanner (get_property ("VoiceFollower"));
 	  
       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::staff_symbol_l (last_head_),
-			 Y_AXIS);
-	  
-      announce_grob (line_, last_req_);
-      last_req_ = 0;	
+      
+      announce_grob(line_, head_->self_scm ());
 
       follow_ = false;
     }
@@ -139,14 +107,16 @@ Note_head_line_engraver::stop_translation_timestep ()
   if (head_)
     last_head_ = head_;
   head_ = 0;
-
-  if (req_)
-    {
-      last_req_ = req_;
-      req_ =0;
-    }
 }
 
 
-ADD_THIS_TRANSLATOR (Note_head_line_engraver);
 
+
+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 */       "");