From: Mike Solomon <mike@apollinemike.com>
Date: Mon, 23 Jan 2012 16:16:30 +0000 (+0100)
Subject: TupletBrackets do not avoid Scripts when outside-staff-priority is set.
X-Git-Tag: release/2.15.27-1~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e7323c6f1118a7eae6b597bceb1dc5fda7a52b0b;p=lilypond.git

TupletBrackets do not avoid Scripts when outside-staff-priority is set.
---

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 5ccf2bad68..dbbd782cfb 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -655,13 +655,16 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy)
                                   number->extent (commony, Y_AXIS)[dir]));
     }
 
-  if (to_boolean (me->get_property ("avoid-scripts")))
+  if (to_boolean (me->get_property ("avoid-scripts"))
+      && !scm_is_number (me->get_property ("outside-staff-priority")))
     {
       extract_grob_set (me, "scripts", scripts);
       for (vsize i = 0; i < scripts.size (); i++)
         {
           if (!scripts[i]->is_live ())
             continue;
+          if (scm_is_number (scripts[i]->get_property ("outside-staff-priority")))
+            continue;
 
           Interval script_x (scripts[i]->extent (commonx, X_AXIS));
           Interval script_y (scripts[i]->extent (commony, Y_AXIS));