release: 1.1.1

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index de7b328b11c695583703b317ae3427b795120efe..1bf3a9640e42e7e82b2420935d4bb3137d0e3577 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "paper-def.hh"
@@ -12,6 +12,7 @@
 #include "p-col.hh"
 #include "debug.hh"
 
+IMPLEMENT_IS_TYPE_B1(Tie,Bow);
 
 void
 Tie::set_head (Direction d, Note_head * head_l)
@@ -46,7 +47,7 @@ void
 Tie::do_add_processing()
 {
   if (!(head_l_drul_[LEFT] && head_l_drul_[RIGHT]))
-    warning (_("Lonely tie.. "));
+    warning (_ ("lonely tie"));
 
   Direction d = LEFT;
   Drul_array<Note_head *> new_head_drul = head_l_drul_;
@@ -60,10 +61,13 @@ Tie::do_add_processing()
 void
 Tie::do_post_processing()
 {
-  Real nw_f = paper ()->note_width ();
-  Real interline_f = paper ()->interline_f ();
+  // URG: share code with slur!
   assert (head_l_drul_[LEFT] || head_l_drul_[RIGHT]);
 
+  Real notewidth = paper ()->note_width ();
+  Real interline_f = paper ()->interline_f ();
+  Real tie_min = paper ()->get_var ("tie_x_minimum");
+
   /* 
    [OSU]: slur and tie placement
 
@@ -73,11 +77,9 @@ Tie::do_post_processing()
    * y = length < 5ss : horizontal raakpunt
      y = length >= 5ss : y next interline - d * 0.25 ss
      --> height <= 5 length ?? we use <= 3 length, now...
-
-   * suggested gap = ss / 5;
    */
-  // jcn: 1/5 seems so small?
-  Real gap_f = interline_f / 2; // 5;
+
+  Real gap_f = paper ()->get_var ("slur_x_gap");
 
   Direction d = LEFT;
   do
@@ -90,35 +92,69 @@ Tie::do_post_processing()
 
   do
     {
+      // tie attached to outer notehead
       if (head_l_drul_[d] && head_l_drul_[d]->extremal_i_)
        {
-         /* normal tie between noteheads, with gap of space */
-         dx_f_drul_[d] += -d * (0.5 * nw_f + gap_f);
+         if (d == LEFT)
+           dx_f_drul_[d] += notewidth;
+         dx_f_drul_[d] += -d * gap_f;
          /* attach to outer 3/4 end of head */
          dy_f_drul_[d] += dir_ * 0.25 * interline_f;
        }
-      else if (head_l_drul_[d])
+      // tie attached to inner notehead
+      else if (head_l_drul_[d] && d == LEFT)
        {
-         dx_f_drul_[d] += d*0.5 * nw_f;
+         dx_f_drul_[d] += -d * notewidth;
        }
+      // uhm? loose end of tie // tie attached to stem
       else
        {
-         dy_f_drul_[d] = dy_f_drul_[(Direction) -d];
          dx_f_drul_[d] = -d * (spanned_drul_[d]->width ().length () 
-                               -0.5 * nw_f);
+                               -0.5 * notewidth);
        }
     }
   while (flip(&d) != LEFT);
+
+  // now that both are set, do dependent
+  do
+    {
+      // tie attached to outer notehead
+      if (!head_l_drul_[d])
+       {
+         if (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT] < tie_min)
+           {
+             dx_f_drul_[d] -= d * tie_min 
+               - (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
+             dx_f_drul_[d] = dx_f_drul_[(Direction)-d] + d * tie_min;
+           }
+
+         dy_f_drul_[d] = dy_f_drul_[(Direction) -d];
+       }
+    }
+  while (flip(&d) != LEFT);
+
+  /*
+    Avoid too steep ties
+      * slur from notehead to stemend: c''()b''
+   */
+  Real damp_f = paper ()->get_var ("tie_slope_damping");
+  Offset d_off = Offset (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT],
+    dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
+  d_off.x () += width ().length ();
+
+  Real ratio_f = abs (d_off.y () / d_off.x ());
+  if (ratio_f > damp_f)
+    dy_f_drul_[(Direction)(- dir_ * sign (d_off.y ()))] -=
+      dir_ * (damp_f - ratio_f) * d_off.x ();
 }
 
 void
-Tie::do_substitute_dependency (Score_elem*o, Score_elem*n)
+Tie::do_substitute_dependency (Score_element*o, Score_element*n)
 {
-  Note_head *new_l =n?(Note_head*)n->item():0;
-  if (o->item() == head_l_drul_[LEFT])
+  Note_head *new_l =n?dynamic_cast<Note_head *> (n):0;
+  if (dynamic_cast <Item *> (o) == head_l_drul_[LEFT])
     head_l_drul_[LEFT] = new_l;
-  else if (o->item() == head_l_drul_[RIGHT])
+  else if (dynamic_cast <Item *> (o) == head_l_drul_[RIGHT])
     head_l_drul_[RIGHT] = new_l;
 }
 
-IMPLEMENT_IS_TYPE_B1(Tie,Bow);