X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-bracket.cc;h=d13f56414f4f52c3f8939f6b7c306a94360477d9;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=d01776882c83b7aa4ccdfe2e438eac458bb5867f;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc index d01776882c..d13f56414f 100644 --- a/lily/piano-pedal-bracket.cc +++ b/lily/piano-pedal-bracket.cc @@ -20,20 +20,19 @@ #include "stencil.hh" #include "spanner.hh" #include "item.hh" -#include "tuplet-bracket.hh" +#include "bracket.hh" #include "axis-group-interface.hh" struct Piano_pedal_bracket { DECLARE_SCHEME_CALLBACK (print, (SCM)); - DECLARE_GROB_INTERFACE (); }; MAKE_SCHEME_CALLBACK (Piano_pedal_bracket, print, 1); SCM Piano_pedal_bracket::print (SCM smob) { - Spanner *me = dynamic_cast (Grob::unsmob (smob)); + Spanner *me = unsmob (smob); Spanner *orig = dynamic_cast (me->original ()); Drul_array broken (false, false); @@ -46,7 +45,7 @@ Piano_pedal_bracket::print (SCM smob) Grob *common = me->get_bound (LEFT) ->common_refpoint (me->get_bound (RIGHT), X_AXIS); - Grob *textbit = Grob::unsmob (me->get_object ("pedal-text")); + Grob *textbit = unsmob (me->get_object ("pedal-text")); if (textbit) common = common->common_refpoint (textbit, X_AXIS); @@ -90,11 +89,9 @@ Piano_pedal_bracket::print (SCM smob) if (!span_points.is_empty () && span_points.length () > 0.001) { - m = Tuplet_bracket::make_bracket (me, Y_AXIS, - Offset (span_points.length (), 0), - height, - Interval (), - flare, shorten); + m = Bracket::make_bracket ( + me, Y_AXIS, Offset (span_points.length (), 0), height, + Interval (), flare, shorten); } m.translate_axis (span_points[LEFT] - me->relative_coordinate (common, X_AXIS), X_AXIS);