- #(one-voice-staff "Descant" "treble")
-
- #(if (defaulting TwoVoicesPerStaff #f)
- (two-voice-staff "Women" "treble" "Soprano" "Alto")
- (make-simultaneous-music (list (one-voice-staff "Soprano" "treble")
- (one-voice-staff "Alto" "treble"))))
-
- #(lyrics-if-defined VerseOne "Soprano")
- #(lyrics-if-defined VerseTwo "Soprano")
- #(lyrics-if-defined VerseThree "Soprano")
- #(lyrics-if-defined VerseFour "Soprano")
- #(lyrics-if-defined VerseFive "Soprano")
- #(lyrics-if-defined VerseSix "Soprano")
- #(lyrics-if-defined VerseSeven "Soprano")
- #(lyrics-if-defined VerseEight "Soprano")
- #(lyrics-if-defined VerseNine "Soprano")
-
- #(if (defaulting TwoVoicesPerStaff #f)
- (two-voice-staff "Men" "bass" "Tenor" "Bass")
- (make-simultaneous-music (list (one-voice-staff "Tenor" "treble_8")
- (one-voice-staff "Bass" "bass"))))
+ #(satb-one-voice-staff "Descant" "treble")
+
+ #(if (satb-defaulting TwoVoicesPerStaff #f)
+ (satb-two-voice-staff "Women" "treble" "Soprano" "Alto")
+ (make-simultaneous-music (list (satb-one-voice-staff "Soprano" "treble")
+ (satb-one-voice-staff "Alto" "treble"))))
+
+ #(satb-lyrics-if-defined VerseOne "Soprano")
+ #(satb-lyrics-if-defined VerseTwo "Soprano")
+ #(satb-lyrics-if-defined VerseThree "Soprano")
+ #(satb-lyrics-if-defined VerseFour "Soprano")
+ #(satb-lyrics-if-defined VerseFive "Soprano")
+ #(satb-lyrics-if-defined VerseSix "Soprano")
+ #(satb-lyrics-if-defined VerseSeven "Soprano")
+ #(satb-lyrics-if-defined VerseEight "Soprano")
+ #(satb-lyrics-if-defined VerseNine "Soprano")
+
+ #(if (satb-defaulting TwoVoicesPerStaff #f)
+ (satb-two-voice-staff "Men" "bass" "Tenor" "Bass")
+ (make-simultaneous-music (list (satb-one-voice-staff "Tenor" "treble_8")
+ (satb-one-voice-staff "Bass" "bass"))))