X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=above-all.ly;h=4585099f6367339e565f14e39442f3b83e3decef;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=cf9c8d90bbb3743b3d047de98be24b826a401650;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/above-all.ly b/above-all.ly
index cf9c8d9..4585099 100644
--- a/above-all.ly
+++ b/above-all.ly
@@ -12,8 +12,6 @@ staffSize = #18
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Above All" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Michael W. Smith" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -24,23 +22,19 @@ staffSize = #18
 %
 % Lead vocal
 %
-
 LeadVox = \relative c''
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
 	\key bf \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
 	\tiny r2 r8 d f bf |   % 1
 	c8.f,16 f4 ~ f ~ f8 bf16 a |   % 2
 	bf8. ef,16 ef4 ~ ef d |   % 3
-	<f c>2 \normalsize r8 f,16 f ~ f bf8. \bar "||:"   % 4
+	<f c>2 \normalsize r8 f,16 f ~ f bf8. \bar ".|:-||"   % 4
 
 	% Verse
 
@@ -152,12 +146,8 @@ LeadVoxTextB = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	bf1:sus2 |   % 1
@@ -235,18 +225,17 @@ 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
 
 	c4 c c c |   % 1
 	c4 c c c |   % 2
 	c4 c c c |   % 3
-	c4 c c c \bar "||:"   % 4
+	c4 c c c \bar ".|:-||"   % 4
 
 	% Verse
 
@@ -312,36 +301,41 @@ StaffC = \relative c
 \score
 {
 	<<
+		\context Staff
 		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+			\new Voice = "lead" \LeadVox
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
-		\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 { \RemoveEmptyStaffContext }
-%		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
 }
+