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=HEAD;hp=f3fa2e178203e3d9f10007323bf4793ba027bd04;hpb=cdf57606f385bc4493fed4e3860bce0ce657dc40;p=music

diff --git a/i-have-decided-to-follow-jesus.ly b/i-have-decided-to-follow-jesus.ly
index f3fa2e1..036f75b 100644
--- a/i-have-decided-to-follow-jesus.ly
+++ b/i-have-decided-to-follow-jesus.ly
@@ -1,8 +1,8 @@
-\version "2.18.1"
+\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)
@@ -15,32 +15,32 @@ staffSize = #20
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Roger Freeland" }
 	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;" } "     " \center-column { "C#m11" \fret-diagram-terse #"x;4;4;4;5;4;" } "     " \center-column { "F#7#9" \fret-diagram-terse #"2;4;2;3;2;5;" } }
+	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;" } }
+	}
 }
 
 
 %
 % Song's structure
 %
-
-Global = 
+Global =
 {
 	\key d \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
 
-%{
-	s1^\markup { \italic { Ac. guitar } } |   % 1
-	s1 |   % 2
-	s1^\markup { \italic { Guitar II in } } |   % 3
-	s1 |   % 4
-	s1^\markup { \italic { Bass in } } |   % 5
-	s1 |   % 6
-	s1^\markup { \italic { Drums in } } |   % 7
-	s1 |   % 8
-%}
 	s1*8 |   % 1-8
 
 	% Verse
@@ -86,10 +86,8 @@ Global =
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-	\override Staff.TimeSignature #'style = #'()
 	\clef G
 
 	% Intro
@@ -198,7 +196,6 @@ Riffs = \relative c'
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
 	% Intro
@@ -267,14 +264,9 @@ Chords = \chordmode
 %
 % 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...
-
 Rhythm = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
 	\teeny
 
@@ -341,7 +333,7 @@ Rhythm = \relative c
 }
 
 
-Dynamics = 
+Dynamics =
 {
 	s1_\markup { \small \italic { Ac. guitar } } |   % 1
 	s1 |   % 2
@@ -368,46 +360,26 @@ Dynamics =
 
 \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
-		>>
-
-		\set Score.skipBars = ##t
-		\set Score.melismaBusyProperties = #'()
-	>>
-%}
-	<<
-		\set Score.skipBars = ##t
-		\set Score.melismaBusyProperties = #'()
-
-%		\new Staff
-		<<
 			\new ChordNames \Chords
 			\new RhythmicStaff << \Rhythm \Dynamics >>
 		>>
 
-		\new Staff
-		<<
-			\Global
-			\new Voice = "lead" \LeadVox
-			\new Voice \Riffs
-			\new Lyrics \lyricsto "lead" \LeadVoxText
-			\new Lyrics \lyricsto "lead" \LeadVoxTextB
-			\new Lyrics \lyricsto "lead" \LeadVoxTextC
-		>>
+		\set Score.skipBars = ##t
+		\set Score.melismaBusyProperties = #'()
 	>>
 }
 
@@ -416,7 +388,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"LilyJAZZText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -429,6 +401,5 @@ Dynamics =
 
 % 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)
 }
+