X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head-line-engraver.cc;h=eb2fc894d53f112d09f8b4d273f88e4525e06b21;hb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;hp=b2717201cffde2295796bcedfb00280e2f086ae2;hpb=6eab06d05832f47c82dff829a9a334bdb86234aa;p=lilypond.git

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index b2717201cf..eb2fc894d5 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 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "engraver.hh"
@@ -20,17 +20,20 @@
 /**
    Create line-spanner grobs for glissandi (and possibly other) 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:
-  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 *);
 
@@ -72,68 +75,55 @@ Note_head_line_engraver::try_music (Music* m)
 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_))
     {
-      last_head_ = head_;
-      head_ = info.elem_l_;
-      if (to_boolean (get_property ("followThread")))
+      head_ = info.grob_;
+      if (to_boolean (get_property ("followVoice")))
 	{
-    	  Translator* staff = daddy_trans_l_ && daddy_trans_l_->daddy_trans_l_
-	    ? daddy_trans_l_->daddy_trans_l_->daddy_trans_l_ : 0;
-	  if (staff != last_staff_)
+	  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_ = staff;
+	      last_staff_ = tr;
 	    }
 	}
     }
 }
 
-static Grob*
-beam_l (Grob *h)
-{
-  if (Grob *s = Rhythmic_head::stem_l (h))
-    return Stem::beam_l (s);
-  return 0;
-}
 
 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_))
     {
-      /* Don't follow if there's a beam.
+      /* TODO: Don't follow if there's a beam.
 
-	 Hmm, this doesn't work, as head_ does not yet have 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 */
-      if (!(follow_
-	    && beam_l (last_head_) && beam_l (last_head_) == beam_l (head_)))
-	{
-	  if (follow_)
-	    line_ = new Spanner (get_property ("FollowThread"));
-	  else
-	    line_ = new Spanner (get_property ("Glissando"));
+      if (follow_)
+	line_ = new Spanner (get_property ("VoiceFollower"));
+      else
+	line_ = new Spanner (get_property ("Glissando"));
 	  
-	  line_->set_bound (LEFT, last_head_);
-	  line_->set_bound (RIGHT, head_);
+      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);
+      line_->set_parent (Staff_symbol_referencer::get_staff_symbol (last_head_),
+			 Y_AXIS);
 	  
-	  announce_grob (line_, last_req_);
-	}
+      SCM c = last_req_? last_req_->self_scm () : SCM_EOL;
+      announce_grob(line_, c);
+      last_req_ = 0;	
 
-      last_head_ = 0;
-      if (!follow_ && !req_)
-	head_ = 0;
-      
-      last_req_ = 0;
       follow_ = false;
     }
 }
@@ -146,10 +136,24 @@ Note_head_line_engraver::stop_translation_timestep ()
       typeset_grob (line_);
       line_ = 0;
     }
-  last_req_ = req_;
-  req_ = 0;
+  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",
+/* acks  */       "rhythmic-head-interface",
+/* reads */       "followVoice",
+/* write */       "");