X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=the-lord%27s-prayer.ly;h=df15150b5319d07a92764e98fb00c5f7b5522a00;hb=HEAD;hp=87107cc09bacc8688f76e9858576c9ea72137325;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/the-lord's-prayer.ly b/the-lord's-prayer.ly
index 87107cc..df15150 100644
--- a/the-lord's-prayer.ly
+++ b/the-lord's-prayer.ly
@@ -1,11 +1,11 @@
 % Still need hairpins, directions, dynamics, etc...
 
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
-staffSize = #24
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
+staffSize = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
@@ -14,10 +14,8 @@ staffSize = #24
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "The Lord’s Prayer" }
-%	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Lenny LeBlanc" }
+%	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
 	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
 }
@@ -29,9 +27,9 @@ staffSize = #24
 Global =
 {
 	\key bf \major
-%New key!
+%New key! (C version)
 %	\key c \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -81,14 +79,8 @@ Global =
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
-	\clef G
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	r1 |   % 1
@@ -161,7 +153,7 @@ LeadVoxText = \lyricmode
 	Our Fa -- ther, _ who art in hea -- ven, _
 	hal -- low -- ed be _ thy _ name. _
 	Thy king -- dom come, thy will be done,
-	on Earth, as it in in hea -- _ _ ven.
+	on Earth, as it is in hea -- _ _ ven.
 
 	Give us this day our dai -- ly bread
 	and for -- give us our debts
@@ -179,7 +171,6 @@ LeadVoxText = \lyricmode
 %
 % Riffs
 %
-
 Riffs = \relative c''
 {
 %{
@@ -198,7 +189,6 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
 	% Intro
@@ -272,15 +262,11 @@ Chords = \chordmode
 %
 % Chord rhythms
 %
-
 Rhythm = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
-\tiny
+	\teeny
 
 	% Intro
 
@@ -366,26 +352,26 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-%		\new ChoirStaff
-		<<
-			\new ChordNames \Chords
-% C edition
-%			\new ChordNames \transpose bf c \Chords
-			\new RhythmicStaff << \Rhythm \Dynamics >>
-		>>
-
-		\new Staff
+		\context Staff
 		<<
-			\Global						% The "roadmap" that everything else depends on
 			\new Voice = "lead" \LeadVox
 % C edition
 %			\new Voice = "lead" \transpose bf c' \LeadVox
 			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 		>>
+
+		\new ChoirStaff
+		<<
+			\new ChordNames \Chords
+% C edition
+%			\new ChordNames \transpose bf c \Chords
+			\new RhythmicStaff << \Rhythm \Dynamics >>
+		>>
 	>>
 }
 
@@ -394,7 +380,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"LilyJAZZText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -407,6 +393,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)
 }
+