Fix 352.

[lilypond.git] / lily / tuplet-bracket.cc

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 318d3012b7a8351343d76d844ebc75c30937f83a..06411f72f2885a620fa85fad149dfd527820cf0f 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -750,9 +750,18 @@ Tuplet_bracket::calc_cross_staff (SCM smob)
   Grob *me = unsmob_grob (smob);
   Grob *staff_symbol = 0;
   extract_grob_set (me, "note-columns", cols);
+  bool equally_long = false;
+  Grob *par_beam = parallel_beam (me, cols, &equally_long);
+
+  if (par_beam)
+    return par_beam->get_property ("cross-staff");
+
   for (vsize i = 0; i < cols.size (); i++)
     {
       Grob *stem = unsmob_grob (cols[i]->get_object ("stem"));
+      if (to_boolean (stem->get_property ("cross-staff")))
+       return SCM_BOOL_T;
+
       Grob *stem_staff = Staff_symbol_referencer::get_staff_symbol (stem);
       if (staff_symbol && (stem_staff != staff_symbol))
         return SCM_BOOL_T;