X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fsatb.ly;h=36e9dc367af947fd8b92be3cbd42ac750adb9b7d;hb=cca3c4542eded4f78aad08ed0928c368d7695e9a;hp=97f4384151ed4623837099f294e74766c96b8af2;hpb=4668ca21be816dc52444adc1b48a78bbd6b1d825;p=lilypond.git

diff --git a/ly/satb.ly b/ly/satb.ly
index 97f4384151..36e9dc367a 100644
--- a/ly/satb.ly
+++ b/ly/satb.ly
@@ -138,12 +138,7 @@
 SATB =
 <<
   \make-one-voice-vocal-staff "Solo" "treble"
-  \new ChoirStaff
-  \with {
-    \override VerticalAxisGroup.remove-empty = ##t
-    \override VerticalAxisGroup.remove-first = ##t
-  }
-  <<
+  \new ChoirStaff <<
     \make-one-voice-vocal-staff "Descant" "treble"
     \make-one-voice-vocal-staff "Women" "treble"
     #(if TwoVoicesPerStaff
@@ -169,12 +164,20 @@ Piano = \make-pianostaff
 
 \tagGroup #'(print play)
 
+\layout {
+  \context {
+    \Staff
+    \override VerticalAxisGroup.remove-empty = ##t
+    \override VerticalAxisGroup.remove-first = ##t
+  }
+}
+
 \score {
   \keepWithTag #'print
   #(if have-music
        #{ << \SATB \Piano >> #}
        #{ { } #} )
-  \layout { $(if Layout #{ \Layout #} ) }
+  \layout { $(if Layout Layout) }
 }