X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=the-apostle%27s-creed.ly;h=62fbe6c155e5964427915debe27e6e0302ad1cf8;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=052039a855cf1918850947c11926f9419bae3d5e;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/the-apostle's-creed.ly b/the-apostle's-creed.ly
index 052039a..62fbe6c 100644
--- a/the-apostle's-creed.ly
+++ b/the-apostle's-creed.ly
@@ -1,10 +1,8 @@
-% 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, 24
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
 staffSize = #20
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -14,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 "The Apostle’s Creed" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Ed Smart" }
 %	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -29,7 +25,7 @@ staffSize = #20
 Global =
 {
 	\key bf \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -66,20 +62,11 @@ 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
-	r1 |   % 2
-	r1 |   % 3
-	r1 |   % 4
+	r1*4 |   % 1-4
 
 	% Part I
 
@@ -138,6 +125,7 @@ LeadVox = \relative c'
 	f1-\fermata |   % 45
 }
 
+
 LeadVoxText = \lyricmode
 {
 	We be -- lieve _ in God, _
@@ -174,7 +162,6 @@ LeadVoxText = \lyricmode
 %
 % Riffs
 %
-
 Riffs = \relative c''
 {
 %{
@@ -193,7 +180,6 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
 	% Intro
@@ -264,15 +250,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
 
@@ -373,26 +355,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 >>
+		>>
 	>>
 }
 
@@ -401,7 +383,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"LilyJAZZText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -414,6 +396,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)
 }
+