X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=o-come-all-ye-faithful.ly;h=c4ea60dcc352cbf866bf7854dd8bc15a1529c36e;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=131f243f756238e6c588de0c843b48fdfb879420;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/o-come-all-ye-faithful.ly b/o-come-all-ye-faithful.ly
index 131f243..c4ea60d 100644
--- a/o-come-all-ye-faithful.ly
+++ b/o-come-all-ye-faithful.ly
@@ -1,49 +1,70 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
-staffSize = #16
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
+staffSize = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "O Come, All Ye Faithful" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" }
-	tagline  = "Engraved by JLH and Lilypond 2.8.6"
+	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
 }
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c'
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Lead vox"
 	\clef G
 	\key f \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
 	\partial 4*1 s4 \bar "||"   % 0
-	s1 |   % 1
-	s1 |   % 2
-	s1 |   % 3
-	s2. f4 \bar "||"   % 4
+	s1*4 \bar "||"   % 1-4
+
+	% Verse
+
+	\mark \markup { \override #'(font-family . sans) { \box { A } } }
+	s1*21 \bar "||"   % 5-25
+
+	% Verse
+
+	\mark \markup { \override #'(font-family . sans) { \box { B } } }
+	s1*14 |   % 26-39
+
+%\break %Bah, only valid for size 16!!!
+
+	s1*6 \bar "||"   % 40-45
 
 	% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	s1*25 \bar "|."   % 46-70
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	s4 |   % 0
+	s1*3 |   % 1-3
+	s2. f4 |   % 4
+
+	% Verse
 
 	f2 c4 f |   % 5
 	g2 c, |   % 6
@@ -65,12 +86,10 @@ LeadVox = \relative c'
 	e2 f4 ( bf ) |   % 22
 	a2 ( g4. ) f8 |   % 23
 	f1 ~ |   % 24
-	f1 \bar "||"   % 25
+	f1 |   % 25
 
 	% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
 	f2 c4 f |   % 26
 	g2 c, |   % 27
 	a'4 g a bf |   % 28
@@ -86,19 +105,17 @@ LeadVox = \relative c'
 	f4 e f g |   % 38
 	f2 c4 a' |   % 39
 
-\break %Bah, only valid for size 16!!!
+%\break %Bah, only valid for size 16!!!
 
 	a4 g a bf |   % 40
 	a2 g4 a |   % 41
 	bf a g f |   % 42
 	e2 f4 ( bf ) |   % 43
 	a2 ( g4. ) f8 |   % 44
-	f1 \bar "||"   % 45
+	f1 |   % 45
 
 	% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
-
 	f2 c4 f |   % 46
 	g2 c, |   % 47
 	a'4 g a bf |   % 48
@@ -123,9 +140,10 @@ LeadVox = \relative c'
 	e2 f4 ( bf ) |   % 67
 	a1-> ( |   % 68
 	g2. ) ~ g8 f |   % 69
-	f1^\fermata \bar "|."   % 70
+	f1^\fermata |   % 70
 }
 
+
 LeadVoxText = \lyricmode
 {
 	O come, all ye fai -- thful,
@@ -165,16 +183,10 @@ LeadVoxText = \lyricmode
 
 Riffs = \relative c''
 {
-	\clef G
-	\key f \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
-	\partial 4*1 a4 |   % 0
+	a4 |   % 0
 	bf4-> a-> g-> f-> |   % 1
 	e2 f4 bf |   % 2
 	a2 g4. f8 |   % 3
@@ -186,15 +198,11 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
-	\partial 4*1 d4:7/fs |   % 0
+	d4:7/fs |   % 0
 	g4:m f/a g:m/bf g:7/b |   % 1
 	c4 c/bf f/a bf:m/df |   % 2
 	f2/c g4:m7/c c:9 |   % 3
@@ -202,7 +210,7 @@ Chords = \chordmode
 
 	% Verse
 
-	f1:5.9 |   % 5
+	f1:3.5.9 |   % 5
 	g2:m7 c:sus4.7 |   % 6
 	f4 c/e f c:7/g |   % 7
 	f2/a g4:m7/c a:aug7/cs |   % 8
@@ -280,25 +288,19 @@ 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...
-
 StaffC = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
-	\partial 4*1 c4 \bar "||"   % 0
+	c4 |   % 0
 	c4 c c c |   % 1
 	c4 c c c |   % 2
 	c4 c c c |   % 3
-	c4 c c c \bar "||"   % 4
+	c4 c c c |   % 4
 
 	% Verse
 
@@ -322,7 +324,7 @@ StaffC = \relative c
 	c4 c c c |   % 22
 	c4 c c c |   % 23
 	c4 c c c |   % 24
-	c4 c c c \bar "||"   % 25
+	c4 c c c |   % 25
 
 	% Verse
 
@@ -345,7 +347,7 @@ StaffC = \relative c
 	c4 c c c |   % 42
 	c4 c c c |   % 43
 	c4 c c c |   % 44
-	c4 c c c \bar "||"   % 45
+	c4 c c c |   % 45
 
 	% Verse
 
@@ -373,7 +375,7 @@ StaffC = \relative c
 	c4 c c c |   % 67
 	c4 c c c |   % 68
 	c4 c c c |   % 69
-	c1^\fermata \bar "|."   % 70
+	c1^\fermata |   % 70
 }
 
 
@@ -414,39 +416,43 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-%			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-			\new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> }
+			\new Voice = "lead" \LeadVox
+			\new Voice = "riffs" \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
-%			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
-
-	\layout
-	{
-%		\context { \Staff \RemoveEmptyStaves }
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
 }
 
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
-
-%  top-margin = -0.25 \in
+	#(define fonts (make-pango-font-tree
+		"Times New Roman"
+		"LilyJAZZText"
+		"Luxi Mono"
+		(/ staffSize 20)))
+
+% 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
+% 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
 }
+