release: 1.3.107

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index bec3b7f0fa45335e312b6f033882670ebc38c27a..277a4206e29e920956436e3927c9820619819384 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -146,8 +146,8 @@ Tie_engraver::process_acknowledged ()
       while  (i >= 0 && j >=0)
        {
          int comp
-           = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
-                                     stopped_heads_[j].req_l_->pitch_);
+           = Musical_pitch::compare (*unsmob_pitch (now_heads_[i].req_l_->get_mus_property ("pitch") ),
+                                     *unsmob_pitch (stopped_heads_[j].req_l_->get_mus_property ("pitch")));
 
          if (comp)
            {
@@ -291,7 +291,10 @@ int
 CHead_melodic_tuple::pitch_compare (CHead_melodic_tuple const&h1,
                             CHead_melodic_tuple const &h2)
 {
-  return Melodic_req::compare (*h1.req_l_, *h2.req_l_);
+  SCM p1  = h1.req_l_->get_mus_property ("pitch");
+  SCM p2  = h2.req_l_->get_mus_property ("pitch");
+  
+  return Musical_pitch::equal_p (p1,p2) == SCM_BOOL_T;
 }
 
 int