release: 0.1.39

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index f7ad34fea4ee8431a1f9b1f7353fecbe315a3849..a181bedde3361eca34c04eb94e19fed8fa749610 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -18,6 +18,7 @@ Tie::set_head (Direction d, Note_head * head_l)
 {
   assert (!head_l_drul_[d]);
   head_l_drul_[d] = head_l;
+  set_bounds (d, head_l);
 
   add_dependency (head_l);
 }
@@ -29,11 +30,16 @@ Tie::Tie()
   same_pitch_b_ =false;
 }
 
+
+/*
+  ugh: direction of the Tie is more complicated.  See [Ross] p136 and further
+ */
 void
 Tie::set_default_dir()
 {
-  int m= (head_l_drul_[LEFT]->position_i_ + head_l_drul_[RIGHT]->position_i_) /2;
-  dir_ =  (m < 5)? DOWN : UP;  // UGH
+  int m= (head_l_drul_[LEFT]->position_i_ 
+         + head_l_drul_[RIGHT]->position_i_) /2;
+  dir_ =  (m < 0)? DOWN : UP;
 }
 
 void
@@ -42,21 +48,29 @@ Tie::do_add_processing()
   if (!(head_l_drul_[LEFT] && head_l_drul_[RIGHT]))
     warning (_("Lonely tie.. "));
 
-  set_bounds(LEFT,head_l_drul_[LEFT]);
-  set_bounds(RIGHT,head_l_drul_[RIGHT]);
+  Direction d = LEFT;
+  Drul_array<Note_head *> new_head_drul = head_l_drul_;
+  do {
+    if (!head_l_drul_[d])
+      new_head_drul[d] = head_l_drul_[(Direction)-d];
+  } while ((d *= -1) != LEFT);
+  head_l_drul_ = new_head_drul;
 }
 
 void
 Tie::do_post_processing()
 {
   Real nw_f = paper()->note_width ();
+  Real space_f = paper()->interline_f ();
   assert (head_l_drul_[LEFT] || head_l_drul_[RIGHT]);
 
   Direction d = LEFT;
   do
     {
-      pos_i_drul_[d] =  (head_l_drul_[d])?
-       head_l_drul_[d]->position_i_ : head_l_drul_[(Direction)-d]->position_i_;
+      dy_f_drul_[d] =  
+       .5 *space_f * (head_l_drul_[d] 
+                      ? head_l_drul_[d]->position_i_
+                      : head_l_drul_[(Direction)-d]->position_i_);
     }
   while ((d *= -1) != LEFT);
 
@@ -64,16 +78,16 @@ Tie::do_post_processing()
     {
       if (head_l_drul_[d] && head_l_drul_[d]->extremal_i_)
        {
-         pos_i_drul_[d] += 2*dir_;
-         dx_f_drul_[d] += d * 0.25;
+         dy_f_drul_[d] += dir_ * space_f;
+         dx_f_drul_[d] += d * 0.25 * nw_f;
        }
       else if (head_l_drul_[d])
-       dx_f_drul_[d] += d*0.5;
+       dx_f_drul_[d] += d*0.5 * nw_f;
       else
        {
-         pos_i_drul_[d] = pos_i_drul_[(Direction) -d];
-         dx_f_drul_[d] = -d
-           *(spanned_drul_[d]->width ().length ()/nw_f -0.5);
+         dy_f_drul_[d] = dy_f_drul_[(Direction) -d];
+         dx_f_drul_[d] = -d *(spanned_drul_[d]->width ().length () 
+                              -0.5* nw_f);
        }
     }
   while ((d *= -1) != LEFT);