From: Devon Schudy Date: Sun, 30 Mar 2014 05:15:57 +0000 (-0400) Subject: Tuplet brackets should reliably not follow kneed beams, regardless of whether Beam... X-Git-Tag: release/2.19.5-1~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=731c856348456b8286e1e40a2f6aa4118c304107;p=lilypond.git Tuplet brackets should reliably not follow kneed beams, regardless of whether Beam::is_knee has been called yet. This affects input/regression/tuplet-number-kneed-beam-horizontal-fit, and the following: { \override TupletBracket.bracket-visibility = ##t \times 1/2 { c8 c''' c c''' } } Is it safe to call Beam::is_knee in Tuplet_bracket::calc_position_and_height? --- diff --git a/input/regression/tuplet-number-kneed-beam-horizontal-fit.ly b/input/regression/tuplet-number-kneed-beam-horizontal-fit.ly index db09b94e23..21f17d1827 100644 --- a/input/regression/tuplet-number-kneed-beam-horizontal-fit.ly +++ b/input/regression/tuplet-number-kneed-beam-horizontal-fit.ly @@ -3,7 +3,10 @@ \header { texidoc = "Tuplet numbers are placed next to the beam unless there is insufficient horizontal space for them, in which case bracket-based -positioning is used and a programming error is issued." +positioning is used and a programming error is issued. + +The first tuplet number should be between stems; the second should be +below the noteheads." } #(ly:expect-warning (_ "not enough space for tuplet number against beam")) diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index f4b4456812..04e67fbdec 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -523,7 +523,7 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) 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")); + && !Beam::is_knee (par_beam); vector points; if (columns.size ()