X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-performer.cc;h=ba7954e995724678d1cf62e55053bc7aac9dead0;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f26893949b49e9371bf65c54a413eb4e1a61e2b1;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index f26893949b..ba7954e995 100644
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -39,7 +39,6 @@ struct Head_audio_event_tuple
   }
 };
 
-
 class Tie_performer : public Performer
 {
   Stream_event *event_;
@@ -90,31 +89,55 @@ Tie_performer::acknowledge_audio_element (Audio_element_info inf)
       else
         now_heads_.push_back (inf_mom);
 
-      // Find a previous note that ties to the current note. If it exists, 
+      // Find a previous note that ties to the current note. If it exists,
       // remove it from the heads_to_tie vector and create the tie
       list<Head_audio_event_tuple>::iterator it;
       bool found = false;
       Stream_event *right_mus = inf.event_;
-        for (it = heads_to_tie_.begin ();
-             !found && (it != heads_to_tie_.end());
-             it++)
-	{
-	  Audio_element_info et = (*it).head_;
-	  Audio_note *th = dynamic_cast<Audio_note *> (et.elem_);
-	  Stream_event *left_mus = et.event_;
-
-	  if (th && right_mus && left_mus
-	      && ly_is_equal (right_mus->get_property ("pitch"),
-			      left_mus->get_property ("pitch")))
-	    {
-	      found = true;
-	      // (*it).moment_ already stores the end of the tied note!
-	      Moment skip = now_mom() - (*it).end_moment_;
-	      an->tie_to (th, skip);
-	      // this invalidates the iterator, we are leaving the loop anyway
-	      heads_to_tie_.erase (it);
-	    }
-	}
+      for (it = heads_to_tie_.begin ();
+           !found && (it != heads_to_tie_.end ());
+           it++)
+        {
+          Audio_element_info et = (*it).head_;
+          Audio_note *th = dynamic_cast<Audio_note *> (et.elem_);
+          Stream_event *left_mus = et.event_;
+
+          if (th && right_mus && left_mus
+              && ly_is_equal (right_mus->get_property ("pitch"),
+                              left_mus->get_property ("pitch")))
+            {
+              found = true;
+              // (*it).moment_ already stores the end of the tied note!
+              Moment skip = now_mom () - (*it).end_moment_;
+              an->tie_to (th, skip);
+              it = heads_to_tie_.erase (it);
+            }
+        }
+      if (found)
+        return;
+      for (it = heads_to_tie_.begin ();
+           !found && (it != heads_to_tie_.end ());
+           it++)
+        {
+          Audio_element_info et = (*it).head_;
+          Audio_note *th = dynamic_cast<Audio_note *> (et.elem_);
+          Stream_event *left_mus = et.event_;
+
+          if (!(th && right_mus && left_mus))
+            continue;
+
+          SCM p1 = left_mus->get_property ("pitch");
+          SCM p2 = right_mus->get_property ("pitch");
+          if (Pitch::is_smob (p1) && Pitch::is_smob (p2)
+              && Pitch::unsmob (p1)->tone_pitch () == Pitch::unsmob (p2)->tone_pitch ())
+            {
+              found = true;
+              // (*it).moment_ already stores the end of the tied note!
+              Moment skip = now_mom () - (*it).end_moment_;
+              an->tie_to (th, skip);
+              it = heads_to_tie_.erase (it);
+            }
+        }
     }
 }
 
@@ -122,7 +145,7 @@ void
 Tie_performer::start_translation_timestep ()
 {
   context ()->set_property ("tieMelismaBusy",
-			    ly_bool2scm (heads_to_tie_.size ()));
+                            ly_bool2scm (heads_to_tie_.size ()));
 }
 
 // a predicate implemented as a class, used to delete all tied notes with end
@@ -133,7 +156,8 @@ protected:
   Moment now;
 public:
   end_moment_passed (Moment mom) : now (mom) {}
-  bool operator() (const Head_audio_event_tuple &value) {
+  bool operator () (const Head_audio_event_tuple &value)
+  {
     return (value.end_moment_ <= now);
   }
 };
@@ -161,15 +185,15 @@ Tie_performer::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Tie_performer,
-		/* doc */
-		"Generate ties between note heads of equal pitch.",
+                /* doc */
+                "Generate ties between note heads of equal pitch.",
 
-		/* create */
-		"",
+                /* create */
+                "",
 
-		/* read */
-		"tieWaitForNote",
+                /* read */
+                "tieWaitForNote",
 
-		/* write */
-		"tieMelismaBusy"
-		);
+                /* write */
+                "tieMelismaBusy"
+               );