Merge with master

[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 a05e85eb44a121331089588c7f3d7bdae23a9606..d1d7cc502176c0f206f2bf789dccc0a89f39a878 100644 (file)
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -1,33 +1,33 @@
 \header {
-    
-texidoc = "Staves may be present in several sizes within a score.
+  
+  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.28"
+\version "2.11.11"
 
-\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 }
-    }
+\layout {
+  #(layout-set-staff-size 6)
+  ragged-right = ##t
+}
+
+<<
+  \new Staff \with {
+    fontSize = #-4
+    \override StaffSymbol #'staff-space = #(magstep -4)
+  }
+  \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)
+    \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 }
-    }
-  >>
+                             }
+    >>
+
 
-  \paper {
-    #(paper-set-staff-size 6)
-    raggedright = ##t
-  }
-}