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 37820499dd934933d4880677c7e2953d1b1074c9..9fa58fa852d6a5e1f4f768f163a313303951ca9f 100644 (file)
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -1,32 +1,33 @@
 \header {
-    
-texidoc = "Staffs may be present in several sizes within a score.
-This is achieved with an internal scaling factor. When code forgets
-factor, objects generally become too thick or too large.
-"
+  
+  texidoc = "Staves may be present in several sizes within a score.
+This is achieved with an internal scaling factor. If the scaling factor is 
+forgotten in some places, objects generally become too thick or too 
+large on smaller staves."
 
 }
-\version "2.1.23"
 
-\score {
-  <<
-    \new Staff \with {
-      fontSize = #-4
-      \override StaffSymbol #'staff-space = #(magstep -4)
-    }
-    \notes \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
-    \notes \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 }
-    }
-  >>
+\version "2.11.51"
 
-  \paper {
-    #(paper-set-staff-size 6)
-    raggedright = ##t
-  }
+\layout {
+  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
+  }
+  \new Staff {
+    \relative c' {
+      \melody
+    }
+  }
+>>