X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=we-are-one-in-the-spirit-vocals.ly;h=c6fb49923c29952f6d36cf130c3375e7e64159ec;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=5bc624d2eb061792b568923d7a439e0308bc5761;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/we-are-one-in-the-spirit-vocals.ly b/we-are-one-in-the-spirit-vocals.ly
index 5bc624d..c6fb499 100644
--- a/we-are-one-in-the-spirit-vocals.ly
+++ b/we-are-one-in-the-spirit-vocals.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 = #20
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,14 +12,10 @@ 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 "We Are One In The Spirit" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" }
 	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
-% Let's try a chord dictionary
-%	subtitle =  \markup { \center-column { "F#m" \fret-diagram-terse #"x;x;4;2;2;2;" } "       " \center-column { "F#m/F" \fret-diagram-terse #"x;x;3;2;2;2;" } "       " \center-column { "F#m/E" \fret-diagram-terse #"x;x;2;2;2;2;" }  "       " \center-column { "F#m/Eb" \fret-diagram-terse #"x;x;1;2;2;2;" }  "       " \center-column { "Em7" \fret-diagram-terse #"o;2;2;o;3;o;" }  "       " \center-column { "A13" \fret-diagram-terse #"x;o;2;o;2;2;" }  }
 }
 
 % Useful tweak abbreviations (hn = harmony note)
@@ -37,7 +33,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key e \minor
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	\once \override TextScript #'padding = #2.0
@@ -48,7 +44,7 @@ Global =
 	% Intro
 
 	s1*4 \bar "||"   % 1-4
-	s1*4 \bar "||:"   % 5-8
+	s1*4 \bar ".|:-||"   % 5-8
 
 	\repeat volta 3
 	{
@@ -91,12 +87,6 @@ Global =
 %
 LeadVox = \relative c'
 {
-%	\set Staff.instrument = #"Lead vox"
-	\clef G
-	\override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	r1 |   % 1
@@ -164,7 +154,7 @@ LeadVoxTextB = \lyricmode
 	We will work with each oth -- er,
 	We will work side by side.
 	And we’ll guard each one’s dig -- ni -- ty
-	And save _ each one’s pride. 
+	And save _ each one’s pride.
 
 	_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 
@@ -178,16 +168,12 @@ LeadVoxTextC = \lyricmode
 	We will walk with each oth -- er,
 	We will walk hand in hand.
 	And to -- ge -- ther we’ll spread the news
-	that God is in our land. 
+	that God is in our land.
 }
 
 
 Riffs = \relative c
 {
-	\clef G
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 %	\tiny
@@ -234,7 +220,7 @@ Chords = \chordmode
 
 	% Verse
 
-	e4.:m9 a8:5.9 s2  |   % 23
+	e4.:m9 a8:3.5.9 s2  |   % 23
 	e4.:m9 a8:9 s2 |   % 24
 
 	% Coda
@@ -249,19 +235,12 @@ 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 = \relative c
 {
-%%	\set Voice.autoBeaming = ##f
-%%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
-
-%Not small enough...
 	\teeny
-%	\magnify #0.3
+
 	% Intro
 
 	 |   % 1
@@ -346,11 +325,11 @@ Dynamics =
 
 \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"
+		"LilyJAZZText"
+		"Luxi Mono"
+		(/ staffSize 20)))
 
 % Spread staves vertically across last page (default: t)
 	ragged-last-bottom = ##f
@@ -361,6 +340,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)
 }
+