Merge branch 'master' into lilypond/translation

[lilypond.git] / input / regression / multi-measure-rest.ly

diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly
index 18d3bf8b9cecce9d6b900e95176579d2fae420ca..7edfd5939e1bfb132a0578eecbdf632ae143f139 100644 (file)
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -1,8 +1,8 @@
-\version "1.9.2"
+\version "2.12.0"
 \header{
 
-texidoc="
-Multiple measure rests do not collide with barlines and clefs.  They
+  texidoc="
+Multi-measure rests do not collide with barlines and clefs.  They
 are not expanded when you set @code{Score.skipBars}.  Although the
 multi-measure-rest is a Spanner, minimum distances are set to keep it
 colliding from barlines. 
@@ -14,24 +14,24 @@ are used then a different symbol is used.
 "
 }
 
+\layout {
+  \context {
+    \Score
+    skipBars = ##t
+  }
+  ragged-right = ##t   
+}
+
 
-\score { \notes {
-    \time 3/4 \key cis \major
-    R2.*15
+{
+  \time 3/4 \key cis \major
+  R2.*15
   
-    R2.
-    R2.*3
-    R2.*9
-    R2.*11
+  R2.*7
+  R2.*9
+  R2.*11
 
-\time 8/4 R1*2
-}
-       \paper {
-       \translator {
-               \ScoreContext
-               skipBars = ##t
-       }
-       raggedright = ##t       
-       }
+  \time 8/4 R1*2
 }
 
+