X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=no-higher-calling.ly;h=88df9c2edcecf9b1f1157f3aa01d899325469d6d;hb=HEAD;hp=aba36b69ed89806936611992df18929f8ef563ca;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/no-higher-calling.ly b/no-higher-calling.ly
old mode 100755
new mode 100644
index aba36b6..88df9c2
--- a/no-higher-calling.ly
+++ b/no-higher-calling.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,139 +10,156 @@ 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 "No Higher Calling" }
 %	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.8"
+	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 bf \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	\repeat volta 2
 	{
 		% Intro
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \small "Light half-time feel" }
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \small "Light half-time feel" }
 
-		s1 |   % 1
-		s1 |   % 2
-		s1 |   % 3
-		s1 |   % 4
+		s1*4 |   % 1-4
 	}
 
 	% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-	f2. d8 f |   % 5
-	a2 bf4. g8 ~ |   % 6
-	g2. f8 ef |   % 7
-	d2 c4. ( d8 ) |   % 8
-	d2 r4 d8 f |   % 9
-	a2 bf4. g8 ~ |   % 10
-	g2. g4 |   % 11
-	gf2 f4. f8 ~ |   % 12
-	f2. f4 |   % 13
-	gf2 af4. ( bf8 ) |   % 14
-	bf1 ~ |   % 15
-	bf2 r |   % 16
+	\mark \markup { \override #'(font-family . sans) { \box { A } } }
+	s1*12 |   % 5-16
 
 	\repeat volta 2
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		f2. d8 f |   % 17
-		a2 bf4. g8 ~ |   % 18
-		g2. f8 ef |   % 19
-		d2 c4. ( d8 ) |   % 20
-		d2 r4 d8 f |   % 21
-		a2 bf4. g8 ~ |   % 22
-		g2. g4 |   % 23
-		gf2 f4. f8 ~ |   % 24
-		f2. f4 |   % 25
-		gf2 af4. ( bf8 ) |   % 26
-		bf1 ~ |   % 27
-		bf2. <bf d,>8 <a c,> \bar "||"   % 28
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s1*12 \bar "||"   % 17-28
 
 		% Chorus
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { C } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
-
-		<g bf,>2. <a c,>8 <bf d,> |   % 29
-		<bf d,>4. ( <a c,>8 ) <a c,>2 |   % 30
-		<a c,>2. <bf d,>8 <c f,> |   % 31
-		<c f,>4. ( <bf d,>8 ) <bf d,>4 <bf d,>8 <a c,> |   % 32
-		<g bf,>2. <g bf,>4 |   % 33
-		<g bf,>4 <f a,>8 <f a,> ~ <f a,> <ef g,>4 <f bf,>8 ~ |   % 34
-		<f bf,>1 |   % 35
-		r2 r4 <f d>8 <g ef> |   % 36
-		<g ef>2. <a c,>8 <bf d,> |   % 37
-		<bf d,>4. <a c,>8 ~ <a c,>4. <a c,>8 |   % 38
-		<a c,>2. <bf d,>8 <c ef,> |   % 39
-		<c ef,>4. <bf d,>8 ~ <bf d,>4 bf |   % 40
-		bf2. bf4 |   % 41
-		bf4 a8 g ~ g a ~ a4 |   % 42
-\once \override Score.RehearsalMark #'self-alignment-X = #right
-\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" }
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { C } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
+
+		s1*14 |   % 29-42
+		\once \override Score.RehearsalMark #'self-alignment-X = #right
+		\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" }
 	}
 	\alternative
 	{
 		{
-			\voiceTwo
-			bf1 |   % 43
-			\oneVoice
-			s1 |   % 44
-			s1 |   % 45
-			s1 |   % 46
+			s1*4 |   % 43-46
 		}
 		{
-			bf1 |   % 47
+			s1 |   % 47
 		}
 	}
 
