X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=joy-to-the-world%2Bhark-the-herald.ly;h=c14e970bdac6cc4b5b688fdb246acb543ddfc140;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=f1530041dfa465c50bf7461ffdb1239703d5614c;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/joy-to-the-world+hark-the-herald.ly b/joy-to-the-world+hark-the-herald.ly
index f153004..c14e970 100644
--- a/joy-to-the-world+hark-the-herald.ly
+++ b/joy-to-the-world+hark-the-herald.ly
@@ -1,8 +1,8 @@
-\version "2.16.0"
+\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 = #16
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -10,8 +10,6 @@ staffSize = #16
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Joy To The World / Hark The Herald Angels Sing" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "George Friedrich Handel/Felix Mendelssohn" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart/Craig Harris" }
@@ -20,59 +18,35 @@ staffSize = #16
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c''
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Lead vox"
 	\clef G
 	\key d \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	s1 |   % 1
-	s1 |   % 2
-	s1 |   % 3
-	s1 |   % 4
-	s1 |   % 5
-	s1 |   % 6
-	s1 |   % 7
-	s1 \bar "||:"   % 8
+	s1*8 \bar ".|:-||"   % 1-8
 
 	\repeat volta 2
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		d4 cs8. b16 a4. g8 |   % 9
-		fs4 e d4. a'8 |   % 10
-		b4. b8 cs4. cs8 |   % 11
-		d2.. d8 \bar "||"   % 12
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1*4 \bar "||"   % 9-12
 
