]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/tie.cc
* The grand 2005-2006 replace.
[lilypond.git] / lily / tie.cc
index 5c756b7686a585f2e5fe8f848bd7578f31aeb7dc..d79ffccd55c327d7e0583a8a965aebc8efe55759 100644 (file)
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "tie.hh"
@@ -22,6 +22,7 @@
 #include "tie-column.hh"
 #include "grob-array.hh"
 #include "tie-formatting-problem.hh"
+#include "tie-configuration.hh"
 
 
 int
@@ -132,271 +133,6 @@ Tie::calc_direction (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-Interval
-Tie::get_default_attachments (Spanner *me, Grob *common, Real gap,
-                             int *staff_position,
-                             bool *in_between,
-                             Tie_details const &details
-                             )
-{
-  Real staff_space = Staff_symbol_referencer::staff_space (me);
-  Direction dir = get_grob_direction (me);
-  Interval attachments;
-  Direction d = LEFT;
-  do
-    {
-      attachments[d]
-       = robust_relative_extent (me->get_bound (d),
-                                 common,
-                                 X_AXIS)[-d]
-       - gap * d;
-    }
-  while (flip (&d) != LEFT);
-
-  if (attachments.length () < details.between_length_limit_ * staff_space)
-    {
-      /*
-       Let short ties start over note heads, instead of between.
-      */
-      Drul_array<bool> allow (true, true);
-
-      Direction d = LEFT;
-      do {
-       if (Note_head::has_interface (me->get_bound (d)))
-         {
-           Grob *stem = unsmob_grob (me->get_bound (d)->get_object ("stem"));
-           if (get_grob_direction (stem) == dir
-               && -d == dir)
-             allow[d] = false;
-         }
-      } while (flip (&d) != LEFT);
-
-      if (allow[LEFT] && allow[RIGHT])
-       {
-         *staff_position += dir;
-         do
-           {
-             if (Note_head::has_interface (me->get_bound (d)))
-               {
-                 Interval extent
-                   = robust_relative_extent (me->get_bound (d),
-                                             common, X_AXIS);
-
-                 attachments[d] = extent.linear_combination (- 0.5 * d);
-                 *in_between = false;
-               }
-           }
-         while (flip (&d) != LEFT);
-       }
-    }
-
-  return attachments;
-}  
-
-void
-Tie::get_configuration (Grob *me_grob, 
-                       Tie_configuration *conf,
-                       Tie_formatting_problem const &problem)
-{
-  Spanner *me = dynamic_cast<Spanner*> (me_grob);
-  if (!head (me, LEFT) && !head (me, RIGHT))
-    {
-      programming_error ("tie without heads");
-      me->suicide ();
-      return ;
-    }
-
-  /*
-    UGH. Don't mirror Tie_configuration.
-   */
-  conf->head_position_ = (int) Tie::get_position (me);
-  if (!conf->dir_)
-    conf->dir_ = get_grob_direction (me);
-  if (!conf->dir_)
-    conf->dir_ = get_default_dir (me);
-
-  Real staff_space = problem.details_.staff_space_;
-  bool in_between = true;
-  Real gap = robust_scm2double (me->get_property ("x-gap"), 0.2);
-
-  if (conf->attachment_x_.is_empty())
-    {
-#if 0
-      if (!skylines)
-       conf->attachment_x_ = get_default_attachments (me, common, gap,
-                                                      &conf->position_,
-                                                      &in_between, problem.details_);
-#endif
-      Real y = staff_space * 0.5 * conf->position_;
-      conf->attachment_x_ = problem.get_attachment (y);
-      conf->attachment_x_.widen (-gap);
-    }
-
-  Bezier b = slur_shape (conf->attachment_x_.length(),
-                        problem.details_.height_limit_,
-                        problem.details_.ratio_);
-  b.scale (1, conf->dir_);
-  
-  Offset middle = b.curve_point (0.5);
-  Offset edge = b.curve_point (0.0);
-
-  conf->position_ = int (rint (conf->position_));
-  
-  Real dy = fabs (middle[Y_AXIS] - edge[Y_AXIS]);
-  bool in_space = !(Staff_symbol_referencer::on_staffline (me, (int) conf->position_));
-  bool fits_in_space =
-    (dy < 0.6 * staff_space);
-  
-  /*
-    Avoid dot
-   */
-  Grob *left_dot = unsmob_grob (me->get_bound (LEFT)->get_object ("dot"));
-  int dot_pos = left_dot
-    ? int (Staff_symbol_referencer::get_position (left_dot))
-    : 0;
-  if (left_dot
-      && (conf->position_ == dot_pos
-         || conf->position_ + conf->dir_ == dot_pos))
-    {
-      conf->position_ += conf->dir_;
-      in_space = !in_space;
-
-      if (conf->position_ == dot_pos)
-       {
-         conf->position_ += conf->dir_;
-         in_space = !in_space;
-       }
-      
-      Real y = staff_space * 0.5 * conf->position_;
-      conf->attachment_x_ = problem.get_attachment (y);
-      conf->attachment_x_.widen (-gap);
-      Bezier b = slur_shape (conf->attachment_x_.length(),
-                            problem.details_.height_limit_,
-                            problem.details_.ratio_);
-      Offset middle = b.curve_point (0.5);
-      Offset edge = b.curve_point (0.0);
-      dy = fabs (middle[Y_AXIS] - edge[Y_AXIS]);
-      fits_in_space =
-       (dy < 0.6 * staff_space);
-    }
-  
-  /*
-    Avoid flag.
-  */
-  Grob *left_stem = unsmob_grob (me->get_bound (LEFT)->get_object ("stem"));
-  if (left_stem)
-    {
-      Stencil flag = Stem::get_translated_flag (left_stem);
-      Real y = conf->position_ * staff_space * 0.5;
-      if (flag.extent (Y_AXIS).contains (y))
-       {
-         conf->position_ += conf->dir_;
-         in_space = !in_space;
-       }
-    }
-
-  if (in_space != fits_in_space)
-    {
-      if (in_space)
-       {
-         conf->position_ += conf->dir_;
-       }
-      else
-       {
-         in_space = true;
-         conf->position_ += conf->dir_;
-       }
-
-      /*
-       ugh: code dup.
-      */
-      Real y = staff_space * 0.5 * conf->position_;
-      conf->attachment_x_ = problem.get_attachment (y);
-      conf->attachment_x_.widen (-gap);
-             
-      Bezier b = slur_shape (conf->attachment_x_.length(),
-                            problem.details_.height_limit_,
-                            problem.details_.ratio_);
-      Offset middle = b.curve_point (0.5);
-      Offset edge = b.curve_point (0.0);
-      dy = fabs (middle[Y_AXIS] - edge[Y_AXIS]);
-      fits_in_space =
-       (dy < 0.6 * staff_space);
-    }
-
-
-  /*
-    Putting larger in-space ties next to the notes forces
-    the edges to be opposite (Y-wise) to the tie direction.
-   */
-  if (conf->position_ == conf->head_position_
-      && in_space
-      && Staff_symbol_referencer::staff_radius (me) > abs (conf->position_) / 2
-      && dy > 0.3 * staff_space
-      )
-    {
-      conf->position_ += 2 * conf->dir_; 
-    }
-
-  if (!in_between
-      && in_space
-      && abs (conf->position_ - conf->head_position_) <= 1)
-    {
-      int amount = conf->dir_;
-      if (sign (conf->position_) != conf->dir_
-         || conf->position_ < Staff_symbol_referencer::staff_radius (me) * 2)
-       amount *= 2;
-
-      conf->position_ += amount;
-    }
-  
-  if (in_space)
-    {
-      if ((sign (conf->position_) != conf->dir_
-          || conf->position_ < Staff_symbol_referencer::staff_radius (me) * 2)
-         &&
-         ((abs (conf->position_ - conf->head_position_) <= 1
-           && fabs (dy) < 0.45 * staff_space)
-          || fabs (dy) < 0.6 * staff_space))
-       {
-         /*
-           vertically center in space.
-         */
-         conf->center_tie_vertically (problem.details_);
-       }
-      else
-       {
-         conf->delta_y_ = 
-           conf->dir_ * staff_space * (- 0.3);
-       }
-    }
-  else
-    {
-      Real where = 0.5 * conf->dir_;
-      
-      Real rounding_dy = (where - middle[Y_AXIS]);
-      conf->delta_y_ = rounding_dy;
-
-      if (conf->dir_ * (b.curve_point (0.0)[Y_AXIS]
-                + conf->position_ * staff_space * 0.5
-                + conf->delta_y_) <
-         conf->dir_ * conf->head_position_ * 0.5 * staff_space)
-       {
-         if (Staff_symbol_referencer::staff_radius (me) >  abs (conf->head_position_) / 2)
-           conf->position_ +=  2 * conf->dir_;
-         else
-           conf->position_ += conf->dir_;
-       }
-    }
-
-
-  Real half_space = 0.5 * staff_space;
-  Real y = conf->position_ * half_space;
-      
-  conf->attachment_x_ = problem.get_attachment (y);
-  conf->attachment_x_.widen (-gap);
-}
-
 
 void
 Tie::set_default_control_points (Grob *me_grob)
@@ -424,14 +160,9 @@ Tie::set_control_points (Grob *me,
                         Tie_details const &details
                         )
 {
-  Bezier b = conf.get_bezier (details);
-  b.scale (1, conf.dir_);
-  b.translate (Offset (conf.attachment_x_[LEFT]
-                      - me->relative_coordinate (common, X_AXIS),
-                      0.5 * conf.position_ * details.staff_space_
-                      + conf.delta_y_
-                      ));
-  
+  Bezier b = conf.get_transformed_bezier (details);
+  b.translate (Offset (- me->relative_coordinate (common, X_AXIS), 0));
+
   SCM controls = SCM_EOL;
   for (int i = 4; i--;)
     {
@@ -514,6 +245,7 @@ ADD_INTERFACE (Tie,
               
 
               /* properties */
+              "avoid-slur "    //  UGH.
               "control-points "
               "dash-fraction "
               "dash-period "
@@ -524,3 +256,4 @@ ADD_INTERFACE (Tie,
 
 
 
+