-	r2 r4 <f d>8 <g ef> \bar "||"   % 48
+	s1 \bar "||"   % 48
 
-\once \override Score.RehearsalMark #'self-alignment-X = #right
-\mark \markup { \italic { D.S. al Coda } }
+	\once \override Score.RehearsalMark #'self-alignment-X = #right
+	\mark \markup { \italic { D.S. al Coda } }
 
 	% Coda
 
-\stopStaff s1 \startStaff |
+\stopStaff s1 \startStaff
 \set Score.currentBarNumber = #49
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
+
+	s1*9 \bar "|."   % 49-57
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	s1 |   % 1
+	s1 |   % 2
+	s1 |   % 3
+	s1 |   % 4
+
+	% Verse
+
+	f2. d8 f |   % 5
+	a2 bf4. g8 ~ |   % 6
+	g2. f8 ef |   % 7
+	d2 c4. ( d8 ) |   % 8
+	d2 r4 d8 f |   % 9
+	a2 bf4. g8 ~ |   % 10
+	g2. g4 |   % 11
+	gf2 f4. f8 ~ |   % 12
+	f2. f4 |   % 13
+	gf2 af4. ( bf8 ) |   % 14
+	bf1 ~ |   % 15
+	bf2 r |   % 16
+
+	% Verse
+
+	f2. d8 f |   % 17
+	a2 bf4. g8 ~ |   % 18
+	g2. f8 ef |   % 19
+	d2 c4. ( d8 ) |   % 20
+	d2 r4 d8 f |   % 21
+	a2 bf4. g8 ~ |   % 22
+	g2. g4 |   % 23
+	gf2 f4. f8 ~ |   % 24
+	f2. f4 |   % 25
+	gf2 af4. ( bf8 ) |   % 26
+	bf1 ~ |   % 27
+	bf2. <bf d,>8 <a c,> \bar "||"   % 28
+
+	% Chorus
+
+	<g bf,>2. <a c,>8 <bf d,> |   % 29
+	<bf d,>4. ( <a c,>8 ) <a c,>2 |   % 30
+	<a c,>2. <bf d,>8 <c f,> |   % 31
+	<c f,>4. ( <bf d,>8 ) <bf d,>4 <bf d,>8 <a c,> |   % 32
+	<g bf,>2. <g bf,>4 |   % 33
+	<g bf,>4 <f a,>8 <f a,> ~ <f a,> <ef g,>4 <f bf,>8 ~ |   % 34
+	<f bf,>1 |   % 35
+	r2 r4 <f d>8 <g ef> |   % 36
+	<g ef>2. <a c,>8 <bf d,> |   % 37
+	<bf d,>4. <a c,>8 ~ <a c,>4. <a c,>8 |   % 38
+	<a c,>2. <bf d,>8 <c ef,> |   % 39
+	<c ef,>4. <bf d,>8 ~ <bf d,>4 bf |   % 40
+	bf2. bf4 |   % 41
+	bf4 a8 g ~ g a ~ a4 |   % 42
+
+	\voiceTwo bf1 \oneVoice |   % 43
+	s1*3 |   % 44-46
+
+	bf1 |   % 47
+
+	r2 r4 <f d>8 <g ef> |   % 48
+
+	% Coda
+
+	s1 % extra bar for coda
 
 	bf2 s |   % 49
-	s1 |   % 50
-	s1 |   % 51
-	s1 |   % 52
-	s1 |   % 53
-	s1 |   % 54
-	s1 |   % 55
-	s1 |   % 56
-	s1 \bar "|."   % 57
+	s1*8 |   % 50-57
 }
 
