X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhorizontal-bracket.cc;h=4961721496ee18c0939e96fdfc7ac52b5e7420be;hb=e2f5ba92300dc3fb7517165ac224e1500ad850dd;hp=5c5039a5d18f357ba01bd7f02e7857fd7305bae4;hpb=05fabaaf86fd44f9bd903f282bb98d343a991e40;p=lilypond.git diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc index 5c5039a5d1..4961721496 100644 --- a/lily/horizontal-bracket.cc +++ b/lily/horizontal-bracket.cc @@ -27,10 +27,8 @@ struct Horizontal_bracket This doesn't look very elegant: should support winged edges. Support texts on the brackets? - */ - -MAKE_SCHEME_CALLBACK(Horizontal_bracket, print, 1); +MAKE_SCHEME_CALLBACK (Horizontal_bracket, print, 1); SCM Horizontal_bracket::print (SCM smob) @@ -39,28 +37,28 @@ Horizontal_bracket::print (SCM smob) Spanner *sp = dynamic_cast (me); Link_array gs = Pointer_group_interface__extract_grobs (me,(Grob*)0, "columns"); - if (!gs.size()) + if (!gs.size ()) { - me->suicide(); + me->suicide (); return SCM_EOL; } Grob * cx = common_refpoint_of_array (gs, me, X_AXIS); cx = cx->common_refpoint (sp->get_bound (LEFT), X_AXIS); cx = cx->common_refpoint (sp->get_bound (RIGHT),X_AXIS); - Interval ext = gs.top()->extent (cx, X_AXIS); + Interval ext = gs.top ()->extent (cx, X_AXIS); ext.unite (gs[0]->extent (cx, X_AXIS)); Direction d = get_grob_direction (me); Real thickness = Staff_symbol_referencer::line_thickness (me); - thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0); + thickness *= robust_scm2double (me->get_property ("thickness"), 1.0); - Molecule b = Lookup::bracket (X_AXIS, ext, thickness, - d* 1.0, thickness/2); + Stencil b = Lookup::bracket (X_AXIS, ext, thickness, - d* 1.0, thickness/2); b.translate_axis ( - sp->get_bound (LEFT)->relative_coordinate (cx, X_AXIS), X_AXIS); - return b.smobbed_copy(); + return b.smobbed_copy (); } ADD_INTERFACE (Horizontal_bracket,"horizontal-bracket-interface",