X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=91b4e2bb2cd232c10a2f4be46d817cca24b5e23b;hb=859441f67926c267b711a655ab35a4a434e6521a;hp=964a4d091b210e0ab78f4bb8c980291679a317e1;hpb=3f8a827aad721ed546b823e3f9f2605f61b90e20;p=lilypond.git

diff --git a/lily/slur.cc b/lily/slur.cc
index 964a4d091b..91b4e2bb2c 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -70,15 +70,26 @@ MAKE_SCHEME_CALLBACK (Slur, pure_height, 3);
 SCM
 Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm)
 {
+  /*
+    Note that this estimation uses a rote add-on of 0.5 to the
+    highest encompassed note-head for a slur estimate.  This is,
+    in most cases, shorter than the actual slur.
+
+    Ways to improve this could include:
+    -- adding extra height for scripts that avoid slurs on the inside
+    -- adding extra height for the "bulge" in a slur above a note head
+  */
   Grob *me = unsmob_grob (smob);
   int start = scm_to_int (start_scm);
   int end = scm_to_int (end_scm);
-  Real height = robust_scm2double (me->get_property ("height-limit"), 2.0);
+  Direction dir = get_grob_direction (me);
 
   extract_grob_set (me, "note-columns", encompasses);
   Interval ret;
+  ret.set_empty ();
 
   Grob *parent = me->get_parent (Y_AXIS);
+  Drul_array<Real> extremal_heights (infinity_f, -infinity_f);
   if (common_refpoint_of_array (encompasses, me, Y_AXIS) != parent)
     /* this could happen if, for example, we are a cross-staff slur.
        in this case, we want to be ignored */
@@ -88,13 +99,35 @@ Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm)
     {
       Interval d = encompasses[i]->pure_height (parent, start, end);
       if (!d.is_empty ())
-        ret.unite (d);
+        {
+          Direction downup = DOWN;
+          do
+            ret.add_point (d[dir]);
+          while (flip (&downup) != DOWN);
+
+          if (extremal_heights[LEFT] == infinity_f)
+            extremal_heights[LEFT] = d[dir];
+          extremal_heights[RIGHT] = d[dir];
+        }
     }
 
-  // The +0.5 comes from the fact that we try to place a slur
-  // 0.5 staff spaces from the note-head.
-  // (see Slur_score_state.get_base_attachments ())
-  ret.widen (height * 0.5 + 0.5);
+  if (ret.is_empty ())
+    return ly_interval2scm (Interval ());
+
+  Interval extremal_span;
+  extremal_span.set_empty ();
+  Direction d = LEFT;
+  do
+    extremal_span.add_point (extremal_heights[d]);
+  while (flip (&d) != LEFT);
+  ret[-dir] = minmax (dir, extremal_span[-dir], ret[-dir]);
+
+  /*
+    The +0.5 comes from the fact that we try to place a slur
+    0.5 staff spaces from the note-head.
+    (see Slur_score_state.get_base_attachments ())
+  */
+  ret += 0.5 * dir;
   return ly_interval2scm (ret);
 }
 
@@ -270,6 +303,23 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
 
   Interval yext = robust_relative_extent (script, cy, Y_AXIS);
   Interval xext = robust_relative_extent (script, cx, X_AXIS);
+  Interval slur_wid (curve.control_[0][X_AXIS], curve.control_[3][X_AXIS]);
+
+  /*
+    cannot use is_empty because some 0-extent scripts
+    come up with TabStaffs.
+  */
+  if (xext.length () <= 0 || yext.length () <= 0)
+    return offset_scm;
+
+  bool contains = false;
+  Direction d = LEFT;
+  do
+    contains |= slur_wid.contains (xext[d]);
+  while (flip (&d) != LEFT);
+
+  if (!contains)
+    return offset_scm;
 
   Real offset = robust_scm2double (offset_scm, 0);
   yext.translate (offset);
@@ -429,8 +479,6 @@ ADD_INTERFACE (Slur,
                "Demerit to apply when note heads collide with a slur.\n"
                "@item stem-encompass-penalty\n"
                "Demerit to apply when stems collide with a slur.\n"
-               "@item closeness-factor\n"
-               "Additional demerit used when scoring encompasses.\n"
                "@item edge-attraction-factor\n"
                "Factor used to calculate the demerit for distances"
                " between slur endpoints and their corresponding base"
@@ -486,7 +534,7 @@ ADD_INTERFACE (Slur,
 
                /* properties */
                "annotation "
-               "avoid-slur "    /* UGH. */
+               "avoid-slur "  /* UGH. */
                "control-points "
                "dash-definition "
                "details "