X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=the-first-noel.ly;h=68d222610b0214d29832b4f44649ba00df90be71;hb=HEAD;hp=cd7ae19ebd0b97be2c4c4e9847664cec3d10ce18;hpb=cdf57606f385bc4493fed4e3860bce0ce657dc40;p=music

diff --git a/the-first-noel.ly b/the-first-noel.ly
index cd7ae19..68d2226 100644
--- a/the-first-noel.ly
+++ b/the-first-noel.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 = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -10,105 +10,123 @@ staffSize = #18
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "The First Noel" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "English Carol" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
-	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 d \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
 	\partial 4*1 s4 \bar "||"   % 0
-	s2. |   % 1
-	s2. |   % 2
-	s2. |   % 3
-	s2. |   % 4
+	s2.*4 |   % 1-4
 
 	\repeat volta 3
 	{
-		s2. |   % 5
-		s2. |   % 6
-		s2. |   % 7
-\break % Bleah
-		s2 fs8 e \bar "||"   % 8
+		s2.*4 \bar "||"   % 5-8
 
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		d4. ( e8 ) fs ( g ) |   % 9
-		a2 b8 ( cs ) |   % 10
-		d4 cs b |   % 11
-		a2 b8 cs |   % 12
-		d4 ( cs ) b |   % 13
-		a4 ( b ) cs |   % 14
-		d4 ( a ) g |   % 15
-		fs2 fs8 ( e ) |   % 16
-
-\mark \markup { \override #'(font-family . sans) { \box { A9 } } }
-
-		d4. ( e8 ) fs ( g ) |   % 17
-		a2 b8 ( cs ) |   % 18
-		d4 ( cs ) b |   % 19
-		a2 b8 ( cs ) |   % 20
-		d4 cs b |   % 21
-		a4 ( b ) cs |   % 22
-		d4 ( a ) g |   % 23
-		fs2 fs8 ( e ) \bar "||"   % 24
-\break % bah, only valid for size 18
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s2.*8 |   % 9-16
+
+		\mark \markup { \override #'(font-family . sans) { \box { A9 } } }
+		s2.*8 \bar "||"   % 17-24
+%\break % bah, only valid for size 18
 
 		% Chorus
 
-%\mark \markup { \override #'(font-family . sans) { \box { B } } }
-\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" }
 
-		d4. ( e8 ) fs ( g ) |   % 25
-		a2 d8 ( cs ) |   % 26
-		b2 b4 |   % 27
-		a2. |   % 28
-		d4 cs b |   % 29
-		a4 ( b ) cs |   % 30
+		s2.*6 |   % 25-30
 	}
 	\alternative
 	{
 		{
-			d4 ( a ) g |   % 31
-			d2. |   % 32
+			s2.*2 |   % 31-32
 		}
 		{
-			d'4 ( a ) g |   % 33
-			fs2^\markup { \hspace #3.0 \raise #1.0 { D.S. } } fs8 ( e ) \bar "||"   % 34
+			s2. |   % 33
+			s2^\markup { \hspace #3.0 \raise #1.0 { D.S. } } s4 \bar "||"   % 34
 		}
 		{
-			d'4 ( a ) g |   % 35
-			d2. |   % 36
+			s2.*2 |   % 35-36
 		}
 	}
 
-	s2. |   % 37
-	s2. |   % 38
-	s2. |   % 39
-	s2. \bar "|."   % 40
+	s2.*4 \bar "|."   % 37-40
 }
 
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	s4 |   % 0
+	s2.*4 |   % 1-4
+
+	s2. |   % 5
+	s2. |   % 6
+	s2. |   % 7
+	s2 fs8 e |   % 8
+
+	% Verse
+
+	d4. ( e8 ) fs ( g ) |   % 9
+	a2 b8 ( cs ) |   % 10
+	d4 cs b |   % 11
+	a2 b8 cs |   % 12
+	d4 ( cs ) b |   % 13
+	a4 ( b ) cs |   % 14
+	d4 ( a ) g |   % 15
+	fs2 fs8 ( e ) |   % 16
+
+	d4. ( e8 ) fs ( g ) |   % 17
+	a2 b8 ( cs ) |   % 18
+	d4 ( cs ) b |   % 19
+	a2 b8 ( cs ) |   % 20
+	d4 cs b |   % 21
+	a4 ( b ) cs |   % 22
+	d4 ( a ) g |   % 23
+	fs2 fs8 ( e ) |   % 24
+
+	% Chorus
+
+	d4. ( e8 ) fs ( g ) |   % 25
+	a2 d8 ( cs ) |   % 26
+	b2 b4 |   % 27
+	a2. |   % 28
+	d4 cs b |   % 29
+	a4 ( b ) cs |   % 30
+
+	d4 ( a ) g |   % 31
+	d2. |   % 32
+
+	d'4 ( a ) g |   % 33
+	fs2 fs8 ( e ) |   % 34
+
+	d'4 ( a ) g |   % 35
+	d2. |   % 36
+
+	s2.*4 \bar "|."   % 37-40
+}
+
+
 LeadVoxText = \lyricmode
 {
 	The _ first _ no -- _ el the _ an -- gel did say
@@ -136,16 +154,10 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c'
 {
-	\clef G
-	\key d \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
-	\partial 4*1 fs8 e |   % 0
+	fs8 e |   % 0
 	d4. e8 fs g |   % 1
 	a2 d8 cs |   % 2
 	b2 b4 |   % 3
@@ -156,12 +168,12 @@ Riffs = \relative c'
 	d4 a g |   % 7
 	fs2 s4 |   % 8
 
-	s2.*28
+	s2.*28 |   % 9-36
 
-	d'4 cs b |   % 
-	a4 b cs |   % 
-	d4 a g |   % 
-	fs2.^\fermata |   % 
+	d'4 cs b |   % 37
+	a4 b cs |   % 38
+	d4 a g |   % 39
+	fs2.^\fermata |   % 40
 	\normalsize
 }
 
@@ -169,71 +181,58 @@ Riffs = \relative c'
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
-	\partial 4*1 d4/a |   % 0
+	d4/a |   % 0
 	d2.:9^7 |   % 1
 	a2.:9^7 |   % 2
 	g2.:9^7 |   % 3
 	d2 a4:9^7/cs |   % 4
 
-	\repeat volta 3
-	{
-		% Verse
-
-		g4:6/b a:11^9.7 g |   % 5
-		d4:sus2 g fs:m |   % 6
-		e2:m7 a4:sus4.7 |   % 7
-		d2 d4/a |   % 8
-
-		d2.:9^7 |   % 9
-		fs2.:m7 |   % 10
-		g2.:maj7 |   % 11
-		d2.:9^7/fs |   % 12
-		g2.:maj9 |   % 13
-		d2./fs |   % 14
-		e2.:m7 |   % 15
-		a4:13 b:m a/cs |   % 16
-
-		d2.:9^7 |   % 17
-		a2.:sus2/cs |   % 18
-		g2./b |   % 19
-		d2./a |   % 20
-		g2.:maj9 |   % 21
-		d2.:9^7/fs |   % 22
-		e2:m7 a4:sus4.7 |   % 23
-		d4 a:13 a:7 |   % 24
-
-		% Chorus
-
-		d2.:9^7 |   % 25
-		a2:9^7 d4:9^7/fs |   % 26
-		g2. |   % 27
-		d2 a4:sus2/cs |   % 28
-		g4:6/b a:11^9.7 g |   % 29
-		d4:sus2/fs g fs:m |   % 30
-	}
-	\alternative
-	{
-		{
-			e2:m7 a4:sus4.7 |   % 31
-			d2 d4/cs |   % 32
-		}
-		{
-			e2:m7 a4:sus4.7 |   % 33
-			d2 d4/a |   % 34
-		}
-		{
-			e2:m7 a4:sus4.7 |   % 35
-			d2 d4/cs |   % 36
-		}
-	}
+	% Verse
+
+	g4:6/b a:11^9.7 g |   % 5
+	d4:sus2 g fs:m |   % 6
+	e2:m7 a4:sus4.7 |   % 7
+	d2 d4/a |   % 8
+
+	d2.:9^7 |   % 9
+	fs2.:m7 |   % 10
+	g2.:maj7 |   % 11
+	d2.:9^7/fs |   % 12
+	g2.:maj9 |   % 13
+	d2./fs |   % 14
+	e2.:m7 |   % 15
+	a4:13 b:m a/cs |   % 16
+
+	d2.:9^7 |   % 17
+	a2.:sus2/cs |   % 18
+	g2./b |   % 19
+	d2./a |   % 20
+	g2.:maj9 |   % 21
+	d2.:9^7/fs |   % 22
+	e2:m7 a4:sus4.7 |   % 23
+	d4 a:13 a:7 |   % 24
+
+	% Chorus
+
+	d2.:9^7 |   % 25
+	a2:9^7 d4:9^7/fs |   % 26
+	g2. |   % 27
+	d2 a4:sus2/cs |   % 28
+	g4:6/b a:11^9.7 g |   % 29
+	d4:sus2/fs g fs:m |   % 30
+
+	e2:m7 a4:sus4.7 |   % 31
+	d2 d4/cs |   % 32
+
+	e2:m7 a4:sus4.7 |   % 33
+	d2 d4/a |   % 34
+
+	e2:m7 a4:sus4.7 |   % 35
+	d2 d4/cs |   % 36
 
 	g4:6/b a:11^9.7 g |   % 37
 	d4:sus2/fs g fs:m |   % 38
@@ -245,82 +244,67 @@ 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 3/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
-	\partial 4*1 c4 \bar "||"   % 0
+	c4 |   % 0
 	c4 c c |   % 1
 	c4 c c |   % 2
 	c4 c c |   % 3
 	c4 c c |   % 4
 
-	\repeat volta 3
-	{
-		% Verse
-
-		c4 c c |   % 5
-		c4 c c |   % 6
-		c4 c c |   % 7
-		c4 c c \bar "||"   % 8
-
-		c4 c c |   % 9
-		c4 c c |   % 10
-		c4 c c |   % 11
-		c4 c c |   % 12
-		c4 c c |   % 13
-		c4 c c |   % 14
-		c4 c c |   % 15
-		c4 c c |   % 16
-
-		c4 c c |   % 17
-		c4 c c |   % 18
-		c4 c c |   % 19
-		c4 c c |   % 20
-		c4 c c |   % 21
-		c4 c c |   % 22
-		c4 c c |   % 23
-		c4 c c \bar "||"   % 24
-
-		% Chorus
-
-		c4 c c |   % 25
-		c4 c c |   % 26
-		c4 c c |   % 27
-		c4 c c |   % 28
-		c4 c c |   % 29
-		c4 c c |   % 30
-	}
-	\alternative
-	{
-		{
-			c4 c c |   % 31
-			c4 c c |   % 32
-		}
-		{
-			c4 c c |   % 33
-			c4 c c |   % 34
-		}
-		{
-			c4 c c |   % 35
-			c4 c c |   % 36
-		}
-	}
+	% Verse
+
+	c4 c c |   % 5
+	c4 c c |   % 6
+	c4 c c |   % 7
+	c4 c c |   % 8
+
+	c4 c c |   % 9
+	c4 c c |   % 10
+	c4 c c |   % 11
+	c4 c c |   % 12
+	c4 c c |   % 13
+	c4 c c |   % 14
+	c4 c c |   % 15
+	c4 c c |   % 16
+
+	c4 c c |   % 17
+	c4 c c |   % 18
+	c4 c c |   % 19
+	c4 c c |   % 20
+	c4 c c |   % 21
+	c4 c c |   % 22
+	c4 c c |   % 23
+	c4 c c |   % 24
+
+	% Chorus
+
+	c4 c c |   % 25
+	c4 c c |   % 26
+	c4 c c |   % 27
+	c4 c c |   % 28
+	c4 c c |   % 29
+	c4 c c |   % 30
+
+	c4 c c |   % 31
+	c4 c c |   % 32
+
+	c4 c c |   % 33
+	c4 c c |   % 34
+
+	c4 c c |   % 35
+	c4 c c |   % 36
 
 	c4 c c |   % 37
 	c4 c c |   % 38
 	c4 c c |   % 39
-	c2.^\fermata \bar "|."   % 40
+	c2.^\fermata |   % 40
 }
 
 
@@ -345,39 +329,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
 }
+