hairpin.cc: transition between spanners aligns on note; issue 1216

diff --git a/input/regression/hairpin-neighboring-span-dynamics.ly b/input/regression/hairpin-neighboring-span-dynamics.ly
index 69fe8958a7cf33468d12c52fe6645750c251abdc..7cd9153e9f05ac7800dcea893d1419d62b9401c5 100644 (file)
--- 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 403e7bcd083bf4f19f96e41ee9da89f9108adce0..7d31712df4c4ac45d3ea83f45de958ab293754d9 100644 (file)
--- 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