Merge remote-tracking branch 'origin/translation' into staging

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

diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index d7f1b2ed3481eeb484f03245b01812c11e7d065d..3d16224aeb74a24ddace818d87579c1b9000c0db 100644 (file)
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -1,43 +1,29 @@
-\version "1.7.6"
-\header{
-  texidoc="Lyric phrasing
+\version "2.19.2"
+\header {
 
-  We find start and end of phrases, and align lyrics of multiple stanzas
-  accordingly.
+  texidoc = "
+  Normally, the lyric is centered on the note head. However, on
+  melismata, the text is left aligned on the left-side of the note head.
 
-  Also, lyrics at start of melismata should be left aligned.
-  (is that only lyrics that are followed by `__'?  Because
-  that seems to be the case now -- jcn)
+"
+}
 
-@example
-          |        |        |     |      |
-         x|       x|       x|    x|     x|
+  \layout { ragged-right = ##t }
 
-     1:  Start  sentence  melisma      end.
-     2:  x         x         x______      x
-@end example
 
-  Only lyrics that are followed by '__' while there's a melisma,
-  are left-aligned, in this case the third x."
-}
 
-\paper { linewidth = -1. }
-\score {
-  \addlyrics
-    \context Voice = "v" \notes  \relative c'' {
-      \property Staff.automaticMelismata = ##t
-      \autoBeamOff
-      a a a8()a a4
-    }
-    \context Lyrics <
-      \context LyricsVoice = "v-1" \lyrics {
-        \property LyricsVoice . stanza = "1:"
-        Start sentence melisma end.
-      }
-      \context LyricsVoice = "v-2" \lyrics {
-        \property LyricsVoice . stanza = "2:"
-        x x x __ x.
-      }
-   >
-}
-%% new-chords-done %%
+
+<<
+  \relative c' \new Voice = "bla" {
+    \autoBeamOff
+    c4( c16 d c b)  c4
+    d16[ e f g]
+    
+  }
+  \context Lyrics \lyricsto "bla" {
+    alllll __ tijd
+    izzz
+  }
+>>
+
+