X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-bracket.cc;h=821067bee65f19520a21b6409fb5133d65b529db;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=312459e67ba7addd5f9a4cd23eb021d870f8d807;hpb=21c7a8b7fc473a154836fad5694a06cb62956d09;p=lilypond.git diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc index 312459e67b..821067bee6 100644 --- a/lily/piano-pedal-bracket.cc +++ b/lily/piano-pedal-bracket.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2003--2011 Han-Wen Nienhuys + Copyright (C) 2003--2014 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,6 +21,7 @@ #include "spanner.hh" #include "item.hh" #include "tuplet-bracket.hh" +#include "axis-group-interface.hh" struct Piano_pedal_bracket { @@ -51,8 +52,7 @@ Piano_pedal_bracket::print (SCM smob) common = common->common_refpoint (textbit, X_AXIS); Interval span_points (0, 0); - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { Item *b = me->get_bound (d); broken[d] = b->break_status_dir () != CENTER; @@ -66,12 +66,12 @@ Piano_pedal_bracket::print (SCM smob) else flare[d] = 0.0; - span_points[d] = robust_relative_extent (b, common, X_AXIS)[RIGHT]; + span_points[d] + = Axis_group_interface::generic_bound_extent (b, common, X_AXIS)[RIGHT]; } else span_points[d] = b->relative_coordinate (common, X_AXIS); } - 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