X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fall-on-me.ly;h=fd9c3d98de01f2ea88f8c69290cabd7834a9a689;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=7fea863d948a590fb623b204ee1de18a57bbd25c;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/fall-on-me.ly b/fall-on-me.ly
index 7fea863..fd9c3d9 100644
--- a/fall-on-me.ly
+++ b/fall-on-me.ly
@@ -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 "Fall On Me" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -35,7 +33,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key e \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -63,7 +61,7 @@ Global =
 
 		\mark \markup { \override #'(font-family . sans) { \box { B } } }
 
-		s1*16 |   % 25-40 
+		s1*16 |   % 25-40
 \once \override Score.RehearsalMark #'self-alignment-X = #left
 \mark \markup { \musicglyph #"scripts.coda" \italic { to Coda } }
 		s1*2 \bar "||"   % 41-42
@@ -78,8 +76,8 @@ Global =
 	% Coda
 
 	% blank measure between last measure and coda
-%	\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
-	\stopStaff s1 \startStaff   % That removed the spurious floating bar line from line break
+	\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
+%	\stopStaff s1 \startStaff   % This is needed only because the above has to be enabled IFF the coda starts on a new line...:-P
 %	\break % Meh
 	\set Score.currentBarNumber = #59
 
@@ -103,7 +101,6 @@ Global =
 LeadVox = \relative c'
 {
 	\clef G
-	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -115,7 +112,7 @@ LeadVox = \relative c'
 	<a \hn cs,>8 <gs \hn b,> ~ <gs \hn b,>2 r4 |   % 5
 	<fs \hn b,>4. ( <e \hn gs,>8 ) ~ <e \hn gs,>2 |   % 6
 	r2 <a \hn cs,>4 << { \voiceOne gs8 ( fs ) } \new Voice = "v"  { \voiceTwo \once \override NoteHead #'font-size = #-3.5 a,4 } >> \oneVoice |   % 7
-%disnowok	r2 <a \hn cs,>4 << { \voiceOne gs8 ( fs ) } \new Voice = "v"  { \voiceTwo \hn a,4 } >> \oneVoice |   % 
+%disnowok	r2 <a \hn cs,>4 << { \voiceOne gs8 ( fs ) } \new Voice = "v"  { \voiceTwo \hn a,4 } >> \oneVoice |   %
 %Also, the << \\ >> notation doesn't track lyrics correctly... Grrrrrrrrrrrrrr
 	<fs' \hn b,>2. <e \hn gs,>8 <fs \hn a,> |   % 8
 	<a \hn cs,>8 <gs \hn b,> ~ <gs \hn b,>2 r4 |   % 9
@@ -142,7 +139,7 @@ LeadVox = \relative c'
 	<a \hn cs,>8 <gs \hn b,> ~ <gs \hn b,>2 r4 |   % 25
 	<fs \hn b,>4. ( <e \hn gs,>8 ) ~ <e \hn gs,>2 |   % 26
 	r2 <a \hn cs,>4 << { \voiceOne gs8 ( fs ) } \new Voice = "v"  { \voiceTwo \once \override NoteHead #'font-size = #-3.5 a,4 } >> \oneVoice |   % 27
-%disnowok	r2 <a \hn cs,>4 << { \voiceOne gs8 ( fs ) } \new Voice = "v"  { \voiceTwo \hn a,4 } >> \oneVoice |   % 
+%disnowok	r2 <a \hn cs,>4 << { \voiceOne gs8 ( fs ) } \new Voice = "v"  { \voiceTwo \hn a,4 } >> \oneVoice |   %
 %Also, the << \\ >> notation doesn't track lyrics correctly... Grrrrrrrrrrrrrr
 	<fs' \hn b,>2. <e \hn gs,>8 <fs \hn a,> |   % 28
 	<a \hn cs,>8 <gs \hn b,> ~ <gs \hn b,>2 r4 |   % 29
@@ -242,33 +239,7 @@ Riffs = \relative c'
 	r8 b e fs ~ fs e ~ e4 |   % 2
 	r8 a, e' fs ~ fs e ~ e4 |   % 3
 	r8 b e fs ~ fs4 s |   % 4
-
-%{
-	% Intro
-
-	\tiny
-	R1 |   % 1
-	R1 |   % 2
-	R1 |   % 3
-	R1 |   % 4
-
-	c8 ( f ) ~ f2. |   % 5
-	e2 ~ e8 a4. |   % 6
-	d,1 ( |   % 7
-	c1 ) |   % 8
-	bf4 ( df2. ) |   % 9
-	df4 ( e2. ) |   % 10
-	ef1 |   % 11
-	d8 ef4 f8 ~ f4 bf-. |   % 12
-	d,2 s2 |   % 13
-
-	s1*36 |   % 14-49
-	s2 |   % 50
-	s1*32 |   % 51-82
-	r8 df df df df ( c ) bf4 |   % 83
-	R1*8 |   % 84-91
 	\normalsize
-%}
 }
 
 
@@ -277,9 +248,6 @@ Riffs = \relative c'
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	e1:sus2 |   % 1
@@ -377,8 +345,9 @@ Chords = \chordmode
 
 Rhythm =
 {
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -485,11 +454,12 @@ Dynamics =
 \score
 {
 	<<
-		\Global						% The "roadmap" that everything else depends on
+		\Global		% The "roadmap" that everything else depends on
 
 		\context Staff
 		<<
-			\context Staff << \new Voice = "lead" \LeadVox \new Voice \Riffs >>
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 		>>
 
@@ -511,17 +481,18 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"JazzText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
-% Spread staves vertically across last page (default: t)
-%		ragged-last-bottom = ##f
+% 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
+%	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
-%let's try this: [It works! Huzzah!]
-	obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }
+