X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=5ca994873f17c64e00782843b8e931ebb312e787;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=a099d9c7ab7b5573fa1e4b25d7f90a8b34ddb3a2;hpb=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;p=lilypond.git

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index a099d9c7ab..5ca994873f 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2014 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
@@ -23,6 +23,7 @@
 #include "international.hh"
 #include "item.hh"
 #include "note-head.hh"
+#include "pitch.hh"
 #include "protected-scm.hh"
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
@@ -77,6 +78,7 @@ class Tie_engraver : public Engraver
   vector<Grob *> ties_;
 
   Spanner *tie_column_;
+  bool tie_notehead (Grob *h, bool enharmonic);
 
 protected:
   void process_acknowledged ();
@@ -145,17 +147,16 @@ Tie_engraver::process_music ()
     context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
-void
-Tie_engraver::acknowledge_note_head (Grob_info i)
+bool
+Tie_engraver::tie_notehead (Grob *h, bool enharmonic)
 {
-  Grob *h = i.grob ();
+  bool found = false;
 
-  now_heads_.push_back (h);
-  for (vsize i = heads_to_tie_.size (); i--;)
+  for (vsize i = 0; i < heads_to_tie_.size (); i++)
     {
       Grob *th = heads_to_tie_[i].head_;
-      Stream_event *right_ev = unsmob_stream_event (h->get_property ("cause"));
-      Stream_event *left_ev = unsmob_stream_event (th->get_property ("cause"));
+      Stream_event *right_ev = Stream_event::unsmob (h->get_property ("cause"));
+      Stream_event *left_ev = Stream_event::unsmob (th->get_property ("cause"));
 
       /*
         maybe should check positions too.
@@ -167,7 +168,12 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
         Make a tie only if pitches are equal or if event end was not generated by
         Completion_heads_engraver.
       */
-      if (ly_is_equal (right_ev->get_property ("pitch"), left_ev->get_property ("pitch"))
+      SCM p1 = left_ev->get_property ("pitch");
+      SCM p2 = right_ev->get_property ("pitch");
+      if ((enharmonic
+           ? (Pitch::is_smob (p1) && Pitch::is_smob (p2) &&
+              Pitch::unsmob (p1)->tone_pitch () == Pitch::unsmob (p2)->tone_pitch ())
+           : ly_is_equal (p1, p2))
           && (!Tie_engraver::has_autosplit_end (left_ev)))
         {
           Grob *p = heads_to_tie_[i].tie_;
@@ -191,6 +197,7 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
           ties_.push_back (p);
           heads_to_tie_.erase (heads_to_tie_.begin () + i);
 
+          found = true;
           /*
             Prevent all other tied notes ending at the same moment (assume
             implicitly the notes have also started at the same moment!)
@@ -202,14 +209,27 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
               if (heads_to_tie_[j].end_moment_ == end)
                 heads_to_tie_[j].tie_from_chord_created = true;
             }
+          break;
         }
     }
+  return found;
+}
+
+void
+Tie_engraver::acknowledge_note_head (Grob_info i)
+{
+  Grob *h = i.grob ();
+
+  now_heads_.push_back (h);
+
+  if (!tie_notehead (h, false))
+    tie_notehead (h, true);
 
   if (ties_.size () && ! tie_column_)
     tie_column_ = make_spanner ("TieColumn", ties_[0]->self_scm ());
 
   if (tie_column_)
-    for (vsize i = ties_.size (); i--;)
+    for (vsize i = 0; i < ties_.size (); i++)
       Tie_column::add_tie (tie_column_, ties_[i]);
 }
 
@@ -261,7 +281,7 @@ Tie_engraver::process_acknowledged ()
     {
       Grob *head = now_heads_[i];
       Stream_event *left_ev
-        = unsmob_stream_event (head->get_property ("cause"));
+        = Stream_event::unsmob (head->get_property ("cause"));
 
       if (!left_ev)
         {
@@ -281,7 +301,7 @@ Tie_engraver::process_acknowledged ()
            !tie_event && !tie_stream_event && scm_is_pair (s);
            s = scm_cdr (s))
         {
-          Stream_event *ev = unsmob_stream_event (scm_car (s));
+          Stream_event *ev = Stream_event::unsmob (scm_car (s));
           if (!ev)
             continue;