Positions TupletNumber correctly when Script and Slur are present.

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

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 40e0c728c5ef2c353de391bd5da025386bce7007..3cf7190bb1ce2722741c1711858f96ec5fc18007 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -669,6 +669,14 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy)
           if (scm_is_number (scripts[i]->get_property ("outside-staff-priority")))
             continue;
 
+          // assume that if a script is avoiding slurs, it should not get placed
+          // under a tuplet bracket
+          SCM avoid = scripts[i]->get_property ("avoid-slur");
+          if (unsmob_grob (scripts[i]->get_object ("slur"))
+              && (avoid == ly_symbol2scm ("outside")
+                  || avoid == ly_symbol2scm ("around")))
+            continue;
+
           Interval script_x (scripts[i]->extent (commonx, X_AXIS));
           Interval script_y (scripts[i]->extent (commony, Y_AXIS));