X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=if-we-are-the-body.ly;h=c2acf325f99936d8352c025a8ebb60f79c40bd06;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=4437d33f193c71fd3b35ecf203dc5eb72f44bf4e;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/if-we-are-the-body.ly b/if-we-are-the-body.ly
index 4437d33..c2acf32 100644
--- a/if-we-are-the-body.ly
+++ b/if-we-are-the-body.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 = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,11 +12,9 @@ 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 "If We Are The Body" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Casting Crowns" }
-%	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
+%	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
 }
 
@@ -37,7 +35,7 @@ Global =
 %	\key fs \minor
 % Transposed edition
 	\key e \minor
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -107,17 +105,6 @@ Global =
 	}
 
 	s1 \bar "|."   % 74
-
-
-%{
-
-%	\once \override TextScript #'padding = #2.0
-%	s1*0^\markup { \large \bold { Moderately fast pop } }
-%%Capo 3 version
-%%	s1*0^\markup { \large \bold { Moderately fast pop "(*** CAPO 3 ***)" } }
-%	s1*13 \bar "||:"   % 1-13
-
-%}
 }
 
 
@@ -127,7 +114,6 @@ Global =
 LeadVox = \relative c'
 {
 	\clef G
-	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -225,6 +211,7 @@ LeadVox = \relative c'
 	s1 |   % 74
 }
 
+
 LeadVoxText = \lyricmode
 {
 	It’s crowd -- ed _ in wor -- ship _ to -- day, _
@@ -310,9 +297,6 @@ Riffs = \relative c''
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	fs1:m7 |   % 1
@@ -414,14 +398,11 @@ 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 =
 {
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -540,13 +521,14 @@ Dynamics =
 \score
 {
 	<<
-		\Global						% The "roadmap" that everything else depends on
+		\Global		% The "roadmap" that everything else depends on
 
 		\context Staff
 		<<
 %			\context Staff << \new Voice = "lead" \LeadVox \new Voice \Riffs >>
 % Transposed edition
-			\context Staff << \new Voice = "lead" \transpose fs e \LeadVox \new Voice \transpose fs e \Riffs >>
+			\new Voice = "lead" \transpose fs e \LeadVox
+			\new Voice \transpose fs e \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
@@ -569,7 +551,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"LilyJAZZText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -582,6 +564,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)
 }
+