release: 1.3.3

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 177566d0340df7a62c2bf405733980b466dd8f35..49212b2d0939f28230ccf399fe5784d3c83d992e 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -12,6 +12,7 @@
 #include "note-head.hh"
 #include "musical-request.hh"
 #include "tie.hh"
+#include "translator-group.hh"
 
 Tie_engraver::Tie_engraver()
 {
@@ -25,11 +26,28 @@ Tie_engraver::do_try_music (Music *m)
   if (Tie_req * c = dynamic_cast<Tie_req*> (m))
     {
       req_l_ = c;
+      SCM m = get_property ("automaticMelismata",0);
+      bool am = gh_boolean_p (m) &&gh_scm2bool (m);
+      if (am)
+       {
+         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 ? SCM_BOOL_T : SCM_BOOL_F);
+}
+
 void
 Tie_engraver::acknowledge_element (Score_element_info i)
 {
@@ -60,79 +78,55 @@ Tie_engraver::do_process_requests ()
 void
 Tie_engraver::process_acknowledged ()
 {
-  bool old_behavior = get_property ("oldTieBehavior", 0).to_bool ();
-  
   if (req_l_)
     {
-      if (old_behavior)
+      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 ())
        {
-         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 ();
+         int comp
+           = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
+                                     stopped_heads_[j].req_l_->pitch_);
 
-         /* 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);
-
-         for (int i=0; i < sz; i++)
+         if (comp)
            {
-             Tie * p = new Tie;
-             p->set_head (LEFT, stopped_heads_[i].head_l_);
-             p->set_head (RIGHT, now_heads_[i].head_l_);
-             tie_p_arr_.push (p);
-             announce_element (Score_element_info (p, req_l_));
+             (comp < 0) ? i ++ : j++;
+             continue;
            }
-       }
-      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 ())
+         else
            {
-             int comp
-               = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
-                                         stopped_heads_[j].req_l_->pitch_);
+             tie_count ++;
 
-             if (comp)
+             /* 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 ())
                {
-                 (comp < 0) ? i ++ : j++;
-                 continue;
+                 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_));
                }
-             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++;
+             i++;
+             j++;
 
-               }
            }
        }
+
+      if (!tie_p_arr_.size ())
+       {
+         req_l_->warning (_ ("No ties were created!"));
+       }
+         
     }
 }
 
+
 void
 Tie_engraver::do_pre_move_processing ()
 {
@@ -142,18 +136,18 @@ Tie_engraver::do_pre_move_processing ()
     }
   now_heads_.clear ();
 
-  Scalar dir (get_property ("tieydirection", 0));
-  Scalar dir2 (get_property ("ydirection", 0));
+  SCM dir (get_property ("tieVerticalDirection", 0));
+  SCM dir2 (get_property ("verticalDirection", 0));
 
   Direction tie_dir = CENTER;
-  if (dir.length_i () && dir.isnum_b ())
-    tie_dir = (Direction) sign (int(dir));
-  else if (dir2.length_i () && dir2.isnum_b ())
-    tie_dir = (Direction) sign (int (dir2));
+  if (gh_number_p(dir))
+    tie_dir = to_dir (dir);
+  else if (isdir_b (dir2))
+    tie_dir = to_dir (dir2);
   
   for (int i=0; i<  tie_p_arr_.size (); i++)
    {
-      tie_p_arr_[i]->dir_ = tie_dir;
+      tie_p_arr_[i]->set_direction (tie_dir);
       typeset_element (tie_p_arr_[i]);
     }
   tie_p_arr_.clear ();
@@ -162,7 +156,12 @@ Tie_engraver::do_pre_move_processing ()
 void
 Tie_engraver::do_post_move_processing ()
 {
-  req_l_ =0;
+  SCM m = get_property ("automaticMelismata",0);
+  if (gh_boolean_p (m) && gh_scm2bool (m))
+    {
+      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 ();