X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftie-engraver.cc;h=1dfb42fa523236e2bd5266154c34a361d1f8ada7;hb=e52025a21dc38183fb6da296a71f0e34d4f6ce8e;hp=3496686fffcf40341d823094ffc8483fab298282;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 3496686fff..1dfb42fa52 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -37,13 +37,15 @@ struct Head_event_tuple
   Grob *head_;
   Moment end_moment_;
   SCM tie_definition_;
-  Stream_event *event_;
+  Stream_event *tie_stream_event_;
+  Stream_event *tie_event_;
   
   Head_event_tuple ()
   {
-    event_ = 0;
     head_ = 0;
     tie_definition_ = SCM_EOL;
+    tie_event_ = 0;
+    tie_stream_event_ = 0;
   }
 };
 
@@ -86,13 +88,18 @@ 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 ()
 {
-  if (event_)
+  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);
 }
 
@@ -100,6 +107,7 @@ void
 Tie_engraver::acknowledge_note_head (Grob_info i)
 {
   Grob *h = i.grob ();
+
   now_heads_.push_back (h);
   for (vsize i = heads_to_tie_.size (); i--;)
     {
@@ -110,13 +118,20 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
       /*
 	maybe should check positions too.
       */
-      if (right_ev && left_ev
-	  && ly_is_equal (right_ev->get_property ("pitch"),
-			  left_ev->get_property ("pitch")))
+      if (!right_ev || !left_ev)
+	continue;
+      
+      if (ly_is_equal (right_ev->get_property ("pitch"),
+		       left_ev->get_property ("pitch")))
 	{
 	  Grob *p = new Spanner (heads_to_tie_[i].tie_definition_,
 				 context ()->get_grob_key ("Tie"));
-	  announce_grob (p, heads_to_tie_[i].event_->self_scm ());
+
+	  SCM cause = heads_to_tie_[i].tie_event_
+	    ? heads_to_tie_[i].tie_event_->self_scm ()
+	    : heads_to_tie_[i].tie_stream_event_->self_scm ();
+	  
+	  announce_grob (p, cause);
 	  Tie::set_head (p, LEFT, th);
 	  Tie::set_head (p, RIGHT, h);
 
@@ -139,7 +154,6 @@ Tie_engraver::start_translation_timestep ()
   context ()->set_property ("tieMelismaBusy",
 			    ly_bool2scm (heads_to_tie_.size ()));
   
-  
   if (!to_boolean (get_property ("tieWaitForNote")))
     {
       Moment now = now_mom ();
@@ -154,9 +168,10 @@ Tie_engraver::start_translation_timestep ()
 void
 Tie_engraver::stop_translation_timestep ()
 {
+  bool wait = to_boolean (get_property ("tieWaitForNote"));
   if (ties_.size ())
     {
-      if (!to_boolean (get_property ("tieWaitForNote")))
+      if (!wait)
 	heads_to_tie_.clear ();
 
       for (vsize i = 0; i < ties_.size (); i++)
@@ -166,42 +181,71 @@ Tie_engraver::stop_translation_timestep ()
       tie_column_ = 0;
     }
 
-  if (event_)
+  vector<Head_event_tuple> new_heads_to_tie;
+  
+  for (vsize i = 0; i < now_heads_.size (); i++)
     {
-      SCM start_definition
-	= updated_grob_properties (context (), ly_symbol2scm ("Tie"));
-
-      if (!to_boolean (get_property ("tieWaitForNote")))
-	heads_to_tie_.clear ();
+      Grob *head = now_heads_[i];
+      Stream_event *left_ev
+	= unsmob_stream_event (head->get_property ("cause"));
 
-      for (vsize i = 0; i < now_heads_.size (); i++)
+      if (!left_ev)
+	{
+	  // may happen for ambituses
+	  continue;
+	}
+	    
+      
+      SCM left_articulations = left_ev->get_property ("articulations");
+
+      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))
 	{
-	  Grob *head = now_heads_[i];
-	  Stream_event *left_ev = unsmob_stream_event (head->get_property ("cause"));
-	  if (left_ev)
+	  Stream_event *ev = unsmob_stream_event (scm_car (s));
+	  if (!ev)
+	    continue;
+	  
+	  if (ev->in_event_class ("tie-event"))
+	    tie_event = ev;
+	}
+	  
+      if (left_ev && (tie_event || tie_stream_event))
+	{
+	  Head_event_tuple event_tup;
+
+	  SCM start_definition
+	    = updated_grob_properties (context (), ly_symbol2scm ("Tie"));
+
+	  event_tup.head_ = head;
+	  event_tup.tie_definition_ = start_definition;
+	  event_tup.tie_event_ = tie_event;
+	  event_tup.tie_stream_event_ = tie_stream_event;
+
+	  Moment end = now_mom ();
+	  if (end.grace_part_)
 	    {
-	      Head_event_tuple event_tup;
-
-	      event_tup.head_ = head;
-	      event_tup.tie_definition_ = start_definition;
-	      event_tup.event_ = event_;
-
-	      Moment end = now_mom ();
-	      if (end.grace_part_)
-		{
-		  end.grace_part_ += get_event_length (left_ev).main_part_;
-		}
-	      else
-		{
-		  end += get_event_length (left_ev);
-		}
-	      event_tup.end_moment_ = end;
-
-	      heads_to_tie_.push_back (event_tup);
+	      end.grace_part_ += get_event_length (left_ev).main_part_;
 	    }
+	  else
+	    {
+	      end += get_event_length (left_ev);
+	    }
+	  event_tup.end_moment_ = end;
+	    
+	  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 ();
 }
@@ -233,7 +277,7 @@ ADD_TRANSLATOR (Tie_engraver,
 		/* doc */ "Generate ties between noteheads of equal pitch.",
 		/* create */
 		"Tie "
-		"TieColumn",
+		"TieColumn ",
 
 		/* accept */ "tie-event",
 		/* read */ "tieWaitForNote",