Merge commit 'origin' into beamlets2

[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 3955fddeb3cf68962acbc2b62faa985c4ee3fc85..7edfd5939e1bfb132a0578eecbdf632ae143f139 100644 (file)
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -1,36 +1,37 @@
-\version "1.5.68"
+\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. 
 
-Texts may be added to the rests by setting @code{text} in
-@code{MultiMeasureRestNumber.}
+Rests over measures during longer than 2 wholes use breve rests. When
+more than 10 or more measures (tunable through @code{expand-limit})
+are used then a different symbol is used.
 
-Rests over measures during longer than 2 wholes use breve rests.
 "
+}
 
+\layout {
+  \context {
+    \Score
+    skipBars = ##t
+  }
+  ragged-right = ##t   
 }
 
 
-\score { \notes {
-    \time 3/4 \key cis \major
-    R2.*15
-    R2.
- \once \property Staff.MultiMeasureRestNumber \set #'text = #'(music "scripts-ufermata")
-    R2.
-    R2.*3
-    R2.*7
-\time 8/4 R1*2
-}
-       \paper {
-       \translator {
-               \ScoreContext
-               skipBars = ##t
-       }
-       linewidth = -1. 
-       }
+{
+  \time 3/4 \key cis \major
+  R2.*15
+  
+  R2.*7
+  R2.*9
+  R2.*11
+
+  \time 8/4 R1*2
 }
+
+