]> git.donarmstrong.com Git - lilypond.git/commitdiff
TupletBrackets do not avoid Scripts when outside-staff-priority is set.
authorMike Solomon <mike@apollinemike.com>
Mon, 23 Jan 2012 16:16:30 +0000 (17:16 +0100)
committerMike Solomon <mike@apollinemike.com>
Mon, 23 Jan 2012 16:16:30 +0000 (17:16 +0100)
lily/tuplet-bracket.cc

index 5ccf2bad6866fdb74f9fbcfbfd459f5404443eb9..dbbd782cfbe7a219a09d7ec6d41a14330ace36b0 100644 (file)
@@ -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));