X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=41bdec37fc94badd49b8502c30c37b60a3cb0fe3;hb=2a00c69a012d4ccaf24a036bdb5ac9ea43fb9604;hp=8c9656d32fd3f87cf777be446387a02735da08f7;hpb=9bb15dbe945da125bb77a5fe5d082bf3eab5c526;p=lilypond.git diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 8c9656d32f..41bdec37fc 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -77,7 +77,6 @@ flatten_number_pair_property (Grob *me, /* Return beam that encompasses the span of the tuplet bracket. */ - Grob * Tuplet_bracket::parallel_beam (Grob *me_grob, vector const &cols, bool *equally_long) @@ -512,17 +511,15 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) bool equally_long = false; Grob *par_beam = parallel_beam (me, columns, &equally_long); - - Item *lgr = get_x_bound_item (me, LEFT, dir); Item *rgr = get_x_bound_item (me, RIGHT, dir); Real x0 = robust_relative_extent (lgr, commonx, X_AXIS)[LEFT]; Real x1 = robust_relative_extent (rgr, commonx, X_AXIS)[RIGHT]; bool follow_beam = par_beam - && ((get_grob_direction (par_beam) == dir) || to_boolean (par_beam->get_property ("knee"))); + && ((get_grob_direction (par_beam) == dir) + || to_boolean (par_beam->get_property ("knee"))); vector points; - if (columns.size () && follow_beam && Note_column::get_stem (columns[0]) @@ -533,13 +530,9 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) */ (void) par_beam->get_property ("quantized-positions"); - Drul_array stems (Note_column::get_stem (columns[0]), Note_column::get_stem (columns.back ())); - - - Real ss = 0.5 * Staff_symbol_referencer::staff_space (me); Real lp = ss * robust_scm2double (stems[LEFT]->get_property ("stem-end-position"), 0.0) + stems[LEFT]->get_parent (Y_AXIS)->relative_coordinate (commony, Y_AXIS) - my_offset;