patch::: 1.1.41.tca1

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index 1bf3a9640e42e7e82b2420935d4bb3137d0e3577..26ea948b441ba565e5a893583fa888a19a0592fd 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "paper-def.hh"
@@ -12,7 +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)
@@ -35,12 +35,12 @@ Tie::Tie()
 /*
   ugh: direction of the Tie is more complicated.  See [Ross] p136 and further
  */
-void
-Tie::set_default_dir()
+Direction
+Tie::get_default_dir() const
 {
   int m= (head_l_drul_[LEFT]->position_i_ 
          + head_l_drul_[RIGHT]->position_i_) /2;
-  dir_ =  (m < 0)? DOWN : UP;
+  return(m < 0)? DOWN : UP;
 }
 
 void
@@ -64,9 +64,9 @@ Tie::do_post_processing()
   // 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");
+  // URG
+  Real notewidth = paper_l ()->note_width () * 0.8;
+  Real interline_f = paper_l ()->get_realvar (interline_scm_sym);
 
   /* 
    [OSU]: slur and tie placement
@@ -79,7 +79,7 @@ Tie::do_post_processing()
      --> height <= 5 length ?? we use <= 3 length, now...
    */
 
-  Real gap_f = paper ()->get_var ("slur_x_gap");
+  Real gap_f = paper_l ()->get_var ("slur_x_gap");
 
   Direction d = LEFT;
   do
@@ -93,7 +93,8 @@ Tie::do_post_processing()
   do
     {
       // tie attached to outer notehead
-      if (head_l_drul_[d] && head_l_drul_[d]->extremal_i_)
+      if (head_l_drul_[d]
+         && head_l_drul_[d]->remove_elt_property (extremal_scm_sym) != SCM_BOOL_F)
        {
          if (d == LEFT)
            dx_f_drul_[d] += notewidth;
@@ -109,7 +110,7 @@ Tie::do_post_processing()
       // uhm? loose end of tie // tie attached to stem
       else
        {
-         dx_f_drul_[d] = -d * (spanned_drul_[d]->width ().length () 
+         dx_f_drul_[d] = -d * (spanned_drul_[d]->extent (X_AXIS).length () 
                                -0.5 * notewidth);
        }
     }
@@ -121,13 +122,6 @@ Tie::do_post_processing()
       // 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];
        }
     }
@@ -137,19 +131,19 @@ Tie::do_post_processing()
     Avoid too steep ties
       * slur from notehead to stemend: c''()b''
    */
-  Real damp_f = paper ()->get_var ("tie_slope_damping");
+  Real damp_f = paper_l ()->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 ();
+  d_off.x () += extent (X_AXIS).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 ();
+    dy_f_drul_[(Direction)(- dir_ * sign (d_off.y ()))] +=
+      dir_ * (ratio_f - damp_f) * d_off.x ();
 }
 
 void
-Tie::do_substitute_dependency (Score_element*o, Score_element*n)
+Tie::do_substitute_element_pointer (Score_element*o, Score_element*n)
 {
   Note_head *new_l =n?dynamic_cast<Note_head *> (n):0;
   if (dynamic_cast <Item *> (o) == head_l_drul_[LEFT])
@@ -158,3 +152,14 @@ Tie::do_substitute_dependency (Score_element*o, Score_element*n)
     head_l_drul_[RIGHT] = new_l;
 }
 
+
+Array<Rod>
+Tie::get_rods () const
+{
+  Array<Rod> a;
+  Rod r;
+  r.item_l_drul_ = spanned_drul_;
+  r.distance_f_ = paper_l ()->get_var ("tie_x_minimum");
+  a.push (r);
+  return a;
+}