X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-bracket.cc;h=75771247ff9742bb2faebbdeeb41a00e80a68ac2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=d7ce3da803fc22bc8186a01b531d975c2352fe2c;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc index d7ce3da803..75771247ff 100644 --- a/lily/piano-pedal-bracket.cc +++ b/lily/piano-pedal-bracket.cc @@ -1,10 +1,9 @@ -/* - piano-pedal-bracket.cc -- implement Piano_pedal_bracket +/* + piano-pedal-bracket.cc -- implement Piano_pedal_bracket -source file of the GNU LilyPond music typesetter - -(c) 2003--2005 Han-Wen Nienhuys + source file of the GNU LilyPond music typesetter + (c) 2003--2008 Han-Wen Nienhuys */ #include "stencil.hh" @@ -15,17 +14,16 @@ source file of the GNU LilyPond music typesetter struct Piano_pedal_bracket { DECLARE_SCHEME_CALLBACK (print, (SCM)); - static bool has_interface (Grob*); + DECLARE_GROB_INTERFACE (); }; - MAKE_SCHEME_CALLBACK (Piano_pedal_bracket, print, 1); SCM Piano_pedal_bracket::print (SCM smob) { - Spanner *me = dynamic_cast (unsmob_grob (smob)); - Spanner *orig = dynamic_cast (me->original_); - + Spanner *me = dynamic_cast (unsmob_grob (smob)); + Spanner *orig = dynamic_cast (me->original ()); + Drul_array broken (false, false); Drul_array height = robust_scm2drul (me->get_property ("edge-height"), Interval (0, 0)); @@ -36,7 +34,7 @@ Piano_pedal_bracket::print (SCM smob) Grob *common = me->get_bound (LEFT) ->common_refpoint (me->get_bound (RIGHT), X_AXIS); - Grob *textbit = unsmob_grob (me->get_property ("pedal-text")); + Grob *textbit = unsmob_grob (me->get_object ("pedal-text")); if (textbit) common = common->common_refpoint (textbit, X_AXIS); @@ -50,35 +48,35 @@ Piano_pedal_bracket::print (SCM smob) if (broken[d]) { if (orig - && ((d == RIGHT && me->get_break_index () != orig->broken_intos_.size()-1) + && ((d == RIGHT + && me->get_break_index () != orig->broken_intos_.size () - 1) || (d == LEFT && me->get_break_index ()))) height[d] = 0.0; else - flare[d] = 0.0; + flare[d] = 0.0; } - - Interval ext = robust_relative_extent (b, common, X_AXIS); - span_points[d] = ext [broken[d] ? RIGHT : LEFT]; + + Interval ext = robust_relative_extent (b, common, X_AXIS); + span_points[d] = ext [broken[d] ? RIGHT : LEFT]; } while (flip (&d) != LEFT); - /* For 'Mixed' style pedals, i.e. a bracket preceded by text: Ped._____| - need to shorten by the extent of the text grob + need to shorten by the extent of the text grob */ if (textbit) { height[LEFT] = 0; - + Real padding = robust_scm2double (me->get_property ("bound-padding"), 0); - + span_points[LEFT] = padding + robust_relative_extent (textbit, common, X_AXIS)[RIGHT]; } - Stencil m ; - if (!span_points.is_empty () && - span_points.length () > 0.001) + Stencil m; + if (!span_points.is_empty () + && span_points.length () > 0.001) { m = Tuplet_bracket::make_bracket (me, Y_AXIS, Offset (span_points.length (), 0), @@ -91,9 +89,14 @@ Piano_pedal_bracket::print (SCM smob) return m.smobbed_copy (); } +ADD_INTERFACE (Piano_pedal_bracket, + "The bracket of the piano pedal. It can be tuned through" + " the regular bracket properties.", - -ADD_INTERFACE (Piano_pedal_bracket, "piano-pedal-bracket-interface", - "The bracket of the piano pedal. It can be tuned through the regular " - "bracket properties.", - "bound-padding edge-height shorten-pair bracket-flare pedal-text"); + /* properties */ + "bound-padding " + "edge-height " + "shorten-pair " + "bracket-flare " + "pedal-text " + );