Merge commit 'origin' into beamlets2

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

diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly
index 6cc2818faadf8e06643731e80d4d8a343a3860df..05ab44cd8120c4f18b761aae1f2d7c62476a8edc 100644 (file)
--- a/input/regression/multi-measure-rest-text.ly
+++ b/input/regression/multi-measure-rest-text.ly
@@ -1,19 +1,30 @@
-\version "1.7.23"
+\version "2.12.0"
 
 \header  {
-texidoc = "
-Texts may be added to the multi measure rests.
+
+  texidoc = "
+Texts may be added to the multi-measure rests.
+
+By setting the appropriate @code{spacing-procedure}, we can make
+measures stretch to accomodate wide texts.
+
 "
 
+
 }
 
-\score { \notes {
+\layout { ragged-right = ##t }
+{
   \time 3/4
-  \property Score.skipBars = ##t
-  R2._\markup { \center << \musicglyph  #"scripts-dfermata" \roman "Ad lib"  >>  }
+  \set Score.skipBars = ##t
+  R2._\markup { \center-column { \musicglyph  #"scripts.dfermata" \roman "Ad lib"  }  }
   R2.^\fermataMarkup
   R2.^"4"
   R2.*3_\markup { \roman "a1b2c3" }
   R2.*10^"inner"^"top"_"inner"_"bot"
-  c2.
-}}
+  \override MultiMeasureRestText  #'springs-and-rods
+    = #ly:multi-measure-rest::set-text-rods
+
+  R2.^"very very very very very very long text"
+  c'2.
+}