move from abe.ly

[lilypond.git] / lily / tie-engraver.cc

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 16abacdeeca0b92d8cccb7dca54d5841c60612b7..e02eb889de2fa5931aa981f72ef52f9a920d6611 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "command-request.hh"
-#include "musical-request.hh"
+
+#include "event.hh"
 #include "tie.hh"
 #include "translator-group.hh"
 #include "spanner.hh"
@@ -21,24 +21,26 @@
 
 /**
    Manufacture ties.  Acknowledge noteheads, and put them into a
-   priority queue. If we have a Tie_req, connect the notes that finish
+   priority queue. If we have a TieEvent, connect the notes that finish
    just at this time, and note that start at this time.
 
    TODO: Remove the dependency on musical info. We should tie on the
-   basis of position and duration-log of the heads (not of the reqs).
+   basis of position and duration-log of the heads (not of the events).
 
+   New tie event happens at the time of the first note, the 
 */
 class Tie_engraver : public Engraver
 {
   Moment end_mom_;
   Moment next_end_mom_;
 
-  Tie_req *req_l_;
+  Music *event_;
+  
   Link_array<Grob> now_heads_;
   Link_array<Grob> stopped_heads_;
-  Link_array<Grob> tie_p_arr_;
+  Link_array<Grob> ties_;
 
-  Spanner * tie_column_p_;
+  Spanner * tie_column_;
   
   void set_melisma (bool);
   
@@ -47,7 +49,7 @@ protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music*);
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
   void typeset_tie (Grob*);
 public:
   TRANSLATOR_DECLARATIONS(Tie_engraver);
@@ -57,43 +59,43 @@ public:
 
 Tie_engraver::Tie_engraver ()
 {
-  req_l_ = 0;
-  tie_column_p_ = 0;
+  event_ = 0;
+  tie_column_ = 0;
 }
 
 
 bool
-Tie_engraver::try_music (Music *m)
+Tie_engraver::try_music (Music *mus)
 {
-  if (Tie_req * c = dynamic_cast<Tie_req*> (m))
+  if (mus->is_mus_type ("tie-event"))
+    {
+      event_ = mus;
+    }
+
+  if (event_)
     {
-      /*      if (end_mom_ > now_mom ())
-       return false;
-      */
-      req_l_ = c;
       SCM m = get_property ("automaticMelismata");
       bool am = gh_boolean_p (m) &&gh_scm2bool (m);
       if (am)
        {
          set_melisma (true);
        }
-      return true;
     }
-  return false;
+  return true;
 }
 
 void
 Tie_engraver::set_melisma (bool m)
 {
-  daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F);
+  daddy_trans_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F);
 }
 
 void
 Tie_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_head::has_interface (i.grob_l_))
+  if (Note_head::has_interface (i.grob_))
     {
-      now_heads_.push (i.grob_l_);
+      now_heads_.push (i.grob_);
     }
 }
 
@@ -108,9 +110,9 @@ head_pitch_compare (Grob  *const&a,Grob  *const&b)
 }
 
 void
-Tie_engraver::create_grobs ()
+Tie_engraver::process_acknowledged_grobs ()
 {
-  if (req_l_)
+  if (event_)
     {
       now_heads_.sort (&head_pitch_compare);
       /*
@@ -159,8 +161,8 @@ Tie_engraver::create_grobs ()
          Tie::set_head (p,LEFT, dynamic_cast<Item*> (unsmob_grob (ly_car (pair))));
          Tie::set_head (p,RIGHT, dynamic_cast<Item*> (unsmob_grob (ly_cdr (pair))));
          
-         tie_p_arr_.push (p);
-         announce_grob(p, req_l_->self_scm());
+         ties_.push (p);
+         announce_grob(p, event_->self_scm());
        }
       else for (SCM s = head_list; gh_pair_p (s); s = ly_cdr (s))
        {
@@ -170,17 +172,17 @@ Tie_engraver::create_grobs ()
          Tie::set_head (p, LEFT, dynamic_cast<Item*> (unsmob_grob (ly_caar (s))));
          Tie::set_head (p, RIGHT, dynamic_cast<Item*> (unsmob_grob (ly_cdar (s))));
          
-         tie_p_arr_.push (p);
-         announce_grob(p, req_l_->self_scm());
+         ties_.push (p);
+         announce_grob(p, event_->self_scm());
        }
 
-      if (tie_p_arr_.size () > 1 && !tie_column_p_)
+      if (ties_.size () > 1 && !tie_column_)
        {
-         tie_column_p_ = new Spanner (get_property ("TieColumn"));
+         tie_column_ = new Spanner (get_property ("TieColumn"));
 
-         for (int i = tie_p_arr_.size (); i--;)
-           Tie_column::add_tie (tie_column_p_,tie_p_arr_ [i]);
-         announce_grob(tie_column_p_, SCM_EOL);
+         for (int i = ties_.size (); i--;)
+           Tie_column::add_tie (tie_column_,ties_ [i]);
+         announce_grob(tie_column_, SCM_EOL);
        }
     }
 }
@@ -189,23 +191,22 @@ Tie_engraver::create_grobs ()
 void
 Tie_engraver::stop_translation_timestep ()
 {
-  req_l_ = 0;
-
+  event_ = 0;
   now_heads_.clear ();
 
   /*
     we don't warn for no ties, since this happens naturally when you
     use skipTypesetting.  */
   
-  for (int i=0; i<  tie_p_arr_.size (); i++)
+  for (int i=0; i<  ties_.size (); i++)
    {
-      typeset_tie (tie_p_arr_[i]);
+      typeset_tie (ties_[i]);
     }
-  tie_p_arr_.clear ();
-  if (tie_column_p_)
+  ties_.clear ();
+  if (tie_column_)
     {
-      typeset_grob (tie_column_p_);
-      tie_column_p_ =0;
+      typeset_grob (tie_column_);
+      tie_column_ =0;
     }
 }
 
@@ -275,12 +276,15 @@ Tie_engraver::start_translation_timestep ()
     it at the top.
    */
   stopped_heads_.reverse();
+
+  event_ = 0;
 }
 
 
 ENTER_DESCRIPTION(Tie_engraver,
 /* descr */       "Generate ties between noteheads of equal pitch.",
 /* creats*/       "Tie TieColumn",
-/* acks  */       "rhythmic-head-interface",
+/* accepts */     "tie-event",
+/* acks  */      "rhythmic-head-interface",
 /* reads */       "sparseTies tieMelismaBusy",
 /* write */       "");