resolve merge

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

diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly
index 14ddd436cf39006676525c8af499df19e54c6803..5ed91a15b1c37751150eb7c9a414f27ffe0de119 100644 (file)
--- a/input/regression/multi-measure-rest-multi-staff-center.ly
+++ b/input/regression/multi-measure-rest-multi-staff-center.ly
@@ -1,17 +1,19 @@
-\header { texidoc = "The centering of multi-measure rests is
-independent on prefatory matter in other staves."
-
-       }
-
-
-\version "2.12.0"
-\layout { ragged-right = ##t }
-
-
-<< \new Staff  { R1 } 
-   \new Staff { f'1  \clef bass } 
-
- >>
-
- 
-
+\version "2.14.0"
+
+\header {
+  texidoc = "Though the default spacing for multi-measure rests
+is affected by prefatory matter in other staves, centering can be
+restored by overriding @code{spacing-pair}."
+}
+
+<<
+  \new Staff  {
+    \once \override MultiMeasureRest #'spacing-pair =
+    #'(break-alignment . staff-bar)
+    R1
+  }
+  \new Staff {
+    f'1
+    \clef bass
+  }
+>>