X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=i-have-decided-to-follow-jesus.ly;h=036f75bd8f17e4f7e002dd203ccc957f1252a0b2;hb=616f9065219a73c4ac77376fcf7c4bdee9155fea;hp=ceeb0c045c31d2c8fb4eed84a6c3db67a989a480;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/i-have-decided-to-follow-jesus.ly b/i-have-decided-to-follow-jesus.ly
old mode 100755
new mode 100644
index ceeb0c0..036f75b
--- a/i-have-decided-to-follow-jesus.ly
+++ b/i-have-decided-to-follow-jesus.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)
@@ -13,82 +13,124 @@ staffSize = #20
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "I Have Decided To Follow Jesus" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Roger Freeland" }
-	tagline  = "Engraved by JLH and Lilypond 2.8.2"
+	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
 % Let's try a chord dictionary
-	subtitle = \markup { \center-column { C9 \fret-diagram-terse #"x;3;2;3;3;x;" } "     " \center-column { "B7#9" \fret-diagram-terse #"x;2;1;2;3;x;" } "     " \center-column { Bbmaj7 \fret-diagram-terse #"x;1;3;2;3;x;" } "     " \center-column { A7sus4 \fret-diagram-terse #"x;o;2;o;3;x;" } "     " \center-column { "F#7#5" \fret-diagram-terse #"2;x;2;3;3;x;" } "     " \center-column { "Ab7b5" \fret-diagram-terse #"4;5;4;5;x;x;" } "     " \center-column { "A13" \fret-diagram-terse #"x;o;2;o;2;2;" } }
+	subtitle = \markup {
+		\override #'(font-family . sans) \override #'(baseline-skip . 2) {
+		\center-column { C9 \fret-diagram-terse #"x;3;2;3;3;x;" } "     "
+		\center-column { \concat{"B7" \chordSharp "9"} \fret-diagram-terse #"x;2;1;2;3;x;" } "     "
+		\center-column { \concat{"B" \chordFlat "maj7"} \fret-diagram-terse #"x;1;3;2;3;x;" } "     "
+		\center-column { "A7sus4" \fret-diagram-terse #"x;o;2;o;3;x;" } "     "
+		\center-column { \concat{"F" \chordSharp "7" \chordSharp "5"} \fret-diagram-terse #"2;x;2;3;3;x;" } "     "
+		\center-column { \concat{"A" \chordFlat "7" \chordFlat "5"} \fret-diagram-terse #"4;5;4;5;x;x;" } "     "
+		\center-column { "A13" \fret-diagram-terse #"x;o;2;o;2;2;" } "     "
+		\center-column { \concat{"C" \chordSharp "m11"} \fret-diagram-terse #"x;4;4;4;5;4;" } "     "
+		\center-column { \concat{"F" \chordSharp "7" \chordSharp "9"} \fret-diagram-terse #"2;4;2;3;2;5;" } }
+	}
 }
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c'
+Global =
 {
-	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Lead vox"
-	\override Staff.TimeSignature #'style = #'()
-	\clef G
 	\key d \major
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
-%	\set Score.markFormatter = #format-mark-box-letters
 
 	% Intro
 
-	r1^\markup { \italic { Ac. guitar } } |   % 1
-	r1 |   % 2
-	r1^\markup { \italic { Guitar II in } } |   % 3
-	r1 |   % 4
-	r1^\markup { \italic { Bass in } } |   % 5
-	r1 |   % 6
-	r1^\markup { \italic { Drums in } } |   % 7
-	r4 d d fs |   % 8
+	s1*8 |   % 1-8
 
 	% Verse
 
 	\repeat volta 3
 	{
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		a4. a8 ~ a8 r8 r4 |   % 9
-		r4 a b a |   % 10
-		fs4. d8 ~ d8 r8 r4 |   % 11
-		r4 d' d d |   % 12
-		d4. d8 ~ d8 r8 r4 |   % 13
-		r4 d e d |   % 14
-		b4. a8 ~ a8 r8 r4 |   % 15
-		r4 d, d fs |   % 16
-
-		a4. a8 ~ a8 r8 r4 |   % 17
-		r4 a b a |   % 18
-		fs4. d8 ~ d8 r8 r4 |   % 19
-		r4 a' b a |   % 20
-		fs4. r8 r2 |   % 21
-		r4 d fs e |   % 22
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+
+		s1*14 |   % 9-22
 	}
 	\alternative
 	{
 		{
-			d4. r8 r2 |   % 23
-			r1 |   % 24
-			r1 |   % 25
-			r4 d d fs |   % 26
+			s1*4 |   % 23-26
 		}
 		{
-			d4. r8 r2 |   % 27
-			r1 |   % 28
-			r1 |   % 29
+			s1*3 |   % 27-29
 		}
 	}
 
-	r4 d' d fs \bar "|:"   % 30
+	s1 |   % 30
 
 	% Tag
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { B } } \small \italic { Women 8vb throughout } }
+	\repeat volta 1
+	{
+%	\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { B } } } %\small \italic { Women 8vb throughout } }
+
+		s1*8 |   % 31-38
+	}
+
+	% Ending
+
+%	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { \override #'(font-family . sans) { \box { C } } } % \small \italic { On cue } }
+
+	s1*6 |   % 39-44
+	s1 \bar "|."   % 45
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	\clef G
+
+	% Intro
+
+	r1 |   % 1
+	r1 |   % 2
+	r1 |   % 3
+	r1 |   % 4
+	r1 |   % 5
+	r1 |   % 6
+	r1 |   % 7
+	r4 d d fs |   % 8
+
+	% Verse
+
+	a4. a8 ~ a8 r8 r4 |   % 9
+	r4 a b a |   % 10
+	fs4. d8 ~ d8 r8 r4 |   % 11
+	r4 d' d d |   % 12
+	d4. d8 ~ d8 r8 r4 |   % 13
+	r4 d e d |   % 14
+	b4. a8 ~ a8 r8 r4 |   % 15
+	r4 d, d fs |   % 16
+
+	a4. a8 ~ a8 r8 r4 |   % 17
+	r4 a b a |   % 18
+	fs4. d8 ~ d8 r8 r4 |   % 19
+	r4 a' b a |   % 20
+	fs4. r8 r2 |   % 21
+	r4 d fs e |   % 22
+
+	d4. r8 r2 |   % 23
+	r1 |   % 24
+	r1 |   % 25
+	r4 d d fs |   % 26
+
+	d4. r8 r2 |   % 27
+	r1 |   % 28
+	r1 |   % 29
+
+	r4 d' d fs |   % 30
+
+	% Tag
 
 	fs4 r r2 |   % 31
 	r4 d d fs |   % 32
@@ -97,22 +139,17 @@ LeadVox = \relative c'
 	fs4 r r2 |   % 35
 	r4 d d fs |   % 36
 	fs4 r r2 |   % 37
-	r4 d d fs \bar ":|"   % 38
+	r4 d d fs |   % 38
 
 	% Ending
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { C } } \small \italic { On cue } }
-
 	r1 |   % 39
 	r1 |   % 40
 	r1 |   % 41
 	r1 |   % 42
 	r1 |   % 43
-%	r1 |   % 44
-%	r1 |   % 45
-	r1 |   % 46
-	r1^\fermata \bar "|."   % 47
+	r1 |   % 44
+	r1^\fermata |   % 45
 }
 
 
@@ -151,15 +188,16 @@ LeadVoxTextC = \lyricmode
 }
 
 
+Riffs = \relative c'
+{
+}
+
+
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	c4.:9 b2:7.9+ bf8:7+ |   % 1
@@ -173,38 +211,30 @@ Chords = \chordmode
 
 	% Verse
 
-	\repeat volta 3
-	{
-		d2..:7+ g8:/a |   % 9
-		s1 |   % 10
-		d2..:7+ fs8:aug7 |   % 11
-		s1 |   % 12
-		g4.:7+ d2:/fs e8:m7 |   % 13
-		s4. a2:sus4.7 s8 |   % 14
-		d2..:7+ g8:m/a |   % 15
-		s1 |   % 16
-
-		d2..:7+ cs8:m11 |   % 17
-		s4. fs2:7.9+ b8:m7 |   % 18
-		s2.. e8:9 |   % 19
-		s1 |   % 20
-		e2..:m9 a8:13 |   % 21
-		s2.. c8:9 |   % 22
-	}
-	\alternative
-	{
-		{
-			s4. b2:7.9+ bf8:7+ |   % 23
-			s4. a2:sus4.7 c8:9 |   % 24
-			s4. b2:7.9+ bf8:7+ |   % 25
-			s4. a2:sus4.7 s8 |   % 26
-		}
-		{
-			s4. b2:7.9+ bf8:7+ |   % 27
-			s4. a2:sus4.7 c8:9 |   % 28
-			s4. b2:7.9+ bf8:7+ |   % 29
-		}
-	}
+	d2..:7+ g8:/a |   % 9
+	s1 |   % 10
+	d2..:7+ fs8:aug7 |   % 11
+	s1 |   % 12
+	g4.:7+ d2:/fs e8:m7 |   % 13
+	s4. a2:sus4.7 s8 |   % 14
+	d2..:7+ g8:m/a |   % 15
+	s1 |   % 16
+
+	d2..:7+ cs8:m11 |   % 17
+	s4. fs2:7.9+ b8:m7 |   % 18
+	s2.. e8:9 |   % 19
+	s1 |   % 20
+	e2..:m9 a8:13 |   % 21
+	s2.. c8:9 |   % 22
+
+	s4. b2:7.9+ bf8:7+ |   % 23
+	s4. a2:sus4.7 c8:9 |   % 24
+	s4. b2:7.9+ bf8:7+ |   % 25
+	s4. a2:sus4.7 s8 |   % 26
+
+	s4. b2:7.9+ bf8:7+ |   % 27
+	s4. a2:sus4.7 c8:9 |   % 28
+	s4. b2:7.9+ bf8:7+ |   % 29
 
 	s4 a:sus4.7 s2 |   % 30
 
@@ -226,27 +256,19 @@ Chords = \chordmode
 	s4. b2:7.9+ bf8:7+ |   % 41
 	s4. a2:sus4.7 c8:9 |   % 42
 	s4. b2:7.9+ bf8:7+ |   % 43
-%	s4. a2:sus4.7 c8:9 |   % 44
-%	s4. b2:7.9+ bf8:7+ |   % 45
-	s4. a2:sus4.7 s8 |   % 46
-	d1:7+ |   % 47
+	s4. a2:sus4.7 s8 |   % 44
+	d1:7+ |   % 45
 }
 
 
 %
 % 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
+Rhythm = \relative c
 {
-	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4 
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -261,40 +283,32 @@ StaffC = \relative c
 
 	% Verse
 
-	\repeat volta 3
-	{
-		c4 c c r8 c ~ |   % 9
-		c4 c c c |   % 10
-		c4 c c r8 c ~ |   % 11
-		c4 c c c |   % 12
-		c4. c8 ~ c4. c8 ~ |   % 13
-		c4. c8 ~ c2 |   % 14
-		c4 c c c8 c ~ |   % 15
-		c4 c c c |   % 16
-
-		c4 c c r8 c ~ |   % 17
-		c4. c8 ~ c4. c8 ~ |   % 18
-		c4 c c r8 c ~ |   % 19
-		c4 c c c |   % 20
-		c4 c c r8 c ~ |   % 21
-		c4 c c r8 c ~ |   % 22
-	}
-	\alternative
-	{
-		{
-			c4. c8 ~ c4. c8 ~ |   % 23
-			c4. c8 ~ c4. c8 ~ |   % 24
-			c4. c8 ~ c4. c8 ~ |   % 25
-			c4. c8 ~ c2 |   % 26
-		}
-		{
-			c4. c8 ~ c4. c8 ~ |   % 27
-			c4. c8 ~ c4. c8 ~ |   % 28
-			c4. c8 ~ c4. c8 ~ |   % 29
-		}
-	}
-
-	c4 c r2 \bar "|:"   % 30
+	c4 c c r8 c ~ |   % 9
+	c4 c c c |   % 10
+	c4 c c r8 c ~ |   % 11
+	c4 c c c |   % 12
+	c4. c8 ~ c4. c8 ~ |   % 13
+	c4. c8 ~ c2 |   % 14
+	c4 c c c8 c ~ |   % 15
+	c4 c c c |   % 16
+
+	c4 c c r8 c ~ |   % 17
+	c4. c8 ~ c4. c8 ~ |   % 18
+	c4 c c r8 c ~ |   % 19
+	c4 c c c |   % 20
+	c4 c c r8 c ~ |   % 21
+	c4 c c r8 c ~ |   % 22
+
+	c4. c8 ~ c4. c8 ~ |   % 23
+	c4. c8 ~ c4. c8 ~ |   % 24
+	c4. c8 ~ c4. c8 ~ |   % 25
+	c4. c8 ~ c2 |   % 26
+
+	c4. c8 ~ c4. c8 ~ |   % 27
+	c4. c8 ~ c4. c8 ~ |   % 28
+	c4. c8 ~ c4. c8 ~ |   % 29
+
+	c4 c r2 |   % 30
 
 	% Tag
 
@@ -305,7 +319,7 @@ StaffC = \relative c
 	c4 c c r8 c ~ |   % 35
 	c4 c c c |   % 36
 	c4. c8 ~ c4. c8 ~ |   % 37
-	c4. c8 ~ c2 \bar ":|"   % 38
+	c4. c8 ~ c2 |   % 38
 
 	% Ending
 
@@ -313,30 +327,55 @@ StaffC = \relative c
 	c4. c8 ~ c4. c8 ~ |   % 40
 	c4. c8 ~ c4. c8 ~ |   % 41
 	c4. c8 ~ c4. c8 ~ |   % 42
-	c4._\markup { \italic rit. } c8 ~ c4. c8 ~ |   % 43
-%	c4. c8 ~ c4. c8 ~ |   % 44
-%	c4. c8 ~ c4. c8 ~ |   % 45
-	c4. c8 ~ c2 |   % 46
-	c1^\fermata \bar "|."   % 47
+	c4. c8 ~ c4. c8 ~ |   % 43
+	c4. c8 ~ c2 |   % 44
+	c1^\fermata |   % 45
+}
+
+
+Dynamics =
+{
+	s1_\markup { \small \italic { Ac. guitar } } |   % 1
+	s1 |   % 2
+	s1_\markup { \small \italic { Guitar II in } } |   % 3
+	s1 |   % 4
+	s1_\markup { \small \italic { Bass in } } |   % 5
+	s1 |   % 6
+	s1_\markup { \small \italic { Drums in } } |   % 7
+	s1 |   % 8
+
+	s1*21 |   % 9-29
+	s4_\markup { \small \italic { Women 8vb throughout } } s2. | % 30
+
+	s1*8 |   % 31-38
+%	s1 |   % 38
+
+	% Ending
+
+	s4_\markup { \small \italic { On cue } } s2. | % 39
+	s1*3 |   % 40-42
+	s4_\markup { \small \italic { rit. } } s2. | % 43
 }
 
 
 \score
 {
 	<<
-%		\new ChoirStaff = "Vox"
+		\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 Lyrics \lyricsto "lead" \LeadVoxTextB
 			\new Lyrics \lyricsto "lead" \LeadVoxTextC
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
 %			\new Staff = "riff" \RhythmB
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" \StaffC
+			\new ChordNames \Chords
+			\new RhythmicStaff << \Rhythm \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
@@ -349,7 +388,7 @@ StaffC = \relative c
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"LilyJAZZText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -362,6 +401,5 @@ StaffC = \relative c
 
 % 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)
 }
+