Merge commit 'origin' into beamlets2

[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 0a9ce17428aec6e97318beb2c9337083848b3e34..c3bcc78b6a89bbc6708a59640d7c7b5ee759a1fb 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.3.4"
+\version "2.12.0"
 
-\score {
-  <<
-    \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
-     \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 {
+  ragged-right = ##t
+}
 
-  \paper {
-    #(paper-set-staff-size 6)
-    raggedright = ##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
+    }
+  }
+>>