X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=who-am-i.ly;h=6a9a72620886d2c69916800cc612153968b79b07;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=4e00bedc7fe8a351210947d53632f26d29d7da40;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/who-am-i.ly b/who-am-i.ly
index 4e00bed..6a9a726 100644
--- a/who-am-i.ly
+++ b/who-am-i.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 = #16
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,8 +12,6 @@ staffSize = #16
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Who Am I" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Mark Hall" }
 %	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. " }
@@ -35,7 +33,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key b \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 2/2
 
 	% Intro
@@ -140,12 +138,6 @@ Global =
 %
 LeadVox = \relative c''
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
-	\clef G
-%Hm. Needed anymore?
-	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	s1*8 |   % 1-8
@@ -232,7 +224,7 @@ LeadVox = \relative c''
 
 	% Coda
 
-	\stopStaff s1 \startStaff   % That removed the spurious floating bar line from line break
+s1 % Extra bar for coda
 
 	r2 r8 b as b ~ |   % 71
 	b1 ~ |   % 72
@@ -242,7 +234,7 @@ LeadVox = \relative c''
 	r2 r8 b as b ~ |   % 76
 
 	b1 |   % 77
-	r2 r8 b as b ~ ( |   % 78
+	r2 r8 b as b ( |   % 78
 	cs16 ds cs4. ~ cs8 b4. ~ |   % 79
 	b4 as gs8 fs4. ) |   % 80
 	r1 |   % 81
@@ -252,7 +244,7 @@ LeadVox = \relative c''
 	r8 ds'4 cs8 ~ cs b4 b8 ~ |   % 85
 	b8 ds4 cs8 ~ cs b4 b8 ~ |   % 86
 	b4 r r2 |   % 87
-	r4 fs8 b ~ b b4 b8 ~ ( |   % 88
+	r4 fs8 b ~ b b4 b8 ( |   % 88
 	cs16 ds cs8 ~ cs2 b4 ~ |   % 89
 	b2 ) r8 b gs cs ~ ( |   % 90
 	cs8 b ~ b2 ) r4 |   % 91
@@ -269,6 +261,7 @@ LeadVox = \relative c''
 	r1-\fermata |   % 98
 }
 
+
 LeadVoxText = \lyricmode
 {
 	Who am I, _ that the lord of all _ the earth _
@@ -319,10 +312,6 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c''
 {
-	\clef G
-%Hm. Needed anymore?
-	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
@@ -354,9 +343,6 @@ Riffs = \relative c''
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	b2.. e8:sus2 |   % 1
@@ -455,7 +441,7 @@ Chords = \chordmode
 
 	% Coda
 
-	\stopStaff s1 \startStaff   % That removed the spurious floating bar line from line break
+s1 % Extra bar for coda
 
 	e2 fs |   % 71
 	gs1:m7 |   % 72
@@ -489,22 +475,16 @@ Chords = \chordmode
 
 	s1 |   % 97
 
-	e1:5.9 |   % 98
+	e1:3.5.9 |   % 98
 }
 
 
 %
 % 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 = #'()
-%	\time 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
 	\teeny
 
@@ -656,8 +636,8 @@ Dynamics =
 \score
 {
 	<<
-		\Global						% The "roadmap" that everything else depends on
-%		\transpose b g \Global						% The "roadmap" that everything else depends on
+		\Global		% The "roadmap" that everything else depends on
+%		\transpose b g \Global		% The "roadmap" that everything else depends on
 
 		\context Staff
 		<<
@@ -685,11 +665,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
@@ -700,6 +680,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)
 }
+