(parse_symbol_list): Bugfix.

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 929353c00a6f19d0abde93a866f3fc11a526b358..9956bea2316de0af0923038725b78e58176c33fa 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -15,7 +15,7 @@
 #include "bezier.hh"
 #include "directional-element-interface.hh"
 #include "font-interface.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 #include "lookup.hh"
 #include "main.hh"             // DEBUG_SLUR_SCORING
 #include "note-column.hh"
@@ -24,10 +24,27 @@
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"
 #include "stem.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "warn.hh"
 #include "slur-scoring.hh"
 
+static Direction
+get_default_dir (Grob *me)
+{
+  extract_grob_set (me, "note-columns", encompasses);
+
+  Direction d = DOWN;
+  for (int i = 0; i < encompasses.size (); i++)
+    {
+      if (Note_column::dir (encompasses[i]) < 0)
+       {
+         d = UP;
+         break;
+       }
+    }
+  return d;
+}
+
 MAKE_SCHEME_CALLBACK (Slur, height, 2);
 SCM
 Slur::height (SCM smob, SCM ax)
@@ -51,7 +68,8 @@ SCM
 Slur::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  if (!scm_ilength (me->get_property ("note-columns")))
+  extract_grob_set (me, "note-columns", encompasses);
+  if (encompasses.is_empty ())
     {
       me->suicide ();
       return SCM_EOL;
@@ -60,10 +78,7 @@ Slur::print (SCM smob)
   Real staff_thick = Staff_symbol_referencer::line_thickness (me);
   Real base_thick = robust_scm2double (me->get_property ("thickness"), 1);
   Real thick = base_thick * staff_thick;
-
-  Real ss = Staff_symbol_referencer::staff_space (me);
   Bezier one = get_curve (me);
-
   Stencil a;
 
   /*
@@ -122,21 +137,32 @@ void
 Slur::add_extra_encompass (Grob *me, Grob *n)
 {
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("encompass-objects"), n);
+  me->add_dependency (n);
 }
 
+#include "script-interface.hh"
 MAKE_SCHEME_CALLBACK (Slur, outside_slur_callback, 2);
 SCM
 Slur::outside_slur_callback (SCM grob, SCM axis)
 {
   Grob *script = unsmob_grob (grob);
   Axis a = Axis (scm_to_int (axis));
+  (void) a;
   assert (a == Y_AXIS);
 
-  Grob *slur = unsmob_grob (script->get_property ("slur"));
+  Grob *slur = unsmob_grob (script->get_object ("slur"));
 
   if (!slur)
     return scm_from_int (0);
 
+  Direction dir = get_grob_direction (script);
+  if (dir == CENTER)
+    return scm_from_int (0);
+
+  /* FIXME: this dependency should be automatic.  */
+  if (scm_ilength (slur->get_property ("control-points")) < 4)
+    Slur::after_line_breaking (slur->self_scm ());
+
   Grob *cx = script->common_refpoint (slur, X_AXIS);
   Grob *cy = script->common_refpoint (slur, Y_AXIS);
 
@@ -148,20 +174,18 @@ Slur::outside_slur_callback (SCM grob, SCM axis)
   Interval yext = robust_relative_extent (script, cy, Y_AXIS);
   Interval xext = robust_relative_extent (script, cx, X_AXIS);
 
+  /* FIXME: slur property, script property?  */
   Real slur_padding = robust_scm2double (script->get_property ("slur-padding"),
-                                        0.0);  // todo: slur property, script property?
+                                        0.0);
   yext.widen (slur_padding);
-  Real EPS = 1e-3;
-
-  Interval bezext (curve.control_[0][X_AXIS],
-                  curve.control_[3][X_AXIS]);
 
+  Real EPS = 1e-3;
+  Interval bezext (curve.control_[0][X_AXIS], curve.control_[3][X_AXIS]);
   bool consider[] = { false, false, false };
   Real ys[] = {0, 0, 0};
-  int k = 0;
   bool do_shift = false;
 
-  for (int d = LEFT; d <= RIGHT; d++)
+  for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
     {
       Real x = xext.linear_combination ((Direction) d);
       consider[k] = bezext.contains (x);
@@ -176,42 +200,21 @@ Slur::outside_slur_callback (SCM grob, SCM axis)
               : curve.get_other_coordinate (X_AXIS, x));
          consider[k] = true;
 
-         if (yext.contains (ys[k]))
+         /* Request shift if slur is contained script's Y, or if
+            script is fully inside slur.  */
+         if (yext.contains (ys[k]) || dir * ys[k] > dir * yext[-dir])
            do_shift = true;
        }
     }
   Real offset = 0.0;
   if (do_shift)
     {
-      k = 0;
-      Direction dir = get_grob_direction (script);
-      for (int d = LEFT; d <= RIGHT; d++)
-       {
-         offset = dir * (dir * offset >? dir
-                         * (ys[k] - yext[-dir] + dir * slur_padding));
-         k++;
-       }
+      for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
+       offset = dir * (max (dir * offset,
+                            dir * (ys[k] - yext[-dir] + dir * slur_padding)));
     }
 
-  return scm_make_real (offset);
-}
-
-static Direction
-get_default_dir (Grob *me)
-{
-  Link_array<Grob> encompasses
-    = extract_grob_array (me, ly_symbol2scm ("note-columns"));
-
-  Direction d = DOWN;
-  for (int i = 0; i < encompasses.size (); i++)
-    {
-      if (Note_column::dir (encompasses[i]) < 0)
-       {
-         d = UP;
-         break;
-       }
-    }
-  return d;
+  return scm_from_double (offset);
 }
 
 MAKE_SCHEME_CALLBACK (Slur, after_line_breaking, 1);
@@ -219,7 +222,8 @@ SCM
 Slur::after_line_breaking (SCM smob)
 {
   Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
-  if (!scm_ilength (me->get_property ("note-columns")))
+  extract_grob_set (me, "note-columns", encompasses);
+  if (encompasses.is_empty ())
     {
       me->suicide ();
       return SCM_UNSPECIFIED;
@@ -236,5 +240,5 @@ Slur::after_line_breaking (SCM smob)
 
 ADD_INTERFACE (Slur, "slur-interface",
               "A slur",
-              "positions quant-score excentricity encompass-objects control-points dash-period dash-fraction slur-details direction height-limit note-columns ratio thickness");
+              "positions quant-score eccentricity encompass-objects control-points dash-period dash-fraction slur-details direction height-limit note-columns ratio thickness");