Merge commit 'origin' into beamlets2

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

diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index e114d4f7ad4b8842173d8a0a2ed42199f48e3937..feb952071626752c61c6c26963b613e13f239ef2 100644 (file)
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -1,39 +1,40 @@
-\version "2.1.36"
+\version "2.12.0"
 \header {
   texidoc = "Span bars are drawn only between staff bar lines. By setting 
 bar lines to transparent, they are shown only between systems.
 
-Setting @code{SpanBar} transparent does the removes the barlines
+Setting @code{SpanBar} transparent  removes the barlines
 between systems.
  
 "
 }
 
-\score {
-  \notes \relative c' \new StaffGroup <<
-    \new Staff {
-      \override Score.BarLine #'transparent = ##t
-      a1 a1
-      \revert Score.BarLine #'transparent
-      \override Score.SpanBar #'transparent = ##t
-      a1 a1
-    }
-    \lyrics <<
-      \new Lyrics { bla1 die bla }
-      \new Lyrics { foo bar foo }
-    >>
-    \new Staff {
-      f1 f1 f1 f1
-    }
-  >>
-  \paper {
-    \context {
-      \StaffContext
-    }
-    raggedright =##t 
+\layout {
+  \context {
+    \Staff
   }
+  ragged-right =##t 
 }
 
+\relative c' \new StaffGroup <<
+  \new Staff {
+    a1
+    \once \override Score.BarLine #'transparent = ##t
+    a1
+    \once \override Score.SpanBar #'transparent = ##t
+    a1 a1
+    \bar "|."
+  }
+  \lyricmode <<
+    \new Lyrics { bla1 die bla }
+    \new Lyrics { foo bar foo }
+  >>
+  \new Staff {
+    f1 f1 f1 f1
+  }
+>>
+
+
 
 %% Local variables:
 %% LilyPond-indent-level:2