resolve merge

[lilypond.git] / input / regression / hairpin-neighboring-span-dynamics.ly

diff --git a/input/regression/hairpin-neighboring-span-dynamics.ly b/input/regression/hairpin-neighboring-span-dynamics.ly
new file mode 100644 (file)
index 0000000..69fe895
--- /dev/null
+++ b/input/regression/hairpin-neighboring-span-dynamics.ly
@@ -0,0 +1,27 @@
+\version "2.14.0"
+
+\header {
+  texidoc = "Bound padding for hairpins also works with neighboring
+@code{DynamicTextSpanner} grobs.  In this case, @code{bound-padding}
+is not scaled down.
+"
+}
+
+\relative c' {
+  \override Hairpin #'to-barline = ##f
+  c2\>
+  \dimTextDim
+  c2\>
+  \dimHairpin
+  c\> c\! \break
+  \dimTextDim
+  c2\> 
+  \override Hairpin #'bound-padding = #5
+  \dimHairpin
+  c2\>
+  \dimTextDim
+  c2\> c\! \break
+  \crescHairpin
+  c2\< c\<
+  c2\< c\!
+}