Merge branch 'stable/2.16' into staging

[lilypond.git] / input / regression / lyrics-melisma-beam.ly

diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly
index 5cdc28c669661af68f20ca8fb4a33581ab5a8d5b..ba811ed8a900cdfdd373d6c75f833673ee0699b2 100644 (file)
--- a/input/regression/lyrics-melisma-beam.ly
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -1,10 +1,11 @@
-\version "2.7.13"
+\version "2.16.0"
 \header
 {
-  texidoc = "Melismata are triggered by manual beams." 
+  texidoc = "Melismata are triggered by manual beams.  Notes in a
+  melisma take their natural spacing over a long syllable."
 }
 
-  \layout { raggedright = ##t }
+  \layout { ragged-right = ##t }
 
 
 
@@ -13,9 +14,9 @@
   \new Staff
   \relative c'' {
     \set Staff.autoBeaming = ##f
-    c8 c8[ c8 c8]  c8    }
-  
-  \lyricsto "" \new Lyrics \lyricmode { bla bla bla }
+    g4 d8[ b8 d8 g8]  g4
+  }
+  \lyricsto "" \new Lyrics \lyricmode { bla blaa -- bla }
 >>