fix staff-mixed-size.

diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly
index d1d7cc502176c0f206f2bf789dccc0a89f39a878..02b26c068eab03f98d0f91ea90694e64ba0138ba 100644 (file)
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -10,24 +10,24 @@ large on smaller staves."
 \version "2.11.11"
 
 \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
+    }
+  }
+>>

diff --git a/scm/paper.scm b/scm/paper.scm
index 4750b518f7d67db2c40eb6ae71ba648f9175142b..dd2ba52b6f530fad58e58ab465af673c1ddfafe3 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -61,8 +61,8 @@ points"
   (layout-set-absolute-staff-size-in-module (current-module) sz))
 
 (define-public (layout-set-staff-size sz)
-  "Function to be called inside a \\layout{} block to set the staff size. SZ is in
-points"
+  "Function to be called inside a \\layout{} block to set the staff
+size. SZ is in points"
   
   (layout-set-absolute-staff-size (* (eval 'pt (current-module)) sz)))