2003 -> 2004

[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 25f4a7b850f59de593efa0d7d9e02b56cb9ef899..e2eb02f0432ec900d2c67c18e3793731f4c075de 100644 (file)
--- 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--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "engraver.hh"
 #include "group-interface.hh"
 #include "item.hh"
-#include "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.
@@ -35,12 +33,9 @@ protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
-  virtual bool try_music (Music *);
 
 private:
   Spanner* line_; 
-  Music* req_;
-  Music* last_req_;
   Translator* last_staff_;
   bool follow_;
   Grob* head_;
@@ -50,25 +45,12 @@ 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_)
-    {
-      req_ = m;
-      return true;
-    }
-  return false;
-}
-
 void
 Note_head_line_engraver::acknowledge_grob (Grob_info info)
 {
@@ -78,10 +60,10 @@ Note_head_line_engraver::acknowledge_grob (Grob_info info)
       if (to_boolean (get_property ("followVoice")))
        {
          Translator_group  * tr = daddy_trans_;
-         while (tr && tr->type_string_ != "Staff")
+         while (tr && !tr->is_alias (ly_symbol2scm ( "Staff")))
            tr = tr->daddy_trans_ ;
 
-         if (tr && tr->type_string_ == "Staff" && tr != last_staff_)
+         if (tr && tr->is_alias (ly_symbol2scm ("Staff")) && tr != last_staff_)
            {
              if (last_head_)
                follow_ = true;
@@ -95,8 +77,7 @@ Note_head_line_engraver::acknowledge_grob (Grob_info info)
 void
 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.
 
@@ -104,22 +85,12 @@ Note_head_line_engraver::process_acknowledged_grobs ()
         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");
          
       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;   
+      
+      announce_grob(line_, head_->self_scm ());
 
       follow_ = false;
     }
@@ -136,20 +107,14 @@ Note_head_line_engraver::stop_translation_timestep ()
   if (head_)
     last_head_ = head_;
   head_ = 0;
-
-  if (req_)
-    {
-      last_req_ = req_;
-      req_ =0;
-    }
 }
 
 
 
 
 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.",
+/* 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",