X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=bc8fa4b5a7212a2413195812959bcf96dc9c9bf6;hb=abc2e31b608746a1ac924085a87244cc32ee7178;hp=474712e8d59f677b8afd51d30914480ec78e1ee1;hpb=8766d90306918dedc640ae86b0693efc6cb989df;p=lilypond.git

diff --git a/lily/slur.cc b/lily/slur.cc
index 474712e8d5..bc8fa4b5a7 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -186,7 +186,12 @@ Slur::do_post_processing ()
       */
       else
 	{
-	  dx_f_drul_[d] -= d * x_gap_f;
+	  /*
+	    need break-align too.  what about other spanners?
+	   */
+	  if (d == LEFT)
+	    dx_f_drul_[d] = spanned_drul_[LEFT]->extent (X_AXIS).length ();
+	  	
 	  /*
 	    broken: should get y from other piece, so that slur
 	    continues up/down trend
@@ -241,36 +246,41 @@ Slur::do_post_processing ()
   Real height_damp_f;
   Real slope_damp_f;
   Real snap_f;
+  Real snap_max_dy_f;
 
   if (!interstaff_b)
     {
       height_damp_f = paper_l ()->get_var ("slur_height_damping");
       slope_damp_f = paper_l ()->get_var ("slur_slope_damping");
       snap_f = paper_l ()->get_var ("slur_snap_to_stem");
+      snap_max_dy_f = paper_l ()->get_var ("slur_snap_max_slope_change");
     }
   else
     {
       height_damp_f = paper_l ()->get_var ("slur_interstaff_height_damping");
       slope_damp_f = paper_l ()->get_var ("slur_interstaff_slope_damping");
       snap_f = paper_l ()->get_var ("slur_interstaff_snap_to_stem");
+      snap_max_dy_f = paper_l ()->get_var ("slur_interstaff_snap_max_slope_change");
     }
 
-  Real ratio_f;
   if (!fix_broken_b)
     dy_f_drul_[RIGHT] += interstaff_f;
+
   Real dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
+  if (!fix_broken_b)
+    dy_f -= interstaff_f;
   Real dx_f = do_width ().length () + dx_f_drul_[RIGHT] - dx_f_drul_[LEFT];
 
   /*
     Avoid too steep slurs.
    */
-  ratio_f = abs (dy_f / dx_f);
-  if (ratio_f > slope_damp_f)
+  Real slope_ratio_f = abs (dy_f / dx_f);
+  if (slope_ratio_f > slope_damp_f)
     {
       Direction d = (Direction)(- dir_ * (sign (dy_f)));
       if (!d)
 	d = LEFT;
-      Real damp_f = (ratio_f - slope_damp_f) * dx_f;
+      Real damp_f = (slope_ratio_f - slope_damp_f) * dx_f;
       /*
 	must never change sign of dy
        */
@@ -287,17 +297,22 @@ Slur::do_post_processing ()
    */
   for (int i = 0; i < 3; i++)
     {
-      Real height_f = do_height ().length ();
+      Drul_array<Interval> curve_xy_drul = curve_extent_drul ();
+      Real height_f = curve_xy_drul[Y].length ();
+      Real width_f = curve_xy_drul[X].length ();
+      
       dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
+      if (!fix_broken_b)
+	dy_f -= interstaff_f;
 
-      ratio_f = abs (height_f / dx_f);
-      if (ratio_f > height_damp_f)
+      Real height_ratio_f = abs (height_f / width_f);
+      if (height_ratio_f > height_damp_f)
 	{
 	  Direction d = (Direction)(- dir_ * (sign (dy_f)));
 	  if (!d)
 	    d = LEFT;
 	  /* take third step */
-	  Real damp_f = (ratio_f - height_damp_f) * dx_f / 3;
+	  Real damp_f = (height_ratio_f - height_damp_f) * width_f / 3;
 	  /*
 	    if y positions at about the same height, correct both ends
 	  */
@@ -320,6 +335,12 @@ Slur::do_post_processing ()
   /*
     If, after correcting, we're close to stem-end...
   */
+  Drul_array<Real> snapy_f_drul;
+  snapy_f_drul[LEFT] = snapy_f_drul[RIGHT] = 0;
+  Drul_array<Real> snapx_f_drul;
+  snapx_f_drul[LEFT] = snapx_f_drul[RIGHT] = 0;
+  Drul_array<bool> snapped_b_drul;
+  snapped_b_drul[LEFT] = snapped_b_drul[RIGHT] = false;
   do
     {
       if ((note_column_drul[d] == spanned_drul_[d])
@@ -330,17 +351,56 @@ Slur::do_post_processing ()
 	      <= snap_f))
 	{
 	  /*
-	    attach to stem-end
+	    prepare to attach to stem-end
 	  */
 	  Stem* stem_l = note_column_drul[d]->stem_l_;
-	  dx_f_drul_[d] = stem_l->hpos_f ()
+	  snapx_f_drul[d] = stem_l->hpos_f ()
 	    - spanned_drul_[d]->absolute_coordinate (X_AXIS);
-	  dy_f_drul_[d] = stem_l->extent (Y_AXIS)[dir_];
-	  dy_f_drul_[d] += info_drul[d].interstaff_f_;
-	  dy_f_drul_[d] += dir_ * 2 * y_gap_f;
+	  snapy_f_drul[d] = stem_l->extent (Y_AXIS)[dir_];
+	  snapy_f_drul[d] += info_drul[d].interstaff_f_;
+	  snapy_f_drul[d] += dir_ * 2 * y_gap_f;
+	  snapped_b_drul[d] = true;
 	}
     }
   while (flip (&d) != LEFT);
+
+  /*
+    only use snapped positions if sign (dy) will not change
+    and dy doesn't change too much
+    */
+  if (!fix_broken_b)
+    dy_f += interstaff_f;
+  if (snapped_b_drul[LEFT] && snapped_b_drul[RIGHT]
+      && ((sign (snapy_f_drul[RIGHT] - snapy_f_drul[LEFT]) == sign (dy_f)))
+      && (!dy_f || (abs (snapy_f_drul[RIGHT] - snapy_f_drul[LEFT] - dy_f)
+		    < abs (dy_f * snap_max_dy_f))))
+    {
+      do
+	{
+	  dy_f_drul_[d] = snapy_f_drul[d];
+	  dx_f_drul_[d] = snapx_f_drul[d];
+	}
+      while (flip (&d) != LEFT);
+  
+    }
+  else if (snapped_b_drul[LEFT]
+      && ((sign (dy_f_drul_[RIGHT] - snapy_f_drul[LEFT]) == sign (dy_f)))
+      && (!dy_f || (abs (dy_f_drul_[RIGHT] - snapy_f_drul[LEFT] - dy_f)
+		    < abs (dy_f * snap_max_dy_f))))
+    {
+      Direction d = LEFT;
+      dy_f_drul_[d] = snapy_f_drul[d];
+      dx_f_drul_[d] = snapx_f_drul[d];
+    }
+  else if (snapped_b_drul[RIGHT]
+      && ((sign (snapy_f_drul[RIGHT] - dy_f_drul_[LEFT]) == sign (dy_f)))
+      && (!dy_f || (abs (snapy_f_drul[RIGHT] - dy_f_drul_[LEFT] - dy_f)
+		    < abs (dy_f * snap_max_dy_f))))
+    {
+      Direction d = RIGHT;
+      dy_f_drul_[d] = snapy_f_drul[d];
+      dx_f_drul_[d] = snapx_f_drul[d];
+    }
 }
 
 Array<Offset>