Merge commit 'origin' into includes

[lilypond.git] / input / regression / hairpin-ending.ly

diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly
index d7f1e6e581504ec6bacef4614842731e70b75aec..a5e33c426c7dcf941058ac1c078b4814cc0d823b 100644 (file)
--- a/input/regression/hairpin-ending.ly
+++ b/input/regression/hairpin-ending.ly
@@ -1,15 +1,22 @@
-\version "1.5.68"
+
+\version "2.12.0"
 
 \header {
 
-texidoc = "Hairpin dynamics start under notes if there are
+  texidoc = "Hairpin dynamics start under notes if there are
 no text-dynamics. If there are text dynamics, the hairpin does not run
 into them."
 
 }
 
+\layout { ragged-right = ##t } 
 
-\score {
-\notes \relative c'' { c4 \> c4 \! c4 c4_\ff \> c4 \! c4 \p }
-\paper { linewidth = -1.} 
+\relative c'' {
+  c4 \> c4 c4\! c4_\ff \> c4 c4\!\p
+  
+  <<
+    { c\< c\! }
+    \lyrics { "a" loooong }
+  >>
 }
+