Merge commit 'origin' into includes

[lilypond.git] / input / regression / lyric-hyphen.ly

diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly
index 7f40046aa13dfe5eb1bf8d6e6f9fc96d61d05dfd..ae3ea0e7eb75d84d608b14d3a5322112e4e13414 100644 (file)
--- a/input/regression/lyric-hyphen.ly
+++ b/input/regression/lyric-hyphen.ly
@@ -1,10 +1,16 @@
-\version "1.9.8"
-\header {texidoc="Tests lyric hyphens. "}
-\score{
-       <<
-       \context Staff \notes { c' (c') (c') c' }
-       \context Lyrics \context LyricsVoice \lyrics { bla -- alb xxx -- yyy }
-       >>
+\version "2.12.0"
+\header {
+    texidoc = "In lyrics, hyphens may be used."
+}
+\layout {
+
+    ragged-right= ##t
+}
+
+\new Voice { c' (c') c'( c') }
+\addlyrics {
+  \override Lyrics . LyricSpace #'minimum-distance = #5.0
+  a -- b x -- y
 }