X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=this-is-my-father%27s-world-satb.ly;h=c3ab33cbb19a088e2a9b99cca1826383e5895151;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=919ac5b69892a14462f866a6a7e9837211912fec;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/this-is-my-father's-world-satb.ly b/this-is-my-father's-world-satb.ly
index 919ac5b..c3ab33c 100644
--- a/this-is-my-father's-world-satb.ly
+++ b/this-is-my-father's-world-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)
@@ -20,21 +20,33 @@ staffSize = #20
 
 
 %
-% Lead vocal
+% Song's structure
 %
+Global =
+{
+	\key ef \major
+	\numericTimeSignature
+	\time 4/4
+
+	% Verse
+
+	\partial 4*1 s4 |   % 0
+	s1*15 |   % 1-15
+	\partial 4*3 s2. \bar "|."   % 16
+}
+
 
+%
+% Lead vocal
+%
 LeadVox = \relative c'
 {
 	\set Staff.instrumentName = #"Sop."
 	\clef G
-	\key ef \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-%\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Verse
 
-	\partial 4 ef8 f |   % 0
+	ef8 f |   % 0
 	g4 bf g f |   % 1
 	ef2. f8 g |   % 2
 	af4 c bf g |   % 3
@@ -53,22 +65,18 @@ LeadVox = \relative c'
 	bf4 g g f8 ef |   % 13
 	g4 f ef bf |   % 14
 	ef8 f g4 bf f8 ( g ) |   % 15
-%	\partial 2.
-	ef2. \bar "|."   % 16
+	ef2. |   % 16
 }
 
+
 AltoVox = \relative c'
 {
 	\set Staff.instrumentName = #"Alto"
 	\clef G
-	\key ef \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-%\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Verse
 
-	\partial 4 ef4 |   % 0
+	ef4 |   % 0
 	ef4 ef ef d |   % 1
 	ef2. ef4 |   % 2
 	f4 f f ef |   % 3
@@ -87,22 +95,18 @@ AltoVox = \relative c'
 	ef4 ef d d8 ( ef ) |   % 13
 	b4 d c bf |   % 14
 	ef4 ef ef d8 ~ d |   % 15
-%	\partial 2.
 	ef2. |   % 16
 }
 
+
 TenorVox = \relative c'
 {
 	\set Staff.instrumentName = #"Tenor"
 	\clef F
-	\key ef \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-%\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Verse
 
-	\partial 4 g8 af |   % 0
+	g8 af |   % 0
 	bf4 bf bf af |   % 1
 	g2. c4 |   % 2
 	c4 af f g8 af |   % 3
@@ -121,22 +125,18 @@ TenorVox = \relative c'
 	g4 bf g g8 ~ g |   % 13
 	g4 g g f |   % 14
 	g8 af bf4 bf af8 ( bf ) |   % 15
-%	\partial 2.
 	g2. |   % 16
 }
 
+
 BassVox = \relative c
 {
 	\set Staff.instrumentName = #"Bass"
 	\clef F
-	\key ef \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-%\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Verse
 
-	\partial 4 ef4 |   % 0
+	ef4 |   % 0
 	ef4 g, bf bf |   % 1
 	c2. af'8 g |   % 2
 	f4 ef d ef |   % 3
@@ -155,10 +155,10 @@ BassVox = \relative c
 	ef4 ef b c8 ~ c |   % 13
 	g4 b c d |   % 14
 	ef4 ef g, bf8 ~ bf |   % 15
-%	\partial 2.
 	ef2. |   % 16
 }
 
+
 LeadVoxText = \lyricmode
 {
 	This _ is my Fa -- ther’s world,
@@ -224,21 +224,15 @@ Dynamics =
 \score
 {
 	<<
-%		\new ChoirStaff = "Rhythm"
-%		<<
-%			\new ChordNames = "chords" \Chords
-%			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
-%		>>
-
-		\new ChoirStaff = "Vox"
+		\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 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
@@ -249,11 +243,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
@@ -264,6 +258,5 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
-%let's try this: [It works! Huzzah!]
-	page-top-space = 0
 }
+