X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=come-let-us-worship-and-bow-down.ly;h=0daf81ede700afb1766dbf22c3f4506fd93a672a;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=821b3262bbaa0865ed2e878945bb129100fefdd4;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/come-let-us-worship-and-bow-down.ly b/come-let-us-worship-and-bow-down.ly
index 821b326..0daf81e 100644
--- a/come-let-us-worship-and-bow-down.ly
+++ b/come-let-us-worship-and-bow-down.ly
@@ -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 "Come Let Us Worship And Bow Down" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Dave Doherty" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -24,16 +22,12 @@ staffSize = #20
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
 	\key d \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -129,12 +123,8 @@ LeadVoxText = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	\repeat volta 2
@@ -147,11 +137,11 @@ Chords = \chordmode
 
 	d2 g:maj7 |   % 3
 	d1 |   % 4
-	g4 g/fs e2 |   % 5
+	g4 g/fs e2:m |   % 5
 	d4/a a2. |   % 6
 	d2 g:maj7 |   % 7
 	d1 |   % 8
-	g4 g/fs e2 |   % 9
+	g4 g/fs e2:m |   % 9
 	d4/a a2. |   % 10
 
 	% B section
@@ -201,11 +191,10 @@ Chords = \chordmode
 
 StaffC = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -267,35 +256,40 @@ StaffC = \relative c
 \score
 {
 	<<
+		\context Staff
 		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+			\new Voice = "lead" \LeadVox
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" \StaffC
+			\new ChordNames \Chords
+			\new RhythmicStaff \StaffC
 		>>
 
 		\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)))
+	#(define fonts (make-pango-font-tree
+		"Times New Roman"
+		"JazzText"
+		"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
 }
+