X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=o-come-o-come-emmanuel.ly;h=e760b62060318ab0d4ea55721e29df69b9da20fb;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=fd3f227382a2ee079eb40e3dbfe51f4b301c52a0;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/o-come-o-come-emmanuel.ly b/o-come-o-come-emmanuel.ly
index fd3f227..e760b62 100644
--- a/o-come-o-come-emmanuel.ly
+++ b/o-come-o-come-emmanuel.ly
@@ -1,9 +1,9 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
-staffSize = #20
+% 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))
@@ -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 "O Come, O Come, Emmanuel" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Thomas Helmore" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -22,88 +20,108 @@ staffSize = #20
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c'
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
 	\key e \minor
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
 	s1^\markup { \hspace #0.0 \raise #1.0 { Half time feel } } |   % 1
-	s1 |   % 2
-	s1 |   % 3
-	s1 |   % 4
-	s1 |   % 5
-	s1 |   % 6
-	s1 |   % 7
-	s2. e4 |   % 8
+	s1*7 |   % 2-8
 
 	\repeat volta 3
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		g4 b b b |   % 9
-		a4 ( c b ) a |   % 10
-		g2. a4 |   % 11
-		b4 g e g |   % 12
-		a4 ( fs e ) d |   % 13
-		e2. a4 |   % 14
-		a4 e e fs |   % 15
-		g2 ( fs4 ) e |   % 16
-		d2. g4 |   % 17
-		a4 b b b |   % 18
-		a4 ( c b ) a |   % 19
-		g2. d'4 \bar "||"   % 20
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1*12 \bar "||"   % 9-20
 
 		% Chorus
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
 
-		d2. b4 |   % 21
-		b2. b4 |   % 22
-		a4 ( c b ) a |   % 23
-		g2. a4 |   % 24
-		b4 g e g |   % 25
-		a4 ( fs e ) d |   % 26
-\break % Bleh.
+		s1*6 |   % 21-26
 	}
 	\alternative
 	{
 		{
-			e1 |   % 27
-			s1 |   % 28
-			s1 |   % 29
-			s2. e4 |   % 30
+			s1*4 |   % 27-30
 		}
 		{
-			e1 |   % 31
-			s1 |   % 32
-			s1 |   % 33
-			s2.^\markup { \hspace #5.0 \raise #1.0 { D.S. } } \stemUp d'4 \stemNeutral \bar "||"   % 34
+			s1*3 |   % 31-33
+			s2. s4^\markup { \hspace #0.0 \raise #0.6 { D.S. } } \bar "||"   % 34
 		}
 		{
-			e,1 |   % 35
+			s1 |   % 35
 		}
 	}
 
-	s2. a4 \bar "||"   % 36
+	s1 \bar "||"   % 36
+
+	s1*3 \bar "|."   % 37-39
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	s1*7 |   % 1-7
+	s2. e4 |   % 8
+
+	% Verse
+
+	g4 b b b |   % 9
+	a4 ( c b ) a |   % 10
+	g2. a4 |   % 11
+	b4 g e g |   % 12
+	a4 ( fs e ) d |   % 13
+	e2. a4 |   % 14
+	a4 e e fs |   % 15
+	g2 ( fs4 ) e |   % 16
+	d2. g4 |   % 17
+	a4 b b b |   % 18
+	a4 ( c b ) a |   % 19
+	g2. d'4 |   % 20
+
+	% Chorus
+
+	d2. b4 |   % 21
+	b2. b4 |   % 22
+	a4 ( c b ) a |   % 23
+	g2. a4 |   % 24
+	b4 g e g |   % 25
+	a4 ( fs e ) d |   % 26
+
+	e1 |   % 27
+	s1 |   % 28
+	s1 |   % 29
+	s2. e4 |   % 30
+
+	e1 |   % 31
+	s1 |   % 32
+	s1 |   % 33
+	s2. \stemUp d'4 \stemNeutral |   % 34
+
+	e,1 |   % 35
+
+	s2. a4 |   % 36
 
 	b4 g e g |   % 37
 	a4 ( fs e ) d |   % 38
-	e1^\fermata \bar "|."   % 39
+	e1^\fermata |   % 39
 }
 
+
 LeadVoxText = \lyricmode
 {
 	O come, O come, Em -- ma -- _ _ nu -- el,
@@ -136,12 +154,6 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c''
 {
-	\clef G
-	\key e \minor
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
@@ -170,52 +182,15 @@ Riffs = \relative c''
 	<a fs e d>2. s4 |   % 36
 
 	\normalsize
-%{
-	% Intro
-
-	\tiny
-	\repeat "percent" 3   % 1 - 6
-	{
-		<< { \tiny f16 c f, <f' f,> ~ <f f,> f, c' f f8 e } \\ { \tiny f,,2 c'4 } >> |   % 1
-		<< { \tiny f'16 c f, <f' f,> ~ <f f,> f, c' f f8 e } \\ { \tiny bf,2 c4 } >> |   % 2
-	}
-	<< s2. \\ { \tiny d2 c4 } >> |   % 7
-	<< s2. \\ { \tiny bf2. } >> |   % 8
-
-	s2.*7
-
-	\voiceOne
-	\repeat "percent" 6 { f''16 c f, <f' f,> ~ <f f,> f, c' f f8 e | }   % 16-21
-	\oneVoice
-
-	s2.*7
-
-	\voiceOne
-	\repeat "percent" 2 { f16 c f, f' ~ f f, c' f f8 e | }   % 29-30
-	\oneVoice
-
-	\key g \major
-
-	\voiceOne
-	\repeat "percent" 2 { g16 d g, g' ~ g g, d' g g8 fs | }   % 31-32
-	\oneVoice
-
-	s2.*7
-
-	\voiceOne
-	\repeat "percent" 4 { g16 d g, g' ~ g g, d' g g8 fs | }   % 40-43
-	\oneVoice
-	\normalsize
-%}
 }
 
+
 RiffsBass = \relative c
 {
 	\clef F
 	\key e \minor
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -252,12 +227,8 @@ RiffsBass = \relative c
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	s1 |   % 1
@@ -269,50 +240,41 @@ Chords = \chordmode
 	s2.. b8:m11 |   % 7
 	s1 |   % 8
 
-	\repeat volta 3
-	{
-		% Verse
-
-		e1:m7 |   % 9
-		a1:m9 |   % 10
-		e1:m7 |   % 11
-		c1:maj7 |   % 12
-		a2:m7 b:m7 |   % 13
-		e1:m7 |   % 14
-		a1:m9 |   % 15
-		e2:m7 d4/c c |   % 16
-		b1:m7 |   % 17
-		g2:maj7 e:m7 |   % 18
-		a2:m7 c:maj7/d |   % 19
-		g2:sus2 g |   % 20
-
-		% Chorus
-
-		d2. e4:m7 |   % 21
-		b1:m7 |   % 22
-		a2:m7 b:7.9-.13- |   % 23
-		e2.:m7 d4 |   % 24
-		c2:maj7 a:m7 |   % 25
-		fs:m7.5- b:m7 |   % 26
-	}
-	\alternative
-	{
-		{
-			s1 |   % 27
-			s1 |   % 28
-			s2.. b8:m11 |   % 29
-			s1 |   % 30
-		}
-		{
-			s1 |   % 31
-			s1 |   % 32
-			s2.. b8:m11 |   % 33
-			s1 |   % 34
-		}
-		{
-			s2.. b8:m11 |   % 35
-		}
-	}
+	% Verse
+
+	e1:m7 |   % 9
+	a1:m9 |   % 10
+	e1:m7 |   % 11
+	c1:maj7 |   % 12
+	a2:m7 b:m7 |   % 13
+	e1:m7 |   % 14
+	a1:m9 |   % 15
+	e2:m7 d4/c c |   % 16
+	b1:m7 |   % 17
+	g2:maj7 e:m7 |   % 18
+	a2:m7 c:maj7/d |   % 19
+	g2:sus2 g |   % 20
+
+	% Chorus
+
+	d2. e4:m7 |   % 21
+	b1:m7 |   % 22
+	a2:m7 b:7.9-.13- |   % 23
+	e2.:m7 d4 |   % 24
+	c2:maj7 a:m7 |   % 25
+	fs:m7.5- b:m7 |   % 26
+
+	s1 |   % 27
+	s1 |   % 28
+	s2.. b8:m11 |   % 29
+	s1 |   % 30
+
+	s1 |   % 31
+	s1 |   % 32
+	s2.. b8:m11 |   % 33
+	s1 |   % 34
+
+	s2.. b8:m11 |   % 35
 
 	s1 |   % 36
 
@@ -325,17 +287,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.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -348,56 +304,47 @@ StaffC = \relative c
 	r2.. c8 ~ |   % 7
 	c1 |   % 8
 
-	\repeat volta 3
-	{
-		% Verse
+	% Verse
 
-		c4 c c c |   % 9
-		c4 c c c |   % 10
-		c4 c c c |   % 11
-		c4 c c c |   % 12
-		c4 c c c |   % 13
-		c4 c c c |   % 14
-		c4 c c c |   % 15
-		c4 c c c |   % 16
-		c4 c c c |   % 17
-		c4 c c c |   % 18
-		c4 c c c |   % 19
-		c4 c c c \bar "||"   % 20
+	c4 c c c |   % 9
+	c4 c c c |   % 10
+	c4 c c c |   % 11
+	c4 c c c |   % 12
+	c4 c c c |   % 13
+	c4 c c c |   % 14
+	c4 c c c |   % 15
+	c4 c c c |   % 16
+	c4 c c c |   % 17
+	c4 c c c |   % 18
+	c4 c c c |   % 19
+	c4 c c c |   % 20
 
-		% Chorus
+	% Chorus
 
-		c4 c c c |   % 21
-		c4 c c c |   % 22
-		c4 c c c |   % 23
-		c4 c c c |   % 24
-		c4 c c c |   % 25
-		c4 c c c |   % 26
-	}
-	\alternative
-	{
-		{
-			r1 |   % 27
-			r1 |   % 28
-			r2.. c8 ~ |   % 29
-			c1 |   % 30
-		}
-		{
-			r1 |   % 31
-			r1 |   % 32
-			r2.. c8 ~ |   % 33
-			c8 c c c c c c c |   % 34
-		}
-		{
-			r2.. c8 ~ |   % 35
-		}
-	}
+	c4 c c c |   % 21
+	c4 c c c |   % 22
+	c4 c c c |   % 23
+	c4 c c c |   % 24
+	c4 c c c |   % 25
+	c4 c c c |   % 26
 
-	c1 \bar "||"   % 36
+	r1 |   % 27
+	r1 |   % 28
+	r2.. c8 ~ |   % 29
+	c1 |   % 30
+
+	r1 |   % 31
+	r1 |   % 32
+	r2.. c8 ~ |   % 33
+	c8 c c c c c c c |   % 34
+
+	r2.. c8 ~ |   % 35
+
+	c1 |   % 36
 
 	c2 c |   % 37
 	c2 c |   % 38
-	c1^\fermata \bar "|."   % 39
+	c1^\fermata |   % 39
 }
 
 
@@ -436,8 +383,12 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-			\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
 		>>
@@ -446,10 +397,10 @@ Dynamics =
 			\new Staff = leadStaffBass { \new Voice = "leadbass" \RiffsBass }
 		>>
 
-		\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
@@ -459,50 +410,26 @@ Dynamics =
 	\layout
 	{
 		\context { \Staff \RemoveEmptyStaves }
-		ragged-last-bottom = ##t
-		ragged-last = ##t
 	}
 }
 
 
-% Alternate score (for dorks)
-%{
-	<<
-		\new ChoirStaff = "Rhythm"
-		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
-		>>
-
-		<<
-			\new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> }
-			\new Lyrics \lyricsto "lead" \LeadVoxText
-			\new Lyrics \lyricsto "lead" \LeadVoxTextB
-		>>
-
-		<<
-			\new Staff = leadStaffBass { \new Voice = "leadbass" \RiffsBass }
-		>>
-
-		\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
 }
+