X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fslur.cc;h=a41aada7a7e5c31ef9e0aaadefe74a79d9486ad3;hb=c20bed72fb602fabf67087649df283f1978a9d94;hp=bf0fb12361e80298aa5f68a2ad9807dc2a69d692;hpb=f1bb461ca8037b12343479b22d56bf96abe238b6;p=lilypond.git

diff --git a/lily/slur.cc b/lily/slur.cc
index bf0fb12361..a41aada7a7 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -32,6 +32,7 @@
 #include "note-column.hh"
 #include "output-def.hh"
 #include "spanner.hh"
+#include "skyline-pair.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
 #include "text-interface.hh"
@@ -70,15 +71,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 +100,31 @@ 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);
+        {
+          for (DOWN_and_UP (downup))
+            ret.add_point (d[dir]);
+
+          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 ();
+  for (LEFT_and_RIGHT (d))
+    extremal_span.add_point (extremal_heights[d]);
+  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);
 }
 
@@ -280,10 +310,8 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
     return offset_scm;
 
   bool contains = false;
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     contains |= slur_wid.contains (xext[d]);
-  while (flip (&d) != LEFT);
 
   if (!contains)
     return offset_scm;
@@ -301,8 +329,7 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
   Real EPS = 1.0e-5;
   if (avoid == ly_symbol2scm ("outside"))
     {
-      Direction d = LEFT;
-      do
+      for (LEFT_and_RIGHT (d))
         {
           Real x = minmax (-d, xext[d], curve.control_[d == LEFT ? 0 : 3][X_AXIS] + -d * EPS);
           Real y = curve.get_other_coordinate (X_AXIS, x);
@@ -310,14 +337,12 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
           if (do_shift)
             break;
         }
-      while (flip (&d) != LEFT);
     }
   else
     {
       for (int a = X_AXIS; a < NO_AXES; a++)
         {
-          Direction d = LEFT;
-          do
+          for (LEFT_and_RIGHT (d))
             {
               vector<Real> coords = curve.get_other_coordinates (Axis (a), exts[a][d]);
               for (vsize i = 0; i < coords.size (); i++)
@@ -329,7 +354,6 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
               if (do_shift)
                 break;
             }
-          while (flip (&d) != LEFT);
           if (do_shift)
             break;
         }
@@ -340,6 +364,29 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
   return scm_from_double (offset + avoidance_offset);
 }
 
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, vertical_skylines, 1, 0, "");
+SCM
+Slur::vertical_skylines (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  vector<Box> boxes;
+
+  if (!me)
+    return Skyline_pair (boxes, 0.0, X_AXIS).smobbed_copy ();
+
+  Bezier curve = Slur::get_curve (me);
+  vsize box_count = robust_scm2vsize (me->get_property ("skyline-quantizing"), 10);
+  for (vsize i = 0; i < box_count; i++)
+    {
+      Box b;
+      b.add_point (curve.curve_point (i * 1.0 / box_count));
+      b.add_point (curve.curve_point ((i + 1) * 1.0 / box_count));
+      boxes.push_back (b);
+    }
+
+  return Skyline_pair (boxes, 0.0, X_AXIS).smobbed_copy ();
+}
+
 /*
  * Used by Slur_engraver:: and Phrasing_slur_engraver::
  */
@@ -513,8 +560,10 @@ ADD_INTERFACE (Slur,
                "inspect-index "
                "line-thickness "
                "note-columns "
+               "skyline-quantizing "
                "positions "
                "ratio "
                "thickness "
+               "vertical-skylines "
               );