(Text markup): add note about

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index e5f9efddf9cb953c35d2d0af184c61a77600db66..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,19 +21,21 @@
 
 /**
    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_;
+  Music *event_;
+  
   Link_array<Grob> now_heads_;
   Link_array<Grob> stopped_heads_;
   Link_array<Grob> ties_;
@@ -57,29 +59,29 @@ public:
 
 Tie_engraver::Tie_engraver ()
 {
-  req_ = 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_ = 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
@@ -110,7 +112,7 @@ head_pitch_compare (Grob  *const&a,Grob  *const&b)
 void
 Tie_engraver::process_acknowledged_grobs ()
 {
-  if (req_)
+  if (event_)
     {
       now_heads_.sort (&head_pitch_compare);
       /*
@@ -160,7 +162,7 @@ Tie_engraver::process_acknowledged_grobs ()
          Tie::set_head (p,RIGHT, dynamic_cast<Item*> (unsmob_grob (ly_cdr (pair))));
          
          ties_.push (p);
-         announce_grob(p, req_->self_scm());
+         announce_grob(p, event_->self_scm());
        }
       else for (SCM s = head_list; gh_pair_p (s); s = ly_cdr (s))
        {
@@ -171,7 +173,7 @@ Tie_engraver::process_acknowledged_grobs ()
          Tie::set_head (p, RIGHT, dynamic_cast<Item*> (unsmob_grob (ly_cdar (s))));
          
          ties_.push (p);
-         announce_grob(p, req_->self_scm());
+         announce_grob(p, event_->self_scm());
        }
 
       if (ties_.size () > 1 && !tie_column_)
@@ -189,8 +191,7 @@ Tie_engraver::process_acknowledged_grobs ()
 void
 Tie_engraver::stop_translation_timestep ()
 {
-  req_ = 0;
-
+  event_ = 0;
   now_heads_.clear ();
 
   /*
@@ -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 */       "");