X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=we-fall-down.ly;h=65c9af27431f2a6ed4d7568ce16489bc2b493621;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=e0b2a32a64ce8e14cd899074c4b688d079881e1f;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/we-fall-down.ly b/we-fall-down.ly
index e0b2a32..65c9af2 100644
--- a/we-fall-down.ly
+++ b/we-fall-down.ly
@@ -1,8 +1,8 @@
-\version "2.19.48"
+\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,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 "We Fall Down" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "C. Tomlin" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. S. Hammons" }
@@ -31,11 +29,10 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 %
 % Song's structure
 %
-
 Global =
 {
 	\key a \major
-	%	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -67,9 +64,6 @@ Global =
 
 LeadVox = \relative c'
 {
-	\clef G
-	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	R1 |   % 1
@@ -195,12 +189,9 @@ 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
 {
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
 	\teeny
 
@@ -278,37 +269,19 @@ Dynamics =
 
 \score
 {
-%{
-	<<
-		<<
-%			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-			\new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> }
-			\new Lyrics \lyricsto "lead" \LeadVoxText
-		>>
-
-		\new ChoirStaff = "Rhythm"
-		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
-		>>
-
-		\set Score.skipBars = ##t
-		\set Score.melismaBusyProperties = #'()
-	>>
-%}
 	<<
+		\Global		% The "roadmap" that everything else depends on
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-		\new Staff
+		\context Staff
 		<<
-			\Global   % The "roadmap" that everything else depends on
 			\new Voice = "lead" \LeadVox
 			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxTextA
 		>>
 
-%		\new Staff
+		\new ChoirStaff
 		<<
 			\new ChordNames \Chords
 			\new RhythmicStaff << \Rhythm \Dynamics >>
@@ -319,11 +292,11 @@ Dynamics =
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "JazzText"
-    "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
@@ -334,7 +307,5 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
-%let's try this: [It works! Huzzah!][nope... :-/]
-%	obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }