Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / staff-mixed-size.ly

diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly
index d1d7cc502176c0f206f2bf789dccc0a89f39a878..9fa58fa852d6a5e1f4f768f163a313303951ca9f 100644 (file)
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -7,27 +7,27 @@ large on smaller staves."
 
 }
 
-\version "2.11.11"
+\version "2.11.51"
 
 \layout {
-  #(layout-set-staff-size 6)
   ragged-right = ##t
 }
 
+melody = \relative {
+  \override DynamicText  #'extra-offset = #'(0 . 3)
+  s1-\f c''8[(\< r a g]) e[ r d( <f a>])\! \times 2/3 { d4 d d }
+}
+
 <<
   \new Staff \with {
     fontSize = #-4
     \override StaffSymbol #'staff-space = #(magstep -4)
+  } {
+    \melody
   }
-  \relative c' {
-    \override DynamicText  #'extra-offset = #'(0 . 3)
-    s1-\f c''8[(\< r a g]) e[ r d( <f a>])\! \times 2/3 { d4 d d }
-                           }
-    \new Staff
+  \new Staff {
     \relative c' {
-      \override DynamicText  #'extra-offset = #'(0 . 3)
-      s1-\f c''8[(\< r a g]) e[ r d( <f a>])\! \times 2/3 { d4 d d }
-                             }
-    >>
-
-
+      \melody
+    }
+  }
+>>