Fix #1231.

* scm/define-grobs.scm (all-grob-descriptions):

  change MultiMeasureRest default for spacing-pair

diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly
index 14ddd436cf39006676525c8af499df19e54c6803..38420322169684c3817c9fe1fc0bfbca534c441a 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.13.34"
+
+\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
+  }
+>>

diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly
index 7edfd5939e1bfb132a0578eecbdf632ae143f139..f0cb466ad87aa590aea4de4da8ef40159c1a51c2 100644 (file)
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -1,16 +1,15 @@
 \version "2.12.0"
-\header{
 
+\header {
   texidoc="
-Multi-measure rests do not collide with barlines and clefs.  They
+Multi-measure rests do not collide with bar lines 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. 
-
-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.
+multi-measure-rest is a Spanner, minimum distances are set to stop it
+colliding with bar lines.
 
+Rests over measures lasting longer than 2 wholes use breve rests.  When
+more than 10 measures (tunable through @code{expand-limit}) are used
+then a different symbol is used.
 "
 }
 
@@ -19,19 +18,16 @@ are used then a different symbol is used.
     \Score
     skipBars = ##t
   }
-  ragged-right = ##t   
 }
 
-
 {
-  \time 3/4 \key cis \major
+  \time 3/4
+  \key cis \major
   R2.*15
   
   R2.*7
   R2.*9
   R2.*11
-
+  \clef bass
   \time 8/4 R1*2
 }
-
-

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 7d6c1b3dc18818e2471ae68898245775f97b5eb7..4eeb3812c7c98ae62ce2e9b8621deeca595abc99 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1186,7 +1186,7 @@
        (expand-limit . 10)
        (hair-thickness . 2.0)
        (padding . 1)
-       (spacing-pair . (break-alignment . staff-bar))
+       (spacing-pair . (break-alignment . break-alignment))
        (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
        (staff-position . 0)
        (stencil . ,ly:multi-measure-rest::print)