From: Trevor Daniels <t.daniels@treda.co.uk>
Date: Sat, 6 Jun 2015 21:22:13 +0000 (+0100)
Subject: Issue 4435: Remove Solo staff when empty
X-Git-Tag: release/2.19.22-1~50
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8aa22bbddc78ee71ead7bb3b29decafdc176f520;p=lilypond.git

Issue 4435: Remove Solo staff when empty

  The recently added Solo staff is outside the ChoirStaff and so
  is not affected by the ChoirStaff overrides to VerticalAxisGroup.
  This patch moves the overrides into a \layout block at top level
  so all staves are affected.  The overrides in PianoStaff are then
  no longer required.  Note that this \layout block can itself be
  overridden by setting the Layout variable.
---

diff --git a/ly/piano-tkit.ly b/ly/piano-tkit.ly
index 73ccb6685a..2ec4b14e9f 100644
--- a/ly/piano-tkit.ly
+++ b/ly/piano-tkit.ly
@@ -32,8 +32,6 @@ make-pianostaff =
       #(if PianoShortInstrumentName
            PianoShortInstrumentName
            "")
-    \override VerticalAxisGroup.remove-empty = ##t
-    \override VerticalAxisGroup.remove-first = ##t
   }
   <<
     \make-one-voice-staff ##f "PianoRH" "treble" ""
diff --git a/ly/satb.ly b/ly/satb.ly
index 97f4384151..2a7e9adb0a 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,6 +164,14 @@ 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