X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=come-thou-fount-of-every-blessing.ly;h=f4a20a67ef7fa93fd06df4206e0556b6a4e61b28;hb=HEAD;hp=0efaed95c776915ea44937400ef26d073ad77c69;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/come-thou-fount-of-every-blessing.ly b/come-thou-fount-of-every-blessing.ly
old mode 100755
new mode 100644
index 0efaed9..f4a20a6
--- a/come-thou-fount-of-every-blessing.ly
+++ b/come-thou-fount-of-every-blessing.ly
@@ -3,7 +3,7 @@
 \include "english.ly"
 
 % Good sizes are 16, 18, & 20
-staffSize = #18
+staffSize = #24
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
@@ -12,8 +12,6 @@ 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 "Come Thou Fount Of Every Blessing" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Roger Freeland" }
@@ -24,16 +22,12 @@ staffSize = #18
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
 	\key d \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -121,12 +115,6 @@ LeadVoxTextC = \lyricmode
 
 Riffs = \relative c'
 {
-	\clef G
-	\key d \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\partial 4*1 \tiny fs8 e |   % partial
@@ -156,54 +144,14 @@ Riffs = \relative c'
 	b4 a fs8 e |   % 24
 	d2.^\fermata |   % 25
 	\normalsize
-
-%{
-	\tiny
-	\repeat "percent" 3   % 1 - 6
-	{
-		<< { \tiny f16 c f, <f' f,> ~ <f f,> f, c' f f8 e } \\ { \tiny f,,2 c'4 } >> |   % 1
-		<< { \tiny f'16 c f, <f' f,> ~ <f f,> f, c' f f8 e } \\ { \tiny bf,2 c4 } >> |   % 2
-	}
-	<< s2. \\ { \tiny d2 c4 } >> |   % 7
-	<< s2. \\ { \tiny bf2. } >> |   % 8
-
-	s2.*7
-
-	\voiceOne
-	\repeat "percent" 6 { f''16 c f, <f' f,> ~ <f f,> f, c' f f8 e | }   % 16-21
-	\oneVoice
-
-	s2.*7
-
-	\voiceOne
-	\repeat "percent" 2 { f16 c f, f' ~ f f, c' f f8 e | }   % 29-30
-	\oneVoice
-
-	\key g \major
-
-	\voiceOne
-	\repeat "percent" 2 { g16 d g, g' ~ g g, d' g g8 fs | }   % 31-32
-	\oneVoice
-
-	s2.*7
-
-	\voiceOne
-	\repeat "percent" 4 { g16 d g, g' ~ g g, d' g g8 fs | }   % 40-43
-	\oneVoice
-	\normalsize
-%}
 }
 
 
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	s4 |   % pickup
@@ -261,11 +209,10 @@ Chords = \chordmode
 
 StaffC = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -333,30 +280,24 @@ Dynamics =
 \score
 {
 	<<
+		\context Staff
 		<<
-%			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-			\new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> }
+			\new Voice = "lead" \LeadVox
+			\new Voice = "riffs" \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 			\new Lyrics \lyricsto "lead" \LeadVoxTextC
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
-
-	\layout
-	{
-%		\context { \Staff \RemoveEmptyStaves }
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
 }
 
 
@@ -364,9 +305,18 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "JazzText"
     "Luxi Mono"
     (/ staffSize 20)))
 
-%  top-margin = -0.25 \in
+% Don't spread staves vertically across last page (default: t)
+%	ragged-last-bottom = ##f
+% Don't spread staves vertically across the page (default: f)
+%	ragged-bottom = ##t
+% Allow partial line for last stave (default: f)
+	ragged-last = ##t
+
+% To find out what's eating the space at the top...
+%	annotate-spacing = ##t
 }
+