The grand \paper -> \layout, \bookpaper -> \paper renaming.

[lilypond.git] / input / test / bar-lines-lyric-only.ly

diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly
index 1d71b4315bb4ff15beede563d67029bacd045317..395ea93bc780e37cc60bc17c8fe3968a9f8e4120 100644 (file)
--- a/input/test/bar-lines-lyric-only.ly
+++ b/input/test/bar-lines-lyric-only.ly
@@ -1,46 +1,38 @@
-\version "1.7.18"
-\header {
-
-texidoc = "@cindex Bar Line Lyric Only
-
-You can move around @code{Bar_engraver} and
-@code{Span_bar_engraver} if you want bar lines on lyrics.
-"  }
-
+\version "2.3.22"
+\header { texidoc = "@cindex Bar line lyric only
+You can move @code{Bar_engraver} and @code{Span_bar_engraver} to 
+a different engraving context, if you want, for example, bar lines 
+on lyrics. "
+}
 
 \score {
-\notes \relative c' \context StaffGroup = groupie <
- \context Staff = SA { c1 c1 c1}
- \context Lyrics \lyrics <
-  { bla1 die bla }
-  { foo bar foo }
-  { foo bar foo }  
- >
- \context Staff = SB { c1 c1 c1} 
-
- > 
+    \relative c' \context ChoirStaff <<
+       \new Staff { c1 c1 c1}
+       \lyricmode <<
+           \new Lyrics  { bla1 die bla }
+       >>
+       \new Staff { c1 c1 c1} 
+    >>
 
 
-\paper  {
+    \layout  {
        raggedright = ##t
-\translator {
-  \LyricsVoiceContext
-  \consists Bar_engraver
-  % need procedure, since lyrics doesn't have a staff_sym engraver.
-  BarLine \override #'bar-size-procedure = #(lambda (x) 3.0)
-}
-
-\translator {
-  \LyricsContext
-  \consists "Span_bar_engraver"
-}
-\translator{
-  \StaffGroupContext
-  \remove "Span_bar_engraver"
-}
-       \translator {
-           \StaffContext
+       \context {
+           \Lyrics
+           \consists Bar_engraver
+
+
+           %% need procedure, since lyrics doesn't have a staff_sym engraver.
+           \override BarLine #'bar-size-procedure = #(lambda (x) 3.0)
+       }
+       \context{
+           \ChoirStaff
+           \remove "Span_bar_engraver"
+       }
+       \context {
+           \Staff
            \remove "Bar_engraver"
-           }
-}}
+       }
+    }
+}