diff options
| author | Keith OHara <k-ohara5a5a@oco.net> | 2011-12-14 18:41:10 -0800 |
|---|---|---|
| committer | Keith OHara <k-ohara5a5a@oco.net> | 2011-12-18 21:24:20 -0800 |
| commit | ff72533418b797e56d34084377929892035af180 (patch) | |
| tree | 755fe509be508768ccf2ae1b6687e5cce0f757bc | |
| parent | 49fbcc8b526edcad8a0650e9d7870b647c43d698 (diff) | |
hairpin.cc: transition between spanners aligns on note; issue 1216
| -rw-r--r-- | input/regression/hairpin-neighboring-span-dynamics.ly | 2 | ||||
| -rw-r--r-- | lily/hairpin.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/input/regression/hairpin-neighboring-span-dynamics.ly b/input/regression/hairpin-neighboring-span-dynamics.ly index 69fe8958a7..7cd9153e9f 100644 --- a/input/regression/hairpin-neighboring-span-dynamics.ly +++ b/input/regression/hairpin-neighboring-span-dynamics.ly @@ -1,7 +1,7 @@ \version "2.14.0" \header { - texidoc = "Bound padding for hairpins also works with neighboring + texidoc = "Bound padding for hairpins also applies before following @code{DynamicTextSpanner} grobs. In this case, @code{bound-padding} is not scaled down. " diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 403e7bcd08..7d31712df4 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -220,9 +220,9 @@ Hairpin::print (SCM smob) else x_points[d] = e.center () - d * padding / 3; } - // Our neighbor is a dynamic text spanner, so add the - // same amount of padding as for text dynamics - else + // Our neighbor is a dynamic text spanner. + // If we end on the text, pad as for text dynamics + else if (d == RIGHT) x_points[d] = e[-d] - d * padding; } else |