X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=spirit-of-the-living-god.ly;h=c04c58333c7f0af54a97d68c8de843ce5696abd2;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=603cf03dad40eb027767856c6279140dd4597522;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/spirit-of-the-living-god.ly b/spirit-of-the-living-god.ly
index 603cf03..c04c583 100644
--- a/spirit-of-the-living-god.ly
+++ b/spirit-of-the-living-god.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)
@@ -10,84 +10,103 @@ staffSize = #20
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Spirit of the Living God" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
-	tagline  = "Engraved by JLH and Lilypond 2.8.6"
+	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
 }
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c''
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Lead vox"
 	\clef G
 	\key f \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	R1 |   % 1
-	R1 |   % 2
-	R1 |   % 3
-	R1 \bar "||:"   % 4
+	s1*4 \bar ".|:-||"   % 4
 
 	\repeat volta 3
 	{
 		% A section
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		a4. a8 a4 a |   % 5
-		g4 a bf2 |   % 6
-		a4. f8 f4 g |   % 7
-		a1 |   % 8
-
-		a4. a8 a4 a |   % 9
-		g4 a bf2 |   % 10
-		a4. f8 f4 g |   % 11
-		f1 \bar "||"   % 12
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1*8 \bar "||"   % 5-12
 
 		% B section
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
 
-		bf2 bf |   % 13
-		a2 a |   % 14
-		b2 b |   % 15
-		c2 c4 ( bf ) \bar "||"   % 16
+		s1*4 \bar "||"   % 13-16
 
 		% A section
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
-
-		a4. a8 a4 a |   % 17
-		g4 a bf2 |   % 18
-		a4. f8 f4 g |   % 19
+		\mark \markup { \override #'(font-family . sans) { \box { C } } }
+		s1*3 |   % 17-19
 	}
 	\alternative
 	{
 		{
-			f1 |   % 20
+			s1 |   % 20
 		}
 		{
-			f1^\markup { \hspace #8.0 \raise #1.0 \bold { D.S. } } \bar "||"   % 21
+			s1^\markup { \hspace #8.0 \raise #1.0 \bold { D.S. } } \bar "||"   % 21
 		}
 		{
-			f1^\fermata \bar "|."   % 22
+			s1 \bar "|."   % 22
 		}
 	}
 }
 
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	% Intro
+
+	R1*4 |   % 1-4
+
+	% A section
+
+	a4. a8 a4 a |   % 5
+	g4 a bf2 |   % 6
+	a4. f8 f4 g |   % 7
+	a1 |   % 8
+
+	a4. a8 a4 a |   % 9
+	g4 a bf2 |   % 10
+	a4. f8 f4 g |   % 11
+	f1 |   % 12
+
+	% B section
+
+	bf2 bf |   % 13
+	a2 a |   % 14
+	b2 b |   % 15
+	c2 c4 ( bf ) |   % 16
+
+	% A section
+
+	a4. a8 a4 a |   % 17
+	g4 a bf2 |   % 18
+	a4. f8 f4 g |   % 19
+
+	f1 |   % 20
+
+	f1 |   % 21
+
+	f1^\fermata |   % 22
+}
+
+
 LeadVoxText = \lyricmode
 {
 	Spi- rit of the li- ving God
@@ -110,12 +129,8 @@ LeadVoxText = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	f2 f4:maj7 f:7 |   % 1
@@ -123,144 +138,127 @@ Chords = \chordmode
 	f2/c bf4/c c |   % 3
 	f2 bf/c |   % 4
 
-	\repeat volta 3
-	{
-		% A section
+	% A section
 
-		f2 f4:maj7 f:7 |   % 5
-		bf4:6 d:7/a g2:m7 |   % 6
-		f2/c bf4/c c |   % 7
-		f2 bf/c |   % 8
+	f2 f4:maj7 f:7 |   % 5
+	bf4:6 d:7/a g2:m7 |   % 6
+	f2/c bf4/c c |   % 7
+	f2 bf/c |   % 8
 
-		f2 f4:maj7 f:7 |   % 9
-		bf4:6 d:7/a g2:m7 |   % 10
-		f2/c bf4/c c |   % 11
-		f2 f:7 |   % 12
+	f2 f4:maj7 f:7 |   % 9
+	bf4:6 d:7/a g2:m7 |   % 10
+	f2/c bf4/c c |   % 11
+	f2 f:7 |   % 12
 
-		% B section
+	% B section
 
-		bf2 g:m7 |   % 13
-		f1 |   % 14
-		g1:7 |   % 15
-		c4 bf:sus2/d c2:7/e |   % 16
+	bf2 g:m7 |   % 13
+	f1 |   % 14
+	g1:7 |   % 15
+	c4 bf:sus2/d c2:7/e |   % 16
 
-		% A section
+	% A section
 
-		f2 f4:maj7 f:7 |   % 17
-		bf4:6 d:7/a g2:m7.5- |   % 18
-		f2/c bf4/c c |   % 19
-	}
-	\alternative
-	{
-		{
-			f2 bf/c |   % 20
-		}
-		{
-			f2 f:7 |   % 21
-		}
-		{
-			f1 |   % 22
-		}
-	}
+	f2 f4:maj7 f:7 |   % 17
+	bf4:6 d:7/a g2:m7.5- |   % 18
+	f2/c bf4/c c |   % 19
+
+	f2 bf/c |   % 20
+
+	f2 f:7 |   % 21
+
+	f1 |   % 22
 }
 
 
 %
 % Chord rhythms
 %
-
-% Use a RhythmicStaff on the chords instead of this?
-% It almost works, but not quite. Doesn't collapse chords above to single notes...
-
 StaffC = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
 	c4 c c c |   % 1
 	c4 c c c |   % 2
 	c4 c c c |   % 3
-	c4 c c c \bar "||:"   % 4
+	c4 c c c |   % 4
 
-	\repeat volta 3
-	{
-		% A section
+	% A section
 
-		c4 c c c |   % 5
-		c4 c c c |   % 6
-		c4 c c c |   % 7
-		c4 c c c |   % 8
+	c4 c c c |   % 5
+	c4 c c c |   % 6
+	c4 c c c |   % 7
+	c4 c c c |   % 8
 
-		c4 c c c |   % 9
-		c4 c c c |   % 10
-		c4 c c c |   % 11
-		c4 c c c \bar "||"   % 12
+	c4 c c c |   % 9
+	c4 c c c |   % 10
+	c4 c c c |   % 11
+	c4 c c c |   % 12
 
-		% B section
+	% B section
 
-		c4 c c c |   % 13
-		c4 c c c |   % 14
-		c4 c c c |   % 15
-		c4 c c c \bar "||"   % 16
+	c4 c c c |   % 13
+	c4 c c c |   % 14
+	c4 c c c |   % 15
+	c4 c c c |   % 16
 
-		% A section
+	% A section
 
-		c4 c c c |   % 17
-		c4 c c c |   % 18
-		c4 c c c |   % 19
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 20
-		}
-		{
-			c4 c c c |   % 21
-		}
-		{
-			c1^\fermata \bar "|."   % 22
-		}
-	}
+	c4 c c c |   % 17
+	c4 c c c |   % 18
+	c4 c c c |   % 19
+
+	c4 c c c |   % 20
+
+	c4 c c c |   % 21
+
+	c1^\fermata |   % 22
 }
 
 
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+			\new Voice = "lead" \LeadVox
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" \StaffC
+			\new ChordNames \Chords
+			\new RhythmicStaff \StaffC
 		>>
 
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
-
-	\layout
-	{
-%		\context { \Staff \RemoveEmptyStaves }
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
 }
 
 
 \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)))
+
+% Don't spread staves vertically across last page (default: t)
+%	ragged-last-bottom = ##f
+% Don't spread staves vertically across the page (default: f)
+%	ragged-bottom = ##t
+% Allow partial line for last stave (default: f)
+	ragged-last = ##t
+
+% To find out what's eating the space at the top...
+%	annotate-spacing = ##t
 }
+