X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=spirit-of-god-descend-upon-my-heart-satb.ly;h=e9383e4211d06b638eebb99fb4ffa138accaf6d8;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=a84f47b97176e43d609f3d48290e0173ed6dcba8;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/spirit-of-god-descend-upon-my-heart-satb.ly b/spirit-of-god-descend-upon-my-heart-satb.ly
index a84f47b..e9383e4 100644
--- a/spirit-of-god-descend-upon-my-heart-satb.ly
+++ b/spirit-of-god-descend-upon-my-heart-satb.ly
@@ -1,8 +1,8 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
 staffSize = #20
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -22,16 +22,29 @@ staffSize = #20
 
 
 %
-% Lead vocal
+% Song's structure
 %
+Global =
+{
+%	\clef G
+	\key bf \major
+	\numericTimeSignature
+	\time 4/4
+
+	% Verse
+
+	s1*16 \bar "||"   % 1-16
+	s1 \bar "|."   % 17
+}
 
+
+%
+% Lead vocal
+%
 LeadVox = \relative c'
 {
 	\set Staff.instrumentName = #"Sop."
 	\clef G
-	\key bf \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
 
 	% Verse
 
@@ -53,17 +66,15 @@ LeadVox = \relative c'
 	d2 c4 bf |   % 13
 	a4 g f bf |   % 14
 	f2 f |   % 15
-	f1 \bar "||"   % 16
-	g2 f \bar "|."   % 17
+	f1 |   % 16
+	g2 f |   % 17
 }
 
+
 AltoVox = \relative c'
 {
 	\set Staff.instrumentName = #"Alto"
 	\clef G
-	\key bf \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
 
 	% Verse
 
@@ -85,17 +96,15 @@ AltoVox = \relative c'
 	d2 ef4 f |   % 13
 	f4 ef d ef |   % 14
 	d2 ef |   % 15
-	d1 \bar "||"   % 16
-	ef2 d \bar "|."   % 17
+	d1 |   % 16
+	ef2 d |   % 17
 }
 
+
 TenorVox = \relative c
 {
 	\set Staff.instrumentName = #"Tenor"
 	\clef F
-	\key bf \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
 
 	% Verse
 
@@ -117,17 +126,15 @@ TenorVox = \relative c
 	bf4 ( g ) a bf |   % 13
 	bf4 bf bf bf |   % 14
 	bf2 a |   % 15
-	bf1 \bar "||"   % 16
-	bf2 bf \bar "|."   % 17
+	bf1 |   % 16
+	bf2 bf |   % 17
 }
 
+
 BassVox = \relative c
 {
 	\set Staff.instrumentName = #"Bass"
 	\clef F
-	\key bf \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
 
 	% Verse
 
@@ -149,14 +156,8 @@ BassVox = \relative c
 	bf,2 c4 d |   % 13
 	ef4 ef f g |   % 14
 	f2 f |   % 15
-	bf,1 \bar "||"   % 16
-	ef2 bf \bar "|."   % 17
-}
-
-
-Riffs = \relative c'
-{
-	\teeny
+	bf,1 |   % 16
+	ef2 bf |   % 17
 }
 
 
@@ -226,17 +227,19 @@ Dynamics =
 \score
 {
 	<<
-		\new ChoirStaff = "Rhythm"
+%		\Global		% The "roadmap" that everything else depends on
+
+		\new ChoirStaff
 		<<
-			\new Staff = UpperStaffA { \new Voice = "lead" \LeadVox }
+			\new Staff << \Global \new Voice = "lead" \LeadVox >>
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 			\new Lyrics \lyricsto "lead" \LeadVoxTextC
 			\new Lyrics \lyricsto "lead" \LeadVoxTextD
 			\new Lyrics \lyricsto "lead" \LeadVoxTextE
-			\new Staff = UpperStaffB { \new Voice = "alto" \AltoVox }
-			\new Staff = LowerStaffA { \new Voice = "tenor" \TenorVox }
-			\new Staff = LowerStaffB { \new Voice = "bass" \BassVox }
+			\new Staff << \Global \new Voice = "alto" \AltoVox >>
+			\new Staff << \Global \new Voice = "tenor" \TenorVox >>
+			\new Staff << \Global \new Voice = "bass" \BassVox >>
 		>>
 
 		\set Score.skipBars = ##t
@@ -247,11 +250,11 @@ Dynamics =
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
+	#(define fonts (make-pango-font-tree
+		"Times New Roman"
+		"LilyJAZZText"
+		"Luxi Mono"
+		(/ staffSize 20)))
 
 % Spread staves vertically across last page (default: t)
 	ragged-last-bottom = ##f
@@ -262,6 +265,5 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
-%let's try this: [It works! Huzzah!]
-	obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }
+