release: 1.1.69

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 2a8cc741dd1c5075d381ac13c87628a015c67cc9..949f67d3e7a7a9bfb87ad073dcadde9e88cbd9ec 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -12,6 +12,7 @@
 #include "note-head.hh"
 #include "musical-request.hh"
 #include "tie.hh"
+#include "translator-group.hh"
 
 Tie_engraver::Tie_engraver()
 {
@@ -25,17 +26,34 @@ Tie_engraver::do_try_music (Music *m)
   if (Tie_req * c = dynamic_cast<Tie_req*> (m))
     {
       req_l_ = c;
+      if (get_property ("automaticMelismata",0).to_bool ())
+       {
+         set_melisma (true);
+       }
       return true;
     }
   return false;
 }
 
+void
+Tie_engraver::set_melisma (bool m)
+{
+  Translator_group *where = daddy_trans_l_;
+  get_property ("tieMelismaBusy", &where);
+  if (!where)
+    where = daddy_trans_l_;
+    
+  daddy_trans_l_->set_property ("tieMelismaBusy", m ? "1" :"0");
+}
+
 void
 Tie_engraver::acknowledge_element (Score_element_info i)
 {
   if (Note_head *nh = dynamic_cast<Note_head *> (i.elem_l_))
     {
       Note_req * m = dynamic_cast<Note_req* > (i.req_l_);
+      if (!m)
+       return;
       now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ()));
     }
 }
@@ -52,25 +70,34 @@ Tie_engraver::do_process_requests ()
       while (past_notes_pq_.size ()
             && past_notes_pq_.front ().end_ == now)
        stopped_heads_.push (past_notes_pq_.get ());
-
     }
 }
 
 void
 Tie_engraver::process_acknowledged ()
 {
+  bool old_behavior = get_property ("oldTieBehavior", 0).to_bool ();
+  
   if (req_l_)
     {
-      if (now_heads_.size () != stopped_heads_.size ())
-       {
-         req_l_->warning ("Unequal number of note heads for tie");
-       }
-      int sz = now_heads_.size () <? stopped_heads_.size ();
 
-      // hmm. Should do something more sensible.
-      // because, we assume no more noteheads come along after the 1st pass.
-      if (sz > tie_p_arr_.size ())
+      /*
+       JUNKME!
+       */
+      if (old_behavior)
        {
+         if (now_heads_.size () != stopped_heads_.size ())
+           {
+             req_l_->warning ("Unequal number of note heads for tie");
+           }
+         int sz = now_heads_.size () <? stopped_heads_.size ();
+
+         /* hmm. Should do something more sensible.
+       because, we assume no more noteheads come along after the 1st pass.
+         */
+         if (sz <= tie_p_arr_.size ())
+           return;
+
          now_heads_.sort (CHead_melodic_tuple::pitch_compare);
          stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
 
@@ -83,6 +110,52 @@ Tie_engraver::process_acknowledged ()
              announce_element (Score_element_info (p, req_l_));
            }
        }
+      else
+       {
+         now_heads_.sort (CHead_melodic_tuple::pitch_compare);
+         stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
+         int i=0;
+         int j=0;
+         int tie_count=0;
+         while  ( i < now_heads_.size () && j < stopped_heads_.size ())
+           {
+             int comp
+               = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
+                                         stopped_heads_[j].req_l_->pitch_);
+
+             if (comp)
+               {
+                 (comp < 0) ? i ++ : j++;
+                 continue;
+               }
+             else
+               {
+                 tie_count ++;
+
+                 /* don't go around recreating ties that were already
+                 made. Not infallible. Due to reordering in sort (),
+                 we will make the wrong ties when noteheads are
+                 added.  */
+                 if (tie_count > tie_p_arr_.size ())
+                   {
+                     Tie * p = new Tie;
+                     p->set_head (LEFT, stopped_heads_[j].head_l_);
+                     p->set_head (RIGHT, now_heads_[i].head_l_);
+                     tie_p_arr_.push (p);
+                     announce_element (Score_element_info (p, req_l_));
+                   }
+                 i++;
+                 j++;
+
+               }
+           }
+
+         if (!tie_p_arr_.size ())
+           {
+             req_l_->warning (_("No ties were created!"));
+           }
+         
+       }
     }
 }
 
@@ -95,8 +168,8 @@ Tie_engraver::do_pre_move_processing ()
     }
   now_heads_.clear ();
 
-  Scalar dir (get_property ("tieydirection", 0));
-  Scalar dir2 (get_property ("ydirection", 0));
+  Scalar dir (get_property ("tieVerticalDirection", 0));
+  Scalar dir2 (get_property ("verticalDirection", 0));
 
   Direction tie_dir = CENTER;
   if (dir.length_i () && dir.isnum_b ())
@@ -115,7 +188,11 @@ Tie_engraver::do_pre_move_processing ()
 void
 Tie_engraver::do_post_move_processing ()
 {
-  req_l_ =0;
+  if (get_property ("automaticMelismata",0).to_bool ())
+    {
+      set_melisma (false);
+    }
+  req_l_ = 0;
   Moment now = now_mom ();
   while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now)
     past_notes_pq_.delmin ();
@@ -127,14 +204,14 @@ ADD_THIS_TRANSLATOR(Tie_engraver);
 CHead_melodic_tuple::CHead_melodic_tuple ()
 {
   head_l_ =0;
-  mel_l_ =0;
+  req_l_ =0;
   end_ = 0;
 }
 
 CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom)
 {
   head_l_ = h;
-  mel_l_ = m;
+  req_l_ = m;
   end_ = mom;
 }
 
@@ -142,7 +219,7 @@ int
 CHead_melodic_tuple::pitch_compare (CHead_melodic_tuple const&h1,
                             CHead_melodic_tuple const &h2)
 {
-  return Melodic_req::compare (*h1.mel_l_, *h2.mel_l_);
+  return Melodic_req::compare (*h1.req_l_, *h2.req_l_);
 }
 
 int