Fix off-by-one error in max_system_count.

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 3b26af8bebabb63b83ba8c965cbf5687e45b696d..c37aa72ad9b53a98cd6e395fa9e8b0da5e8ade96 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -14,6 +14,7 @@
 #include "bezier.hh"
 #include "directional-element-interface.hh"
 #include "font-interface.hh"
+#include "item.hh"
 #include "pointer-group-interface.hh"
 #include "lookup.hh"
 #include "main.hh"             // DEBUG_SLUR_SCORING
@@ -21,18 +22,17 @@
 #include "output-def.hh"
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
-#include "staff-symbol.hh"
 #include "stem.hh"
 #include "text-interface.hh"
 #include "tie.hh"
 #include "warn.hh"
 #include "slur-scoring.hh"
 #include "separation-item.hh"
-#include "script-interface.hh"
+#include "international.hh"
 
 
 
-MAKE_SCHEME_CALLBACK(Slur, calc_direction, 1)
+MAKE_SCHEME_CALLBACK (Slur, calc_direction, 1)
 SCM
 Slur::calc_direction (SCM smob)
 {
@@ -180,7 +180,10 @@ Slur::replace_breakable_encompass_objects (Grob *me)
        {
          extract_grob_set (g, "elements", breakables);
          for (vsize j = 0; j < breakables.size (); j++)
-           if (breakables[j]->get_property ("avoid-slur") == ly_symbol2scm ("inside"))
+           /* if we encompass a separation-item that spans multiple staves,
+              we filter out the grobs that don't belong to our staff */
+           if (me->common_refpoint (breakables[j], Y_AXIS) == me->get_parent (Y_AXIS)
+               && breakables[j]->get_property ("avoid-slur") == ly_symbol2scm ("inside"))
              new_encompasses.push_back (breakables[j]);
        }
       else
@@ -353,22 +356,37 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info,
        }
     }
   else
-    e->warning ("Ignoring grob for slur. avoid-slur not set?");
+    e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?",
+                   e->name().c_str ()));
 }
 
-MAKE_SCHEME_CALLBACK (Slur, cross_staff, 1)
+MAKE_SCHEME_CALLBACK (Slur, calc_cross_staff, 1)
 SCM
-Slur::cross_staff (SCM smob)
+Slur::calc_cross_staff (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
-  assert (staff); // delete me
+
   extract_grob_set (me, "note-columns", cols);
+  extract_grob_set (me, "encompass-objects", extras);
 
   for (vsize i = 0; i < cols.size (); i++)
-    if (Staff_symbol_referencer::get_staff_symbol (cols[i]) != staff)
-      return SCM_BOOL_T;
-  return SCM_BOOL_F;
+    {
+      if (Grob *s = Note_column::get_stem (cols[i]))
+       if (to_boolean (s->get_property ("cross-staff")))
+         return SCM_BOOL_T;
+    }
+
+  /* the separation items are dealt with in replace_breakable_encompass_objects
+     so we can ignore them here */
+  vector<Grob*> non_sep_extras;
+  for (vsize i = 0; i < extras.size (); i++)
+    if (!Separation_item::has_interface (extras[i]))
+      non_sep_extras.push_back (extras[i]);
+
+  Grob *common = common_refpoint_of_array (cols, me, Y_AXIS);
+  common = common_refpoint_of_array (non_sep_extras, common, Y_AXIS);
+
+  return scm_from_bool (common != me->get_parent (Y_AXIS));
 }
 
 ADD_INTERFACE (Slur,