X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=1dfb42fa523236e2bd5266154c34a361d1f8ada7;hb=e52025a21dc38183fb6da296a71f0e34d4f6ce8e;hp=11f534cdec8af2d792dbb205b55127420a979a19;hpb=58a81257f1063e394b061288a0ad7c3de2c363ee;p=lilypond.git

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 11f534cdec..1dfb42fa52 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -38,7 +38,7 @@ struct Head_event_tuple
   Moment end_moment_;
   SCM tie_definition_;
   Stream_event *tie_stream_event_;
-  Music *tie_event_;
+  Stream_event *tie_event_;
   
   Head_event_tuple ()
   {
@@ -88,19 +88,19 @@ IMPLEMENT_TRANSLATOR_LISTENER (Tie_engraver, tie);
 void
 Tie_engraver::listen_tie (Stream_event *ev)
 {
-  event_ = ev;
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 void
 Tie_engraver::process_music ()
 {
-  for (vsize i = 0; i < heads_to_tie_.size (); i++)
-    if (heads_to_tie_[i].tie_event_
-	|| heads_to_tie_[i].tie_stream_event_)
-      {
-	context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
-	break;
-      }
+  bool busy = event_;
+  for (vsize i = 0; !busy && i < heads_to_tie_.size (); i++)
+    busy |=  (heads_to_tie_[i].tie_event_
+	      || heads_to_tie_[i].tie_stream_event_);
+
+  if (busy)
+    context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
 void
@@ -181,8 +181,7 @@ Tie_engraver::stop_translation_timestep ()
       tie_column_ = 0;
     }
 
-  if (!wait)
-    heads_to_tie_.clear ();
+  vector<Head_event_tuple> new_heads_to_tie;
   
   for (vsize i = 0; i < now_heads_.size (); i++)
     {
@@ -199,18 +198,18 @@ Tie_engraver::stop_translation_timestep ()
       
       SCM left_articulations = left_ev->get_property ("articulations");
 
-      Music *tie_event = 0;
+      Stream_event *tie_event = 0;
       Stream_event *tie_stream_event = event_;
       for (SCM s = left_articulations;
 	   !tie_event && !tie_stream_event && scm_is_pair (s);
 	   s = scm_cdr (s))
 	{
-	  Music *m = unsmob_music (scm_car (s));
-	  if (!m)
+	  Stream_event *ev = unsmob_stream_event (scm_car (s));
+	  if (!ev)
 	    continue;
 	  
-	  if (m->is_mus_type ("tie-event"))
-	    tie_event = m;
+	  if (ev->in_event_class ("tie-event"))
+	    tie_event = ev;
 	}
 	  
       if (left_ev && (tie_event || tie_stream_event))
@@ -236,10 +235,17 @@ Tie_engraver::stop_translation_timestep ()
 	    }
 	  event_tup.end_moment_ = end;
 	    
-	  heads_to_tie_.push_back (event_tup);
+	  new_heads_to_tie.push_back (event_tup);
 	}
     }
 
+  if (!wait && new_heads_to_tie.size ())
+    heads_to_tie_.clear ();
+
+  // hmmm, how to do with copy() ?
+  for (vsize i = 0; i < new_heads_to_tie.size (); i++)
+    heads_to_tie_.push_back (new_heads_to_tie[i]);
+  
   event_ = 0;
   now_heads_.clear ();
 }