-\mark \markup { \override #'(font-family . sans) { \box { A5 } } }
-
-		d8 ( cs ) b ( a ) a8. ( g16 fs8 ) d' |   % 13
-		d8 ( cs ) b ( a ) a8. ( g16 fs8 ) fs |   % 14
-		fs8 fs fs fs16 ( g ) a4. g16 ( fs ) |   % 15
-		e8 e e e16 ( fs ) g4. fs16 ( e ) |   % 16
-		d8 ( d'4 ) b8 a8. ( g16 fs8 ) g8 |   % 17
-
-		\time 2/4 fs4 e \time 4/4 |   % 18
-
-		\voiceThree d2 \oneVoice s2 |   % 19
-		s1 |   % 20
+		\mark \markup { \override #'(font-family . sans) { \box { A5 } } }
+		s1*5 |   % 13-17
+		\time 2/4 s2 \time 4/4 |   % 18
+		s1*2 |   % 19-20
 	}
 	\alternative
 	{
 		{
-			s1 |   % 21
-			s1 |   % 22
+			s1*2 |   % 21-22
 		}
 		{
 			s1 |   % 23
@@ -83,28 +57,15 @@ LeadVox = \relative c''
 
 	\key ef \major
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
+	\mark \markup { \override #'(font-family . sans) { \box { B } } }
 
-	ef'4 d8. c16 bf4. af8 |   % 25
-	g4 f ef4. bf'8 |   % 26
-	c4. c8 d4. d8 |   % 27
-	ef2.. ef8 \bar "||"   % 28
+	s1*4 \bar "||"   % 25-28
 
-\mark \markup { \override #'(font-family . sans) { \box { B5 } } }
+	\mark \markup { \override #'(font-family . sans) { \box { B5 } } }
 
-	ef8 ( d ) c ( bf ) bf8. ( af16 g8 ) ef' |   % 29
-	ef8 ( d ) c ( bf ) bf8. ( af16 g8 ) g |   % 30
-	g8 g g g16 ( af ) bf4. af16 ( g ) |   % 31
-	f8 f f f16 ( g ) af4. g16 ( f ) |   % 32
-	ef8 ( ef'4 ) c8 bf8. ( af16 g8 ) af8 |   % 33
-	g4 f ef4. g16 ( f ) |   % 34
-	ef8 ( ef'4 ) c8 bf8. ( af16 g8 ) af8 |   % 35
-	g2 f \bar "||"   % 36
+	s1*8 \bar "||"   % 29-36
 
-	\voiceThree ef2 \oneVoice s2 |   % 37
-	s1 |   % 38
-	s1 |   % 39
-	s1 \bar "||"   % 40
+	s1*4 \bar "||"   % 37-40
 
 	\key f \major
 
@@ -112,52 +73,118 @@ LeadVox = \relative c''
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
-
-		c4 f f4. e8 |   % 41
-		f4 a a ( g ) |   % 42
-		c4 c c4. bf8 |   % 43
-		a4 g a2 |   % 44
-		c,4 f f4. e8 |   % 45
-		f4 a a ( g ) |   % 46
-		c4 g g4. e8 |   % 47
-		e4 d c2 \bar "||"   % 48
-
-\mark \markup { \override #'(font-family . sans) { \box { C9 } } }
-
-		c'4 c c f, |   % 49
-		bf4 a a ( g ) |   % 50
-		c4 c c f, |   % 51
-		bf4 a a ( g ) |   % 52
-		d'4 d d c |   % 53
-		bf4 a bf2 |   % 54
-		g4 a8 ( bf ) c4. f,8 |   % 55
-		f4 g a2 |   % 56
-		d4. d8 d4 c |   % 57
-		bf4 a bf2 |   % 58
-		g4 a8 ( bf ) c4. f,8 |   % 59
+		\mark \markup { \override #'(font-family . sans) { \box { C } } }
+		s1*8 \bar "||"   % 48
+
+		\mark \markup { \override #'(font-family . sans) { \box { C9 } } }
+		s1*11 |   % 49-59
 	}
 	\alternative
 	{
 		{
-			\time 2/4 f4 g \time 4/4 |   % 60
-			f2 s2 |   % 61
-			s1 |   % 62
+			\time 2/4 s2 \time 4/4 |   % 60
+			s1*2 |   % 61-62
 		}
 		{
-			f4 g a2 |   % 63
+			s1 |   % 63
 		}
 	}
 
+	s1*7 \bar "|."   % 64-70
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	\clef G
+
+	% Intro
+
+	s1*8 |   % 1-8
+
+	% Verse
+
+	d4 cs8. b16 a4. g8 |   % 9
+	fs4 e d4. a'8 |   % 10
+	b4. b8 cs4. cs8 |   % 11
+	d2.. d8 |   % 12
+
+	d8 ( cs ) b ( a ) a8. ( g16 fs8 ) d' |   % 13
+	d8 ( cs ) b ( a ) a8. ( g16 fs8 ) fs |   % 14
+	fs8 fs fs fs16 ( g ) a4. g16 ( fs ) |   % 15
+	e8 e e e16 ( fs ) g4. fs16 ( e ) |   % 16
+	d8 ( d'4 ) b8 a8. ( g16 fs8 ) g8 |   % 17
+
+	fs4 e |   % 18
+
+	\voiceThree d2 \oneVoice s2 |   % 19
+	s1 |   % 20
+
+	s1 |   % 21
+	s1 |   % 22
+
+	s1 |   % 23
+
+	s1 |   % 24
+
+	ef'4 d8. c16 bf4. af8 |   % 25
+	g4 f ef4. bf'8 |   % 26
+	c4. c8 d4. d8 |   % 27
+	ef2.. ef8 |   % 28
+
+	ef8 ( d ) c ( bf ) bf8. ( af16 g8 ) ef' |   % 29
+	ef8 ( d ) c ( bf ) bf8. ( af16 g8 ) g |   % 30
+	g8 g g g16 ( af ) bf4. af16 ( g ) |   % 31
+	f8 f f f16 ( g ) af4. g16 ( f ) |   % 32
+	ef8 ( ef'4 ) c8 bf8. ( af16 g8 ) af8 |   % 33
+	g4 f ef4. g16 ( f ) |   % 34
+	ef8 ( ef'4 ) c8 bf8. ( af16 g8 ) af8 |   % 35
+	g2 f |   % 36
+
+	\voiceThree ef2 \oneVoice s2 |   % 37
+	s1*3 |   % 38-40
+
+	% Verse
+
+	c4 f f4. e8 |   % 41
+	f4 a a ( g ) |   % 42
+	c4 c c4. bf8 |   % 43
+	a4 g a2 |   % 44
+	c,4 f f4. e8 |   % 45
+	f4 a a ( g ) |   % 46
+	c4 g g4. e8 |   % 47
+	e4 d c2 |   % 48
+
+	c'4 c c f, |   % 49
+	bf4 a a ( g ) |   % 50
+	c4 c c f, |   % 51
+	bf4 a a ( g ) |   % 52
+	d'4 d d c |   % 53
+	bf4 a bf2 |   % 54
+	g4 a8 ( bf ) c4. f,8 |   % 55
+	f4 g a2 |   % 56
+	d4. d8 d4 c |   % 57
+	bf4 a bf2 |   % 58
+	g4 a8 ( bf ) c4. f,8 |   % 59
+
+	f4 g |   % 60
+	f2 s2 |   % 61
+	s1 |   % 62
+
+	f4 g a2 |   % 63
+
 	d4. d8 d4 c |   % 64
 	bf4 a bf2 |   % 65
 	g4 a8 bf c4. f,8 |   % 66
 	f2 g |   % 67
 	f2 s2 |   % 68
-	s1 |   % 69
-	s1 \bar "|."   % 70
+	s1*2 |   % 69-70
 }
 
+
 LeadVoxText = \lyricmode
 {
 	Joy to the world! the Lord is come:
@@ -227,12 +254,6 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c'''
 {
-	\clef G
-	\key d \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
@@ -275,7 +296,7 @@ Riffs = \relative c'''
 
 	\voiceTwo c,4 \oneVoice f f4. e8 |   % 68
 	f4 a a g |   % 69
-	f1-\fermata \bar "|."   % 70
+	f1-\fermata |   % 70
 	\normalsize
 }
 
@@ -283,53 +304,41 @@ Riffs = \relative c'''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
-	d1:5.9 |   % 1
+	d1:3.5.9 |   % 1
 	s1 |   % 2
-	c1:5.9 |   % 3
+	c1:3.5.9 |   % 3
 	s1 |   % 4
-	d1:5.9 |   % 5
+	d1:3.5.9 |   % 5
 	s1 |   % 6
-	c2..:5.9 s16 g/a |   % 7
+	c2..:3.5.9 s16 g/a |   % 7
 	s2 a |   % 8
 
-	\repeat volta 2
-	{
-		% Verse
+	% Verse
 
-		d4 a8./d g16/d d4. g8  |   % 9
-		d4/a a d2 |   % 10
-		g2 a |   % 11
-		b4:m s16 a8/cs d16 s2 |   % 12
+	d4 a8./d g16/d d4. g8  |   % 9
+	d4/a a d2 |   % 10
+	g2 a |   % 11
+	b4:m s16 a8/cs d16 s2 |   % 12
 
-		d4 g/d a8./d d16 s4 |   % 13
-		d4 g/d a8./d d16 s4 |   % 14
-		d2 s8. d16/fs s4 |   % 15
-		a2 s8. a16/cs s4 |   % 16
-		g4/b a/cs d g:maj7 |   % 17
+	d4 g/d a8./d d16 s4 |   % 13
+	d4 g/d a8./d d16 s4 |   % 14
+	d2 s8. d16/fs s4 |   % 15
+	a2 s8. a16/cs s4 |   % 16
+	g4/b a/cs d g:maj7 |   % 17
 
-		\time 2/4 d4/a a \time 4/4 |   % 18
+	d4/a a |   % 18
 
-		d1:5.9 |   % 19
-		s1 |   % 20
-	}
-	\alternative
-	{
-		{
-			c2..:5.9 s16 g/a |   % 21
-			s2 a |   % 22
-		}
-		{
-			c2..:5.9 s16 af/bf |   % 23
-		}
-	}
+	d1:3.5.9 |   % 19
+	s1 |   % 20
+
+	c2..:3.5.9 s16 g/a |   % 21
+	s2 a |   % 22
+
+	c2..:3.5.9 s16 af/bf |   % 23
 
 	s2 bf |   % 24
 
@@ -347,45 +356,37 @@ Chords = \chordmode
 	ef4 af:maj7 g:m7 c:m7 |   % 35
 	ef2/bf bf |   % 36
 
-	ef1:5.9 |   % 37
+	ef1:3.5.9 |   % 37
 	s1 |   % 38
-	df2..:5.9 s16 bf/c |   % 39
+	df2..:3.5.9 s16 bf/c |   % 39
 	s2 c |   % 40
 
-	\repeat volta 2
-	{
-		f2 g:m11 |   % 41
-		f2/a f4/c c |   % 42
-		f2/a bf |   % 43
-		f4/c c f2 |   % 44
-		f2 f/e |   % 45
-		d2:m7 g:9 |   % 46
-		a4:m g/b c2 |   % 47
-		c4/g g c2 |   % 48
-
-		f2. f4/a |   % 49
-		bf4 d:m7 f/c c/bf |   % 50
-		f2/a bf |   % 51
-		g2:m7 f4/c c |   % 52
-		bf2. d4:7.9- |   % 53
-		g4:m d:7.9- g2:m7 |   % 54
-		c4 c/bf f2/a |   % 55
-		f4/c c f2 |   % 56
-		bf2 d:aug/a |   % 57
-		g4:m7 d:7.9- g2:m7 |   % 58
-		c2/e f/a |   % 59
-	}
-	\alternative
-	{
-		{
-			\time 2/4 f4/c c \time 4/4 |   % 60
-			f2 g:m11 |   % 61
-			f2/a f4/c c |   % 62
-		}
-		{
-			f4/c c f2 |   % 63
-		}
-	}
+	f2 g:m11 |   % 41
+	f2/a f4/c c |   % 42
+	f2/a bf |   % 43
+	f4/c c f2 |   % 44
+	f2 f/e |   % 45
+	d2:m7 g:9 |   % 46
+	a4:m g/b c2 |   % 47
+	c4/g g c2 |   % 48
+
+	f2. f4/a |   % 49
+	bf4 d:m7 f/c c/bf |   % 50
+	f2/a bf |   % 51
+	g2:m7 f4/c c |   % 52
+	bf2. d4:7.9- |   % 53
+	g4:m d:7.9- g2:m7 |   % 54
+	c4 c/bf f2/a |   % 55
+	f4/c c f2 |   % 56
+	bf2 d:aug/a |   % 57
+	g4:m7 d:7.9- g2:m7 |   % 58
+	c2/e f/a |   % 59
+
+	f4/c c |   % 60
+	f2 g:m11 |   % 61
+	f2/a f4/c c |   % 62
+
+	f4/c c f2 |   % 63
 
 	bf2 d:aug/a |   % 64
 	g4:m7 d:7.9- g2:m7 |   % 65
@@ -400,17 +401,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...
-
 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
 
@@ -421,45 +416,37 @@ StaffC = \relative c
 	c4 c c c8. c16-> ~ |   % 5
 	c1 |   % 6
 	c4 c c c8. c16-> ~ |   % 7
-	c4 c c c \bar "||:"   % 8
+	c4 c c c |   % 8
 
-	\repeat volta 2
-	{
-		% Verse
+	% Verse
 
-		c4 c8. c16 c4. c8 |   % 9
-		c4 c c c |   % 10
-		c4 c c c |   % 11
-		c8.-> c16-^ ~ c c8-^ c16-> ~ c2 \bar "||"   % 12
+	c4 c8. c16 c4. c8 |   % 9
+	c4 c c c |   % 10
+	c4 c c c |   % 11
+	c8.-> c16-^ ~ c c8-^ c16-> ~ c2 |   % 12
 
-		c4 c c8. c16 ~ c4 |   % 13
-		c4 c c8. c16 ~ c4 |   % 14
-		c4-^ c-^ r8. c16-> ~ c4 |   % 15
-		c4-^ c-^ r8. c16-> ~ c4 |   % 16
-		c4 c c c |   % 17
+	c4 c c8. c16 ~ c4 |   % 13
+	c4 c c8. c16 ~ c4 |   % 14
+	c4-^ c-^ r8. c16-> ~ c4 |   % 15
+	c4-^ c-^ r8. c16-> ~ c4 |   % 16
+	c4 c c c |   % 17
 
-		\time 2/4 c4 c \time 4/4 |   % 18
+	c4 c |   % 18
 
-		c4 c c c8. c16 ~ |   % 19
-		c1 |   % 20
-	}
-	\alternative
-	{
-		{
-			c4 c c c8. c16-> ~ |   % 21
-			c4 c c c |   % 22
-		}
-		{
-			c4 c c c8. c16-> ~ |   % 23
-		}
-	}
+	c4 c c c8. c16 ~ |   % 19
+	c1 |   % 20
+
+	c4 c c c8. c16-> ~ |   % 21
+	c4 c c c |   % 22
 
-	c4 c c c \bar "||"   % 24
+	c4 c c c8. c16-> ~ |   % 23
+
+	c4 c c c |   % 24
 
 	c2.. c8 |   % 25
 	c4 c c c |   % 26
 	c4 c c c |   % 27
-	c8.-> c16-^ ~ c c8-^ c16-> ~ c2 \bar "||"   % 28
+	c8.-> c16-^ ~ c c8-^ c16-> ~ c2 |   % 28
 
 	c4 c c8. c16 ~ c4 |   % 29
 	c4 c c8. c16 ~ c4 |   % 30
@@ -468,47 +455,39 @@ StaffC = \relative c
 	c4 c c c |   % 33
 	c4 c c c |   % 34
 	c4 c c c |   % 35
-	c2 c \bar "||"   % 36
+	c2 c |   % 36
 
 	c4 c c c8. c16 ~ |   % 37
 	c1 |   % 38
 	c4 c c c8. c16 ~ |   % 39
-	c4 c c c \bar "||"   % 40
-
-	\repeat volta 2
-	{
-		c4 c c c |   % 41
-		c4 c c c |   % 42
-		c4 c c c |   % 43
-		c4 c c c |   % 44
-		c4 c c c |   % 45
-		c4 c c c |   % 46
-		c4 c c c |   % 47
-		c4 c c c \bar "||"   % 48
-
-		c2.-> c4-> |   % 49
-		c4 c c c |   % 50
-		c4 c c c |   % 51
-		c4 c c c |   % 52
-		c4 c c c |   % 53
-		c4 c c c |   % 54
-		c4 c c c |   % 55
-		c4 c c c |   % 56
-		c4 c c c |   % 57
-		c4 c c c |   % 58
-		c4 c c c |   % 59
-	}
-	\alternative
-	{
-		{
-			\time 2/4 c4 c \time 4/4 |   % 60
-			c4 c c c |   % 61
-			c4 c c c |   % 62
-		}
-		{
-			c4 c c c |   % 63
-		}
-	}
+	c4 c c c |   % 40
+
+	c4 c c c |   % 41
+	c4 c c c |   % 42
+	c4 c c c |   % 43
+	c4 c c c |   % 44
+	c4 c c c |   % 45
+	c4 c c c |   % 46
+	c4 c c c |   % 47
+	c4 c c c \bar "||"   % 48
+
+	c2.-> c4-> |   % 49
+	c4 c c c |   % 50
+	c4 c c c |   % 51
+	c4 c c c |   % 52
+	c4 c c c |   % 53
+	c4 c c c |   % 54
+	c4 c c c |   % 55
+	c4 c c c |   % 56
+	c4 c c c |   % 57
+	c4 c c c |   % 58
+	c4 c c c |   % 59
+
+	c4 c |   % 60
+	c4 c c c |   % 61
+	c4 c c c |   % 62
+
+	c4 c c c |   % 63
 
 	c4 c c c |   % 64
 	c4 c c c |   % 65
@@ -516,7 +495,7 @@ StaffC = \relative c
 	c2 c |   % 67
 	c4 c c c |   % 68
 	c4 c c c |   % 69
-	c1-\fermata \bar "|."   % 70
+	c1-\fermata |   % 70
 }
 
 
@@ -543,39 +522,44 @@ 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
 }
+