X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lamb-of-god.ly;h=97e76a6e324ba5b73c5e5f797b3b3a83655d48d5;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=7161a15a037e76b8b42a6c81dd27272e8d49861d;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/lamb-of-god.ly b/lamb-of-god.ly
index 7161a15..97e76a6 100644
--- a/lamb-of-god.ly
+++ b/lamb-of-god.ly
@@ -1,10 +1,10 @@
 % Still need hairpins, directions, dynamics, etc...
 
-\version "2.18.1"
+\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)
@@ -14,8 +14,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 "Lamb of God" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Twila Paris" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" }
@@ -29,7 +27,7 @@ staffSize = #20
 Global =
 {
 	\key c \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
 
 	% Intro
@@ -89,7 +87,7 @@ Global =
 			s2. |   % 46
 		}
 		{
-			s2. \bar "||"   % 47
+			s2. \bar "|."   % 47
 		}
 	}
 }
@@ -98,13 +96,9 @@ Global =
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -180,6 +174,7 @@ LeadVox = \relative c'
 	d,2.^\fermata |   % 47
 }
 
+
 LeadVoxText = \lyricmode
 {
 	Your on -- ly son, no sin to hide,
@@ -222,7 +217,6 @@ LeadVoxText = \lyricmode
 %
 % Riffs
 %
-
 Riffs = \relative c'
 {
 	\teeny
@@ -248,7 +242,6 @@ Riffs = \relative c'
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
 	% Intro
@@ -329,15 +322,11 @@ Chords = \chordmode
 %
 % Chord rhythms
 %
-
 Rhythm = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Rhythm"
 	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
 	\override NoteHead #'style = #'slash
-\tiny
+	\teeny
 
 	% Intro
 
@@ -424,39 +413,30 @@ Dynamics =
 	s4. s4._\markup { \italic { Band in } } |   % 11
 	s2.*34 |   % 12-44 (+1 for blank coda)
 	s4 s2_\markup { \italic { Rit. last time } } |   % 45
-
-%{
-	% Intro
-	s4_\markup { \italic { Ac. gtr only } } s2. |   % 1
-
-	s1*3 |   % 2-4
-
-	s4_\markup { \italic { Band in } } s2. |   % 5
-%}
 }
 
 
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-%		\new ChoirStaff
+		\context Staff
+		<<
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
+			\new Lyrics \lyricsto "lead" \LeadVoxText
+		>>
+
+		\new ChoirStaff
 		<<
 			\new ChordNames \Chords
 %Capo 3 edition
 %			\new ChordNames \transpose f d \Chords
 			\new RhythmicStaff << \Rhythm \Dynamics >>
 		>>
-
-		\new Staff
-		<<
-			\Global						% The "roadmap" that everything else depends on
-			\new Voice = "lead" \LeadVox
-			\new Voice \Riffs
-			\new Lyrics \lyricsto "lead" \LeadVoxText
-		>>
 	>>
 }
 
@@ -465,7 +445,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"LilyJAZZText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -480,12 +460,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)
-
-	% This doesn't quite do what I want :-P
-	system-system-spacing #'padding = #1
-	markup-system-spacing #'padding = #4
-	score-markup-spacing #'padding = #4
-	score-system-spacing #'padding = #4
 }
+