X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jesus-all-for-jesus.ly;h=1862424e561b22b6c94c50d4467d004602efdb8f;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=071a37f7c15b130ad58b7ab14bef9162ec07c699;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/jesus-all-for-jesus.ly b/jesus-all-for-jesus.ly
index 071a37f..1862424 100644
--- a/jesus-all-for-jesus.ly
+++ b/jesus-all-for-jesus.ly
@@ -1,9 +1,9 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
-staffSize = #24
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
+staffSize = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
@@ -12,8 +12,6 @@ staffSize = #24
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Jesus, All For Jesus" }
 %	composer = \markup { \override #'(font-family . sans) "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -30,6 +28,110 @@ hn = #(define-music-function (parser location arg) (ly:music?)
     (acons 'font-size -3.5 (ly:music-property arg 'tweaks))) arg)
 
 
+%
+% Song's structure
+%
+Global =
+{
+	\clef G
+	\key d \major
+	\numericTimeSignature
+	\time 4/4
+
+	% Intro
+
+	\repeat volta 2
+	{
+		s1*2 |   % 1-2
+	}
+
+	s1*8 \bar ".|:-||"   % 3-10
+
+	% A section
+
+	\repeat volta 2
+	{
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1*5 |   % 11-15
+	}
+	\alternative
+	{
+		{
+			s1*3 |   % 16-18
+		}
+		{
+			s1 |   % 19
+		}
+	}
+
+	s1*2 \bar ".|:-||"   % 20-21
+
+	\repeat volta 2
+	{
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+
+		s1*5 |   % 22-26
+	}
+	\alternative
+	{
+		{
+			s1*3 |   % 27-29
+		}
+		{
+			s1   % 30
+		}
+	}
+
+	s1*2 \bar "||"   % 31-32
+
+	% B section
+
+	\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*8 \bar "||"   % 40
+
+	% A section
+
+	\mark \markup { \override #'(font-family . sans) { \box { D } } }
+
+	s1*5 |   % 41-45
+	s1 |   % 46
+	\once \override Score.RehearsalMark #'self-alignment-X = #right
+	\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" }
+	s1*2 \bar "||"   % 47-48
+
+	% Midtro
+
+	\mark \markup { \override #'(font-family . sans) { \box { E } } }
+	s1*8 \bar "||"   % 49-56
+
+	% A section
+
+	\mark \markup { \override #'(font-family . sans) { \box { F } } }
+	s1*5 |   % 57-61
+	s1*3 \bar "||"   % 62-64
+
+	\mark \markup { \override #'(font-family . sans) { \box { G } } }
+	s1*8 \bar "||"   % 65-72
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #right
+	\mark \markup { \italic { D.S. al Coda } }
+
+	% Coda
+
+%\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
+\stopStaff s1 \startStaff
+\set Score.currentBarNumber = #73
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
+
+	s1*2 \bar "||"   % 73-74
+	s1*7 \bar "|."   % 75-81
+}
+
+
 % Various melody lines
 
 melodyLineA =
@@ -82,78 +184,45 @@ melodyLineC =
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
-	\key d \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	\repeat volta 2
-	{
-		R1 |   % 1
-		R1 |   % 2
-	}
+	R1*2 |   % 1-2
 
 	s1*8 |   % 3-10
 
 	% A section
 
-	\repeat volta 2
-	{
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
+	fs4. ( e8 ) fs2 ~ |   % 11
+	fs2 fs4 a |   % 12
+	b4. ( a8 ) a2 ~ |   % 13
+	a2 b4 a |   % 14
+	e4. d8 e2 ~ |   % 15
 
-		fs4. ( e8 ) fs2 ~ |   % 11
-		fs2 fs4 a |   % 12
-		b4. ( a8 ) a2 ~ |   % 13
-		a2 b4 a |   % 14
-		e4. d8 e2 ~ |   % 15
-	}
-	\alternative
-	{
-		{
-			e4. e8 fs e d a |   % 16
-			b1 ( |   % 17
-			a2 ) r2 |   % 18
-		}
-		{
-			e'4. \repeatTie e8 fs e d cs |   % 19
-		}
-	}
+	e4. e8 fs e d a |   % 16
+	b1 ( |   % 17
+	a2 ) r2 |   % 18
+
+	e'4. \repeatTie e8 fs e d cs |   % 19
 
 	d1 ~ |   % 20
 	d2 r |   % 21
 
-	\repeat volta 2
-	{
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
 
-		<fs \hn d \hn a>4. \melodyLineB   % 22-26
-	}
-	\alternative
-	{
-		{
-			\melodyLineBRptA   % 27-29
-		}
-		{
-			<e' \hn cs \hn a>4. \repeatTie \melodyLineBRptB   % 30
-		}
-	}
+	<fs \hn d \hn a>4. \melodyLineB   % 22-26
+
+	\melodyLineBRptA   % 27-29
+
+	<e' \hn cs \hn a>4. \repeatTie \melodyLineBRptB   % 30
 
 	<d \hn a \hn fs>1 |   % 31
-	r2 <fs \hn d>8 ( <a \hn fs \hn d> ) <a \hn fs \hn d>4 \bar "||"   % 32
+	r2 <fs \hn d>8 ( <a \hn fs \hn d> ) <a \hn fs \hn d>4 |   % 32
 
 	% B section
 
-\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" }
-
 	<b \hn g \hn d>4. <a \hn fs \hn d>8 <b \hn g \hn d>2 ~ |   % 33
 	<b \hn g \hn d>4 <a \hn fs \hn d> <b \hn g \hn e>8 ( a ) <a \hn fs \hn d>4 |   % 34
 	<a \hn fs \hn d>4. <fs \hn d \hn a>8 <a \hn fs \hn d>2 ~ |   % 35
@@ -161,56 +230,39 @@ LeadVox = \relative c'
 	<b \hn g \hn d>4. <a \hn fs \hn d>8 <b \hn g \hn d>2 ~ |   % 37
 	<b \hn g \hn d>4 <cs \hn a \hn g> <d \hn b \hn g>8 ( <cs \hn a \hn d,> ) <b \hn g \hn d> ( <a \hn fs \hn d> ) |   % 38
 	<a \hn fs \hn d>2. <fs \hn d \hn a>4 |   % 39
-	<e \hn cs \hn a>1 \bar "||"   % 40
+	<e \hn cs \hn a>1 |   % 40
 
 	% A section
 
-\mark \markup { \override #'(font-family . sans) { \box { D } } }
-
 	\melodyLineC   % 41-45
 	<e \hn cs \hn a>4. \melodyLineBRptB   % 46
-\once \override Score.RehearsalMark #'self-alignment-X = #right
-\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" }
 	<d \hn a \hn fs>1 ~ |   % 47
-	<d \hn a \hn fs>2 r \bar "||"   % 48
+	<d \hn a \hn fs>2 r |   % 48
 
 	% Midtro
 
-\mark \markup { \override #'(font-family . sans) { \box { E } } }
-
-	s1*8 \bar "||"   % 49-56
+	s1*8 |   % 49-56
 
 	% A section
 
-\mark \markup { \override #'(font-family . sans) { \box { F } } }
-
 	\melodyLineC   % 57-61
-	\melodyLineBRptA \bar "||"   % 62-64
-
-\mark \markup { \override #'(font-family . sans) { \box { G } } }
+	\melodyLineBRptA |   % 62-64
 
 	<fs' \hn d \hn a>4. \melodyLineB   % 65-69
 	<e \hn cs \hn a>4. \melodyLineBRptB   % 70
 	<d \hn a \hn fs>1 |   % 71
-	r2 <fs \hn d>8 ( <a \hn fs \hn d> ) <a \hn fs \hn d>4 \bar "||"   % 72
-
-\once \override Score.RehearsalMark #'self-alignment-X = #right
-\mark \markup { \italic { D.S. al Coda } }
+	r2 <fs \hn d>8 ( <a \hn fs \hn d> ) <a \hn fs \hn d>4 |   % 72
 
 	% Coda
 
-%\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
-\stopStaff s1 \startStaff
-\set Score.currentBarNumber = #73
-
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
+	s1 % blank bar for coda
 
 	<d, \hn a \hn fs>1 ~ |   % 73
-	<d \hn a \hn fs>2 r \bar "||"   % 74
-	s1*7 \bar "|."   % 75-81
+	<d \hn a \hn fs>2 r |   % 74
+	s1*7 |   % 75-81
 }
 
+
 LeadVoxText = \lyricmode
 {
 	Je -- _ sus, _ all for Je -- _ sus, _
@@ -246,14 +298,7 @@ LeadVoxText = \lyricmode
 %
 Riffs = \relative c'
 {
-	\clef G
-	\key d \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	\tiny
-
 	s1*2 |   % 1-2
 	\melodyLineA
 	d1 ~ |   % 9
@@ -267,7 +312,6 @@ Riffs = \relative c'
 	s1*19 |   % 57-74 (+1 for coda)
 	\melodyLineA
 	d1^\fermata |   % 81
-
 	\normalsize
 }
 
@@ -279,16 +323,10 @@ Riffs = \relative c'
 
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
-	\repeat volta 2
-	{
-		d4. a8/d d2 |   % 1
-		s1 |   % 2
-	}
+	d4. a8/d d2 |   % 1
+	s1 |   % 2
 
 	d4. a8/d d2 |   % 3
 	s1 |   % 4
@@ -301,48 +339,32 @@ Chords = \chordmode
 
 	% A section
 
-	\repeat volta 2
-	{
-		d4. a8/d d2 |   % 11
-		s1 |   % 12
-		g2/d d |   % 13
-		s1 |   % 14
-		a4. a8:sus4 a2  |   % 15
-	}
-	\alternative
-	{
-		{
-			s1 |   % 16
-			b1:m |   % 17
-			a1 |   % 18
-		}
-		{
-			a1 |   % 19
-		}
-	}
+	d4. a8/d d2 |   % 11
+	s1 |   % 12
+	g2/d d |   % 13
+	s1 |   % 14
+	a4. a8:sus4 a2  |   % 15
+
+	s1 |   % 16
+	b1:m |   % 17
+	a1 |   % 18
+
+	a1 |   % 19
 
 	d1 |   % 20
 	s2 g/a |   % 21
 
-	\repeat volta 2
-	{
-		d4. a8/d d2 |   % 22
-		s1 |   % 23
-		g2 d |   % 24
-		s1 |   % 25
-		a4. a8:sus4 a2 |   % 26
-	}
-	\alternative
-	{
-		{
-			s1 |   % 27
-			b1:m |   % 28
-			a1 |   % 29
-		}
-		{
-			a1 |   % 30
-		}
-	}
+	d4. a8/d d2 |   % 22
+	s1 |   % 23
+	g2 d |   % 24
+	s1 |   % 25
+	a4. a8:sus4 a2 |   % 26
+
+	s1 |   % 27
+	b1:m |   % 28
+	a1 |   % 29
+
+	a1 |   % 30
 
 	d1 |   % 31
 	s1 |   % 32
@@ -396,7 +418,7 @@ Chords = \chordmode
 
 	% Coda
 
-s1
+	s1 % blank bar for coda
 
 	d1 |   % 73
 	s2 g:sus2/a |   % 74
@@ -413,25 +435,16 @@ 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.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
-	\repeat volta 2
-	{
-		c8. c16 ~ c8 c c4 c |   % 1
-		c4 c c c |   % 2
-	}
+	c8. c16 ~ c8 c c4 c |   % 1
+	c4 c c c |   % 2
 
 	c8. c16 ~ c8 c c4 c |   % 3
 	c4 c c c |   % 4
@@ -444,51 +457,35 @@ StaffC = \relative c
 
 	% A section
 
-	\repeat volta 2
-	{
-		c8. c16 ~ c8 c c4 c |   % 11
-		c4 c c c |   % 12
-		c4 c c c |   % 13
-		c4 c c c |   % 14
-		c8. c16 ~ c8 c c4 c |   % 15
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 16
-			c4 c c c |   % 17
-			c4 c c c |   % 18
-		}
-		{
-			c4 c c c |   % 19
-		}
-	}
+	c8. c16 ~ c8 c c4 c |   % 11
+	c4 c c c |   % 12
+	c4 c c c |   % 13
+	c4 c c c |   % 14
+	c8. c16 ~ c8 c c4 c |   % 15
+
+	c4 c c c |   % 16
+	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
 
-	\repeat volta 2
-	{
-		c8. c16 ~ c8 c c4 c |   % 22
-		c4 c c c |   % 23
-		c4 c c c |   % 24
-		c4 c c c |   % 25
-		c8. c16 ~ c8 c c4 c |   % 26
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 27
-			c4 c c c |   % 28
-			c4 c c c |   % 29
-		}
-		{
-			c4 c c c |   % 30
-		}
-	}
+	c8. c16 ~ c8 c c4 c |   % 22
+	c4 c c c |   % 23
+	c4 c c c |   % 24
+	c4 c c c |   % 25
+	c8. c16 ~ c8 c c4 c |   % 26
+
+	c4 c c c |   % 27
+	c4 c c c |   % 28
+	c4 c c c |   % 29
+
+	c4 c c c |   % 30
 
 	c4 c c c |   % 31
-	c4 c c c \bar "||"   % 32
+	c4 c c c |   % 32
 
 	% B section
 
@@ -499,7 +496,7 @@ StaffC = \relative c
 	c4 c c c |   % 37
 	c4 c c c |   % 38
 	c4 c c c |   % 39
-	c4 c c c \bar "||"   % 40
+	c4 c c c |   % 40
 
 	c8. c16 ~ c8 c c4 c |   % 41
 	c4 c c c |   % 42
@@ -508,7 +505,7 @@ StaffC = \relative c
 	c8. c16 ~ c8 c c4 c |   % 45
 	c4 c c c |   % 46
 	c4 c c c |   % 47
-	c4 c c c \bar "||"   % 48
+	c4 c c c |   % 48
 
 	c8. c16 ~ c8 c c4 c |   % 49
 	c4 c c c |   % 50
@@ -517,7 +514,7 @@ StaffC = \relative c
 	c8. c16 ~ c8 c c4 c |   % 53
 	c4 c c c |   % 54
 	c4 c c c |   % 55
-	c4 c c c \bar "||"   % 56
+	c4 c c c |   % 56
 
 	c8. c16 ~ c8 c c4 c |   % 57
 	c4 c c c |   % 58
@@ -526,7 +523,7 @@ StaffC = \relative c
 	c8. c16 ~ c8 c c4 c |   % 61
 	c4 c c c |   % 62
 	c4 c c c |   % 63
-	c4 c c c \bar "||"   % 64
+	c4 c c c |   % 64
 
 	c8. c16 ~ c8 c c4 c |   % 65
 	c4 c c c |   % 66
@@ -535,15 +532,14 @@ StaffC = \relative c
 	c8. c16 ~ c8 c c4 c |   % 69
 	c4 c c c |   % 70
 	c4 c c c |   % 71
-	c4 c c c \bar "||"   % 72
+	c4 c c c |   % 72
 
 	% Coda
 
 \stopStaff s1 \startStaff |
-\set Score.currentBarNumber = #73
 
 	c4 c c c |   % 73
-	c4 c c c \bar "||"   % 74
+	c4 c c c |   % 74
 
 	c8. c16 ~ c8 c c4 c |   % 75
 	c4 c c c |   % 76
@@ -551,7 +547,7 @@ StaffC = \relative c
 	c4 c c c |   % 78
 	c8. c16 ~ c8 c c4 c |   % 79
 	c4 c c c |   % 80
-	c1^\fermata \bar "|."   % 81
+	c1^\fermata |   % 81
 }
 
 
@@ -566,36 +562,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"
-    "JazzText"
-    "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
 }
+