X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hallelujah.ly;h=4798ae3c71b72c6752e80f4ddc0871ca0ffa5ec9;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=4bb3827259b98ebbe4982e2e3b1d42bbf7a9f86b;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/hallelujah.ly b/hallelujah.ly
index 4bb3827..4798ae3 100644
--- a/hallelujah.ly
+++ b/hallelujah.ly
@@ -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 "Hallelujah (Your Love Is Amazing)" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -37,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key g \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 %	\once \override TextScript #'padding = #2.0
@@ -105,18 +103,12 @@ 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
 	\set tupletSpannerDuration = #(ly:make-moment 1 4)
 
 	% Intro
 
-	r1 |   % 1
-	r1 |   % 2
-	r1 |   % 3
+	r1*3 |   % 1-3
 	r2 e16 g8 g16 ~ g e8 a16 ~ |   % 4
 
 	% Verse
@@ -249,9 +241,6 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c'
 {
-%	\clef G
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 	\set tupletSpannerDuration = #(ly:make-moment 1 4)
 
 	% Intro
@@ -336,17 +325,11 @@ 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...
+%Not small enough... (?)
 	\teeny
 %	\magnify #0.3
 
@@ -437,43 +420,43 @@ Dynamics =
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-%		\new Staff
-		<<
-			\new ChordNames \Chords
-%Capo 4 edition
-%			\new ChordNames \transpose b g \Chords
-			\new RhythmicStaff << \Rhythm \Dynamics >>
-		>>
+		\Global		% The "roadmap" that everything else depends on
 
-		\new Staff
+		\context Staff
 		<<
-			\Global						% The "roadmap" that everything else depends on
 			\new Voice = "lead" \LeadVox
 			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
+
+		\new ChoirStaff
+		<<
+			\new ChordNames \Chords
+%Capo 4 edition
+%			\new ChordNames \transpose b g \Chords
+			\new RhythmicStaff << \Rhythm \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"
+		"JazzText"
+		"Luxi Mono"
+		(/ staffSize 20)))
 
 % Spread staves vertically across last page (default: t)
-	ragged-last-bottom = ##f
+%	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
+%	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)
 }
+