From 4668ca21be816dc52444adc1b48a78bbd6b1d825 Mon Sep 17 00:00:00 2001
From: Trevor Daniels <t.daniels@treda.co.uk>
Date: Fri, 29 May 2015 16:12:34 +0100
Subject: [PATCH] Issue 4424: Add Solo voice to built-in satb.ly template

---
 Documentation/learning/templates.itely |  6 ++++--
 ly/satb.ly                             | 13 ++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Documentation/learning/templates.itely b/Documentation/learning/templates.itely
index 9b82f46862..a0bd4dd5cc 100644
--- a/Documentation/learning/templates.itely
+++ b/Documentation/learning/templates.itely
@@ -175,8 +175,10 @@ changed:
 @end lilypond
 
 A descant may be added by defining values for the variable
-@code{DescantMusic} and descant lyrics may be provided by
-defining values for @code{DescantLyrics}.
+@code{DescantMusic} and descant lyrics may be provided by defining
+values for @code{DescantLyrics}.  In a similar way a solo part may be
+added above the grouped choir staves by defining values for
+@code{SoloMusic} and @code{SoloLyrics}.
 
 @code{\header} and @code{\paper} blocks may be added as normal.
 A @code{\layout} block may be provided as the value of the
diff --git a/ly/satb.ly b/ly/satb.ly
index df57811e48..97f4384151 100644
--- 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,9 +131,13 @@
   satb-lyrics-postfixes
   satb-lyrics-variable-names)
 
+%% override the usual default value
+#(if (not SoloShortInstrumentName)
+       (set! SoloShortInstrumentName ""))
 
 SATB =
-{
+<<
+  \make-one-voice-vocal-staff "Solo" "treble"
   \new ChoirStaff
   \with {
     \override VerticalAxisGroup.remove-empty = ##t
@@ -156,7 +163,7 @@ SATB =
       #} )
     \make-one-voice-vocal-staff "Men" "bass"
   >>
-}
+>>
 
 Piano = \make-pianostaff
 
-- 
2.39.2