X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=i-see-the-lord.ly;h=441cd61b9eb5c7cd94336e8c19808f606e5bd900;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=f94ea1348638acf3aa8add3eebe9dcca4721e2a5;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/i-see-the-lord.ly b/i-see-the-lord.ly
index f94ea13..441cd61 100644
--- a/i-see-the-lord.ly
+++ b/i-see-the-lord.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)
@@ -12,8 +12,6 @@ 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 "I See The Lord" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Chris Falson" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -37,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key e \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -49,7 +47,7 @@ Global =
 
 	% Intro
 
-	s1*4 \bar "||:"   % 1-4
+	s1*4 \bar ".|:-||"   % 1-4
 
 	\repeat volta 2
 	{
@@ -87,18 +85,11 @@ Global =
 %
 LeadVox = \relative c'
 {
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
-	\override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	s1 |   % 1
-	s1 |   % 2
-	s1 |   % 3
-	s1 |   % 4
+	s1*4 |   % 1-4
 
 	% Verse
 
@@ -189,10 +180,6 @@ LeadVoxText = \lyricmode
 
 Riffs = \relative c
 {
-	\clef G
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
@@ -280,19 +267,14 @@ 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
-%%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
-	\tiny
 	r4. c8 ~ c2 |   % 1
 	r4. c8 ~ c2 |   % 2
 	r4. c8 ~ c2 |   % 3
@@ -381,45 +363,44 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-%		\new Staff
+		\context Staff
+		<<
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
+			\new Lyrics \lyricsto "lead" \LeadVoxText
+		>>
+
+		\new ChoirStaff
 		<<
 			\new ChordNames \Chords
 %Capo 4 edition
 %			\new ChordNames \transpose b g \Chords
 			\new RhythmicStaff << \Rhythm \Dynamics >>
 		>>
-
-		\new Staff
-		<<
-			\Global						% The "roadmap" that everything else depends on
-			\new Voice = "lead" \LeadVox
-			\new Voice \Riffs
-			\new Lyrics \lyricsto "lead" \LeadVoxText
-		>>
 	>>
 }
 
 
 \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)))
 
 % Spread staves vertically across last page (default: t)
-	ragged-last-bottom = ##f
+%	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
+	ragged-last = ##t
 
 % 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)
 }
+