X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=great-is-the-lord.ly;h=93e703a5e781a21a345afac9f0382846bc788f51;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=50707ca917a583da7380d6b56a1b2c7af4ec7421;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/great-is-the-lord.ly b/great-is-the-lord.ly
index 50707ca..93e703a 100644
--- a/great-is-the-lord.ly
+++ b/great-is-the-lord.ly
@@ -24,13 +24,13 @@ staffSize = #20
 %
 Global =
 {
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\key c \major
 	\time 6/8
 
 	% Intro
 
-	s2.*4 \bar "||:"   % 1-4
+	s2.*4 \bar ".|:-||"   % 1-4
 
 	\repeat volta 2
 	{
@@ -65,20 +65,13 @@ Global =
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%	\set Staff.instrument = #"Lead vox"
-%	\override Staff.TimeSignature #'style = #'()
 	\clef G
-	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	R2. |   % 1
-	R2. |   % 2
-	R2. |   % 3
-	R2. \bar "||:"   % 4
+	R2.*4 \bar "||:"   % 1-4
 
 	% A section
 
@@ -147,16 +140,9 @@ LeadVoxText = \lyricmode
 %
 % Riffs
 %
-
 Riffs = \relative c'''
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
-	\override Staff.TimeSignature #'style = #'()
 	\clef G
-%	\key c \major
-%	\time 6/8
-%\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -206,12 +192,8 @@ Riffs = \relative c'''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	c2.:^3 |   % 1
@@ -260,15 +242,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 Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -334,7 +312,7 @@ Dynamics =
 \score
 {
 	<<
-		\Global						% The "roadmap" that everything else depends on
+		\Global		% The "roadmap" that everything else depends on
 
 		\context Staff
 		<<
@@ -354,10 +332,9 @@ Dynamics =
 		}
 		\Riffs
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-%			\new Staff = "riff" \RhythmB
-			\new ChordNames = "chords" \Chords
+			\new ChordNames \Chords
 			\new RhythmicStaff << \Rhythm \Dynamics >>
 		>>
 
@@ -371,7 +348,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"JazzText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -384,6 +361,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)
 }
+