+
 LeadVoxText = \lyricmode
 {
 	Down at your feet, O Lord, _
@@ -173,12 +190,6 @@ LeadVoxText = \lyricmode
 
 Riffs = \relative c'
 {
-	\clef G
-	\key bf \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	\tiny
 	r2 r8 d f bf |   % 1
 	bf4. af8 ~ af4. af8 |   % 2
@@ -187,9 +198,7 @@ Riffs = \relative c'
 
 	s1*38 |   % 5-42
 
-	\voiceOne
-	r2 r8 d f bf |   % 43
-	\oneVoice
+	\voiceOne r2 r8 d f bf \oneVoice |   % 43
 	bf4. af8 ~ af4. af8 |   % 44
 	af4. g8 ~ g4. f8 |   % 45
 	f1 |   % 46
@@ -204,28 +213,21 @@ Riffs = \relative c'
 	bf4. af8 ~ af4. af8 |   % 54
 	af4. g8 ~ g4. f8 |   % 55
 	f1 |   % 56
-	r1-\fermata \bar "|."   % 57
+	r1-\fermata |   % 57
 }
 
 
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
-	\repeat volta 2
-	{
-		% Intro
+	% Intro
 
-		bf1 |   % 1
-		af4.:6.9 af8:sus2 s2 |   % 2
-		af4./ef ef8 s2 |   % 3
-		f2:sus4 f |   % 4
-	}
+	bf1 |   % 1
+	af4.:6.9 af8:sus2 s2 |   % 2
+	af4./ef ef8 s2 |   % 3
+	f2:sus4 f |   % 4
 
 	% Verse
 
@@ -242,52 +244,44 @@ Chords = \chordmode
 	bf1:sus2 |   % 15
 	bf2 ef/f |   % 16
 
-	\repeat volta 2
-	{
-		% Verse
-
-		bf1 |   % 17
-		f2/d bf/d |   % 18
-		ef1 |   % 19
-		bf2/f f |   % 20
-		bf1 |   % 21
-		f2/g g:m7 |   % 22
-		ef1 |   % 23
-		ef2:m af:sus2 |   % 24
-		bf1 |   % 25
-		gf2:6 af:sus2 |   % 26
-		bf1 |   % 27
-		bf1:sus2/d |   % 28
-
-		% Chorus
+	% Verse
 
-		ef1 |   % 29
-		g2:m7 f |   % 30
-		d1:m7 |   % 31
-		f2/g g:m7 |   % 32
-		c1:m7 |   % 33
-		ef2/f f |   % 34
-		bf1 |   % 35
-		bf1/d |   % 36
-		ef1 |   % 37
-		g2:m7 f |   % 38
-		d1:7/fs |   % 39
-		c2:m/g g:m7 |   % 40
-		ef1 |   % 41
-		bf4./f ef4/f f4. |   % 42
-	}
-	\alternative
-	{
-		{
-			bf1 |   % 43
-			af4.:6.9 af8:sus2 s2 |   % 44
-			af4./ef ef8 s2 |   % 45
-			f2:sus4 f |   % 46
-		}
-		{
-			bf1 |   % 47
-		}
-	}
+	bf1 |   % 17
+	f2/d bf/d |   % 18
+	ef1 |   % 19
+	bf2/f f |   % 20
+	bf1 |   % 21
+	f2/g g:m7 |   % 22
+	ef1 |   % 23
+	ef2:m af:sus2 |   % 24
+	bf1 |   % 25
+	gf2:6 af:sus2 |   % 26
+	bf1 |   % 27
+	bf1:sus2/d |   % 28
+
+	% Chorus
+
+	ef1 |   % 29
+	g2:m7 f |   % 30
+	d1:m7 |   % 31
+	f2/g g:m7 |   % 32
+	c1:m7 |   % 33
+	ef2/f f |   % 34
+	bf1 |   % 35
+	bf1/d |   % 36
+	ef1 |   % 37
+	g2:m7 f |   % 38
+	d1:7/fs |   % 39
+	c2:m/g g:m7 |   % 40
+	ef1 |   % 41
+	bf4./f ef4/f f4. |   % 42
+
+	bf1 |   % 43
+	af4.:6.9 af8:sus2 s2 |   % 44
+	af4./ef ef8 s2 |   % 45
+	f2:sus4 f |   % 46
+
+	bf1 |   % 47
 
 	bf1:sus2/d |   % 48
 
@@ -310,27 +304,18 @@ s1
 %
 % 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
 
-	\repeat volta 2
-	{
-		% Intro
+	% Intro
 
-		c4 c c c |   % 1
-		c4. c8 ~ c2 |   % 2
-		c4. c8 ~ c2 |   % 3
-		c4 c c c |   % 4
-	}
+	c4 c c c |   % 1
+	c4. c8 ~ c2 |   % 2
+	c4. c8 ~ c2 |   % 3
+	c4 c c c |   % 4
 
 	% Verse
 
@@ -347,59 +332,50 @@ StaffC = \relative c
 	c4 c c c |   % 15
 	c4 c c c |   % 16
 
-	\repeat volta 2
-	{
-		% Verse
-
-		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
-		c4 c c c |   % 22
-		c4 c c c |   % 23
-		c4 c c c |   % 24
-		c4 c c c |   % 25
-		c4 c c c |   % 26
-		c4 c c c |   % 27
-		c4 c c c \bar "||"   % 28
-
-		% Chorus
-
-		c4 c c c |   % 29
-		c4 c c c |   % 30
-		c4 c c c |   % 31
-		c4 c c c |   % 32
-		c4 c c c |   % 33
-		c4 c c c |   % 34
-		c4 c c c |   % 35
-		c4 c c c |   % 36
-		c4 c c c |   % 37
-		c4 c c c |   % 38
-		c4 c c c |   % 39
-		c4 c c c |   % 40
-		c4 c c c |   % 41
-		c4. c8 ~ c c4. |   % 42
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 43
-			c4. c8 ~ c2 |   % 44
-			c4. c8 ~ c2 |   % 45
-			c4 c c c |   % 46
-		}
-		{
-			c4 c c c |   % 47
-		}
-	}
+	% Verse
 
