X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=a0f6ab8588df43b8e0026cf4ffda619eea35a9b5;hb=9050e89881116f765d6b1686287a48091666b0be;hp=1248b9cd6be1ae0368e559b9fcf85ef07e79d258;hpb=665588d4d4da774799f8402e482b0f2266c01791;p=lilypond.git diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 1248b9cd6b..a0f6ab8588 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -438,16 +438,16 @@ Tuplet_bracket::get_bounds (Grob *me, Grob **left, Grob **right) while (l < columns.size () && Note_column::has_rests (columns[l])) l++; - vsize r = columns.size () - 1; - while (r >= l && Note_column::has_rests (columns[r])) + vsize r = columns.size (); + while (r > l && Note_column::has_rests (columns[r-1])) r--; *left = *right = 0; - if (l <= r) + if (l < r) { *left = columns[l]; - *right = columns[r]; + *right = columns[r-1]; } } @@ -644,9 +644,6 @@ Tuplet_bracket::calc_positions (SCM smob) Real lp = scm_to_double (scm_car (ps)); Real rp = scm_to_double (scm_cdr (ps)); - /* - duh. magic. - */ Real ss = Staff_symbol_referencer::staff_space (me); offset = lp + dir * (0.5 + scm_to_double (me->get_property ("padding")));