Merge commit 'origin' into beamlets2

[lilypond.git] / input / regression / lyrics-bar.ly

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index e530c0f790751afbb89b9d3ddcf494f3b3e4bd9c..f8b7d83575ad9f73d981d43b806c070e2f13638f 100644 (file)
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,39 +1,37 @@
-\version "2.1.19"
+\version "2.12.0"
 
 \header{
 texidoc="
-Adding a @code{Bar_engraver} to the LyricsVoice context makes sure that
-lyrics don't collide with barlines.
+Adding a @code{Bar_engraver} to the Lyrics context makes sure that
+lyrics do not collide with barlines.
 "
 }
 
-\score {
-       \context StaffGroup <<
-       \notes \context Staff {
-               b1 \bar "|:" b1 \bar ":|"
-       }
-       \lyrics <<
-               \context LyricsVoiceWithBars {
-%                      thisContextHasBarEngraver1  added
-                       ThisContextCertainlyHasBarEngraverAddedButThereHasBeenSomethingFunnyBefore1.  Here.
-               }
-               \context LyricsVoice {
-                       this4 one has no BarEngraverAddedToContext1
-               }
-       >>
-       \notes \new Staff { b1 b1 }
-       >>
-       \paper {
-               raggedright = ##t
-               \translator {
-                       \ScoreContext
-                       \accepts "LyricsVoiceWithBars"
-               }
-               \translator {
-                       \LyricsVoiceContext
-                       \consists "Bar_engraver"
-                       \name "LyricsVoiceWithBars"
-               }
-       }
+\layout {
+    ragged-right = ##t
 }
 
+<<
+    \new Staff \with
+    {
+%      \remove "Bar_engraver"  
+       }
+    {
+       b1 \bar "|:" b1 \bar ":|"
+    }
+    \context Lyrics \with {
+       \consists "Bar_engraver"
+       \consists "Separating_line_group_engraver"
+       \override BarLine #'bar-size = #4 
+    } \lyricmode {
+         looooooooooooooooooooooooooooooooooong1 syllable
+      }
+    \lyrics {
+       no Bar_Engraver_Bar_Engraver_Bar_Engraver 
+    }
+    \new Staff \with {
+%              \remove "Bar_engraver"  
+    } { b1 b1 }
+>>
+       
+