From: Keith OHara <k-ohara5a5a@oco.net>
Date: Thu, 15 Dec 2011 02:41:10 +0000 (-0800)
Subject: hairpin.cc: transition between spanners aligns on note; issue 1216
X-Git-Tag: release/2.15.23-1~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ff72533418b797e56d34084377929892035af180;p=lilypond.git

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 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