Issue 4424: Add Solo voice to built-in satb.ly template

diff --git a/Documentation/learning/templates.itely b/Documentation/learning/templates.itely
index 9b82f46862c9d9d619730d6ac05fd4f7a515a8ab..a0bd4dd5cc9524511b35caafc3726fd37ffce9d6 100644 (file)
--- 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
 @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
 
 @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 df57811e4856a62d4fa0a0371ce9ccb7e6fd98ad..97f4384151ed4623837099f294e74766c96b8af2 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:
 
   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)
   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 = { ... }
   \header { ... }
   Key = { ... }
   Time = { ... }

+  SoloMusic = \relative { ... }

   DescantMusic = \relative { ... }
   DescantLyrics = \lyricmode { ... }
   WomenMusic = \relative { ... }
   DescantMusic = \relative { ... }
   DescantLyrics = \lyricmode { ... }
   WomenMusic = \relative { ... }


@@ -92,6 +94,7 @@
      "Piano"
      "PianoLH"
      "PianoRH"
      "Piano"
      "PianoLH"
      "PianoRH"

+     "Solo"

      "Soprano"
      "Tenor"
      "Women"
      "Soprano"
      "Tenor"
      "Women"


@@ -128,9 +131,13 @@
   satb-lyrics-postfixes
   satb-lyrics-variable-names)
 
   satb-lyrics-postfixes
   satb-lyrics-variable-names)
 

+%% override the usual default value
+#(if (not SoloShortInstrumentName)
+       (set! SoloShortInstrumentName ""))

 
 SATB =
 
 SATB =

-{
+<<
+  \make-one-voice-vocal-staff "Solo" "treble"

   \new ChoirStaff
   \with {
     \override VerticalAxisGroup.remove-empty = ##t
   \new ChoirStaff
   \with {
     \override VerticalAxisGroup.remove-empty = ##t


@@ -156,7 +163,7 @@ SATB =
       #} )
     \make-one-voice-vocal-staff "Men" "bass"
   >>
       #} )
     \make-one-voice-vocal-staff "Men" "bass"
   >>

-}
+>>

 
 Piano = \make-pianostaff
 
 
 Piano = \make-pianostaff