* input/regression/new-part-combine-solo.ly: more cases.

[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 b2717201cffde2295796bcedfb00280e2f086ae2..7c301a76505c9a25f0fbabeb46929b0d33d6e48a 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 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,26 +18,24 @@
 #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.
 
+*/
 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_;
@@ -47,93 +45,53 @@ 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_))
     {
-      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->is_alias (ly_symbol2scm ( "Staff")))
+           tr = tr->daddy_trans_ ;
+
+         if (tr && tr->is_alias (ly_symbol2scm ("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_))
+  if (!line_ && follow_ && 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"));
-         
-         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);
+      if (follow_)
+       line_ = make_spanner ("VoiceFollower");
          
-         announce_grob (line_, last_req_);
-       }
-
-      last_head_ = 0;
-      if (!follow_ && !req_)
-       head_ = 0;
+      line_->set_bound (LEFT, last_head_);
+      line_->set_bound (RIGHT, head_);
       
-      last_req_ = 0;
+      announce_grob(line_, head_->self_scm ());
+
       follow_ = false;
     }
 }
@@ -146,10 +104,19 @@ Note_head_line_engraver::stop_translation_timestep ()
       typeset_grob (line_);
       line_ = 0;
     }
-  last_req_ = req_;
-  req_ = 0;
+  if (head_)
+    last_head_ = head_;
+  head_ = 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 */       "");