lilypond-0.0.61

diff --git a/input/keys.ly b/input/keys.ly
new file mode 100644 (file)
index 0000000..c215a57
--- /dev/null
+++ b/input/keys.ly
@@ -0,0 +1,31 @@
+%{MudelaHeader
+
+ filename: keys.ly
+ title:
+ description: 
+ composers:
+ entered-by:
+ copyright:
+
+ Tested Features: local key, key
+EndMudelaHeader
+%}
+\version "0.0.57";
+
+
+blah = \melodic{
+       \duration 4;
+       \meter 4/4;
+       \octave c';
+       cis c cis cis |
+       <cis dis eis fes ges> cis dis2 ~ | 
+               \meter 2/4 ;
+       dis dis ~ | c cis~ | c 
+}
+
+\score{
+       \staff { 
+               melodicregs
+               blah
+       }
+}

diff --git a/lily/tie-reg.cc b/lily/tie-reg.cc
index af9c539803fc0cb55de3218f20c0c34621a5ef81..c1c5b0bc837d452f455cebce480bebea5b2d09e7 100644 (file)
--- a/lily/tie-reg.cc
+++ b/lily/tie-reg.cc
@@ -19,6 +19,8 @@ Tie_register::Tie_register()
     req_l_ =0;
     end_req_l_ =0;
     end_mom_ = -1;
+    melodic_req_l_ = 0;
+    end_melodic_req_l_ =0;
 }
 
 void
@@ -34,6 +36,7 @@ Tie_register::post_move_processing()
     if (tie_p_ && get_staff_info().when() == end_mom_) {
        end_tie_p_ = tie_p_;
        end_req_l_ = req_l_;
+       end_melodic_req_l_ = melodic_req_l_;
        tie_p_ =0;
        req_l_ =0;
        end_mom_ = -1;
@@ -71,11 +74,15 @@ void
 Tie_register::acknowledge_element(Staff_elem_info i)
 {
     if (i.elem_l_->name() == Notehead::static_name()) {
-       if (tie_p_)
+       if (tie_p_) {
            tie_p_->set_head(-1, (Notehead*)i.elem_l_);
-       
+           melodic_req_l_ = i.req_l_->musical()->melodic();
+       }
+
        if (end_tie_p_) {
            end_tie_p_->set_head(1, (Notehead*)i.elem_l_);
+           if (!Melodic_req::compare ( *end_melodic_req_l_, *melodic_req_l_))
+               end_tie_p_->same_pitch_b_ = true;
            announce_element(Staff_elem_info(end_tie_p_,end_req_l_));
        }
     }