Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / ly / satb.ly

diff --git a/ly/satb.ly b/ly/satb.ly
index df57811e4856a62d4fa0a0371ce9ccb7e6fd98ad..36e9dc367af947fd8b92be3cbd42ac750adb9b7d 100644 (file)
--- a/ly/satb.ly
+++ b/ly/satb.ly
@@ -11,7 +11,8 @@
   context structure for a score arrangement consisting
   of the following staves:
 
-  Descant Staff
+  Solo Staff (outside Choir grouping)
+  Descant Staff (within Choir grouping)
   Women Staff (single voice on one staff)
   Soprano and Alto (optionally on two Staves or one Staff each)
   Multiple verses (up to 9)
@@ -33,6 +34,7 @@
   \header { ... }
   Key = { ... }
   Time = { ... }
+  SoloMusic = \relative { ... }
   DescantMusic = \relative { ... }
   DescantLyrics = \lyricmode { ... }
   WomenMusic = \relative { ... }
@@ -92,6 +94,7 @@
      "Piano"
      "PianoLH"
      "PianoRH"
+     "Solo"
      "Soprano"
      "Tenor"
      "Women"
@@ -128,15 +131,14 @@
   satb-lyrics-postfixes
   satb-lyrics-variable-names)
 
+%% override the usual default value
+#(if (not SoloShortInstrumentName)
+       (set! SoloShortInstrumentName ""))
 
 SATB =
-{
-  \new ChoirStaff
-  \with {
-    \override VerticalAxisGroup.remove-empty = ##t
-    \override VerticalAxisGroup.remove-first = ##t
-  }
-  <<
+<<
+  \make-one-voice-vocal-staff "Solo" "treble"
+  \new ChoirStaff <<
     \make-one-voice-vocal-staff "Descant" "treble"
     \make-one-voice-vocal-staff "Women" "treble"
     #(if TwoVoicesPerStaff
@@ -156,18 +158,26 @@ SATB =
       #} )
     \make-one-voice-vocal-staff "Men" "bass"
   >>
-}
+>>
 
 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) }
 }