-	c4 c c c \bar "||"   % 48
+	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
+	c4 c c c |   % 22
+	c4 c c c |   % 23
+	c4 c c c |   % 24
+	c4 c c c |   % 25
+	c4 c c c |   % 26
+	c4 c c c |   % 27
+	c4 c c c \bar "||"   % 28
+
+	% Chorus
+
+	c4 c c c |   % 29
+	c4 c c c |   % 30
+	c4 c c c |   % 31
+	c4 c c c |   % 32
+	c4 c c c |   % 33
+	c4 c c c |   % 34
+	c4 c c c |   % 35
+	c4 c c c |   % 36
+	c4 c c c |   % 37
+	c4 c c c |   % 38
+	c4 c c c |   % 39
+	c4 c c c |   % 40
+	c4 c c c |   % 41
+	c4. c8 ~ c c4. |   % 42
+
+	c4 c c c |   % 43
+	c4. c8 ~ c2 |   % 44
+	c4. c8 ~ c2 |   % 45
+	c4 c c c |   % 46
+
+	c4 c c c |   % 47
+
+	c4 c c c |   % 48
 
 	% Coda
 
 \stopStaff s1 \startStaff |
-\set Score.currentBarNumber = #49
 
 	c4 c c c |   % 49
 	c4. c8 ~ c2 |   % 50
@@ -409,7 +385,7 @@ StaffC = \relative c
 	c4. c8 ~ c2 |   % 54
 	c4. c8 ~ c2 |   % 55
 	c4 c c c |   % 56
-	c1-\fermata \bar "|."   % 57
+	c1-\fermata |   % 57
 }
 
 
@@ -428,38 +404,43 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-%			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-			\new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> }
+			\new Voice = "lead" \LeadVox
+			\new Voice = "riffs" \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\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)))
-
-%  top-margin = -0.25 \in
+	#(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
 }
+