resolve merge

[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 008bb69e7b216593cc54799477aa71319fea53e7..4d1f4fc158626a6601bd9a1e1d2c31b04ed8db63 100644 (file)
--- a/input/regression/lyrics-melisma-beam.ly
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -1,7 +1,8 @@
-\version "2.12.0"
+\version "2.14.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 { 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 }
 >>