X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-bracket.cc;h=cc33d8b152fd4a311a769d980184d2800bb1b37f;hb=9e877e5aea3fb6cf6e7873d1e8797672cda450f5;hp=9116f19f0488ceed50424ad148538e6acc613ec8;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc index 9116f19f04..cc33d8b152 100644 --- a/lily/ottava-bracket.cc +++ b/lily/ottava-bracket.cc @@ -28,7 +28,7 @@ #include "staff-symbol-referencer.hh" #include "note-column.hh" #include "directional-element-interface.hh" -#include "tuplet-bracket.hh" +#include "bracket.hh" #include "rhythmic-head.hh" #include "pointer-group-interface.hh" @@ -129,7 +129,7 @@ Ottava_bracket::print (SCM smob) ? 0.0 : text.extent (X_AXIS)[RIGHT] + 0.3; span_points[LEFT] - = std::min (span_points[LEFT], + = min (span_points[LEFT], (span_points[RIGHT] - text_size - robust_scm2double (me->get_property ("minimum-length"), -1.0))); @@ -151,12 +151,11 @@ Ottava_bracket::print (SCM smob) Stencil b; Interval empty; + if (!bracket_span_points.is_empty () && bracket_span_points.length () > 0.001) - b = Tuplet_bracket::make_bracket (me, - Y_AXIS, Offset (bracket_span_points.length (), 0), - edge_height, - empty, - flare, Drul_array (0, 0)); + b = Bracket::make_bracket ( + me, Y_AXIS, Offset (bracket_span_points.length (), 0), + edge_height, empty, flare, Drul_array (0, 0)); /* * The vertical lines should not take space, for the following scenario: