X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=what-child-is-this.ly;h=9e8dd471031d11b4cfaebdd3e31567dad74649db;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=10e7cb762a1923e1779d1265697d3f62ebc16e30;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/what-child-is-this.ly b/what-child-is-this.ly
index 10e7cb7..9e8dd47 100644
--- a/what-child-is-this.ly
+++ b/what-child-is-this.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 = #24
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,8 +12,6 @@ staffSize = #24
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "What Child Is This, Who, Laid to Rest?" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Shamus Hammons" }
@@ -22,30 +20,19 @@ staffSize = #24
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c''
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Lead vox"
 	\clef G
 	\key a \minor
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
 	\partial 4*1 s4 |   % 0
-	s2. |   % 1
-	s2. |   % 2
-	s2. |   % 3
-	s2. |   % 4
-	s2. |   % 5
-	s2. |   % 6
-	s2. |   % 7
-	s2 a4 \bar "||:"   % 8
+	s2.*8 \bar ".|:-||"   % 1-8
 
 \break % bah
 
@@ -53,66 +40,93 @@ LeadVox = \relative c''
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		c2 d4 |   % 9
-		e4. ( fs8 ) e4 |   % 10
-		d2 b4 |   % 11
-		g4. ( a8 ) b4 |   % 12
-		c2 a4 |   % 13
-		a4. ( gs8 ) a4 |   % 14
-		b2  ( gs4 ) |   % 15
-		e2 b'4 |   % 16
-
-		c2 d4 |   % 17
-		e4. ( fs8 ) e4 |   % 18
-		d2 b4 |   % 19
-		g4. ( a8 ) b4 |   % 20
-		c4. ( b8 ) a4 |   % 21
-		gs4. ( fs8 ) gs4 |   % 22
-		a2. |   % 23
-		a2. \bar "||"   % 24
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s2.*16 \bar "||"   % 9-24
 
 		% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		g'2. |   % 25
-		g4. ( fs8 ) e4 |   % 26
-		d2 b4 |   % 27
-		g4. ( a8 ) b4 |   % 28
-		c2 a4 |   % 29
-		a4. ( gs8 ) a4 |   % 30
-		b2 gs4 |   % 31
-		e2. |   % 32
-
-		g'2. |   % 33
-		g4. ( fs8 ) e4 |   % 34
-		d2 b4 |   % 35
-		g4. ( a8 ) b4 |   % 36
-		c4. ( b8 ) a4 |   % 37
-		gs4. ( fs8 ) gs4 |   % 38
-		a2. |   % 39
-		a2 s4 \bar "||"   % 40
-
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s2.*16 \bar "||"   % 25-40
 		s2. |   % 41
 	}
 	\alternative
 	{
 		{
-			s2. |   % 42
-			s2. |   % 43
-			s2 a4 |   % 44
+			s2.*3 |   % 42-44
 		}
 		{
 			s2. |   % 45
 		}
 	}
 
+	s2.*2 \bar "|."   % 46-47
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	% Intro
+
+	s4 |   % 0
+	s2.*7 |   % 1-7
+	s2 a4 |   % 8
+
+	% Verse
+
+	c2 d4 |   % 9
+	e4. ( fs8 ) e4 |   % 10
+	d2 b4 |   % 11
+	g4. ( a8 ) b4 |   % 12
+	c2 a4 |   % 13
+	a4. ( gs8 ) a4 |   % 14
+	b2  ( gs4 ) |   % 15
+	e2 b'4 |   % 16
+
+	c2 d4 |   % 17
+	e4. ( fs8 ) e4 |   % 18
+	d2 b4 |   % 19
+	g4. ( a8 ) b4 |   % 20
+	c4. ( b8 ) a4 |   % 21
+	gs4. ( fs8 ) gs4 |   % 22
+	a2. |   % 23
+	a2. \bar "||"   % 24
+
+	% Chorus
+
+	g'2. |   % 25
+	g4. ( fs8 ) e4 |   % 26
+	d2 b4 |   % 27
+	g4. ( a8 ) b4 |   % 28
+	c2 a4 |   % 29
+	a4. ( gs8 ) a4 |   % 30
+	b2 gs4 |   % 31
+	e2. |   % 32
+
+	g'2. |   % 33
+	g4. ( fs8 ) e4 |   % 34
+	d2 b4 |   % 35
+	g4. ( a8 ) b4 |   % 36
+	c4. ( b8 ) a4 |   % 37
+	gs4. ( fs8 ) gs4 |   % 38
+	a2. |   % 39
+	a2 s4 |   % 40
+
+	s2. |   % 41
+
+	s2. |   % 42
+	s2. |   % 43
+	s2 a4 |   % 44
+
+	s2. |   % 45
+
 	s2. |   % 46
-	s2. \bar "|."   % 47
+	s2. |   % 47
 }
 
+
 LeadVoxText = \lyricmode
 {
 	What child is this, _ who, laid to rest, _
@@ -154,16 +168,10 @@ LeadVoxTextC = \lyricmode
 
 Riffs = \relative c''
 {
-	\clef G
-	\key a \minor
-	\override Staff.TimeSignature #'style = #'()
-	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
-	\partial 4*1 a4 |   % 0
+	a4 |   % 0
 	<< { \tiny c2 d4 } \\ { \tiny a,2 b4  } >> |   % 1
 	<< { e'4. fs8 e4 } \\ { c,2. } >> |   % 2
 	<< { d'2 b4 } \\ { g,2. } >> |   % 3
@@ -185,7 +193,7 @@ Riffs = \relative c''
 	<< { \tiny gs'4. fs8 gs4 } \\ { \tiny e,2. } >> |   % 45
 
 	<< { a'2. } \\ { a,2. } >> |   % 46
-	<< { <a' cs>2.-\fermata } \\ { a,2. } >> \bar "|."   % 47
+	<< { <a' cs>2.-\fermata } \\ { a,2. } >> |   % 47
 	\normalsize
 }
 
@@ -193,15 +201,11 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
-	\partial 4*1 s4 |   % 0
+	s4 |   % 0
 	a2.:m |   % 1
 	c2. |   % 2
 	g2. |   % 3
@@ -211,61 +215,53 @@ Chords = \chordmode
 	a2.:m |   % 7
 	s2. |   % 8
 
-	\repeat volta 3
-	{
-		% Verse
-
-		a2.:m |   % 9
-		c2. |   % 10
-		g2. |   % 11
-		g2./b |   % 12
-		a2.:m |   % 13
-		f2. |   % 14
-		e2. |   % 15
-		s2. |   % 16
-
-		a2.:m |   % 17
-		c2. |   % 18
-		g2. |   % 19
-		g2./b |   % 20
-		a2.:m |   % 21
-		e2. |   % 22
-		a2.:m |   % 23
-		s2. |   % 24
-
-		% Chorus
-
-		c2. |   % 25
-		c2. |   % 26
-		g2. |   % 27
-		g2./b |   % 28
-		a2.:m |   % 29
-		f2. |   % 30
-		e2. |   % 31
-		s2. |   % 32
-
-		c2. |   % 33
-		c2. |   % 34
-		g2. |   % 35
-		g2./b |   % 36
-		a2.:m |   % 37
-		e2. |   % 38
-		a2.:m |   % 39
-		s2. |   % 40
-
-		a2.:m |   % 41
-	}
-	\alternative
-	{
-		{
-			e2. |   % 42
-			a2.:m |   % 43
-			s2. |   % 44
-		}
-		{
-			e2. |   % 45
-		}
-	}
+	% Verse
+
+	a2.:m |   % 9
+	c2. |   % 10
+	g2. |   % 11
+	g2./b |   % 12
+	a2.:m |   % 13
+	f2. |   % 14
+	e2. |   % 15
+	s2. |   % 16
+
+	a2.:m |   % 17
+	c2. |   % 18
+	g2. |   % 19
+	g2./b |   % 20
+	a2.:m |   % 21
+	e2. |   % 22
+	a2.:m |   % 23
+	s2. |   % 24
+
+	% Chorus
+
+	c2. |   % 25
+	c2. |   % 26
+	g2. |   % 27
+	g2./b |   % 28
+	a2.:m |   % 29
+	f2. |   % 30
+	e2. |   % 31
+	s2. |   % 32
+
+	c2. |   % 33
+	c2. |   % 34
+	g2. |   % 35
+	g2./b |   % 36
+	a2.:m |   % 37
+	e2. |   % 38
+	a2.:m |   % 39
+	s2. |   % 40
+
+	a2.:m |   % 41
+
+	e2. |   % 42
+	a2.:m |   % 43
+	s2. |   % 44
+
+	e2. |   % 45
 
 	a2.:m |   % 46
 	a2. |   % 47
@@ -275,21 +271,15 @@ 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 s4 |   % 0
+	s4 |   % 0
 	c4 c c |   % 1
 	c4 c c |   % 2
 	c4 c c |   % 3
@@ -297,66 +287,58 @@ StaffC = \relative c
 	c4 c c |   % 5
 	c4 c c |   % 6
 	c4 c c |   % 7
-	c4 c c \bar "||:"   % 8
-
-	\repeat volta 3
-	{
-		% Verse
-
-		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
-		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
-		c4 c c \bar "||"   % 40
-
-		c4 c c |   % 41
-	}
-	\alternative
-	{
-		{
-			c4 c c |   % 42
-			c4 c c |   % 43
-			c4 c c |   % 44
-		}
-		{
-			c4 c c |   % 45
-		}
-	}
+	c4 c c |   % 8
+
+	% Verse
+
+	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
+	c4 c c |   % 40
+
+	c4 c c |   % 41
+
+	c4 c c |   % 42
+	c4 c c |   % 43
+	c4 c c |   % 44
+
+	c4 c c |   % 45
 
 	c4 c c |   % 46
-	c2.-\fermata \bar "|."   % 47
+	c2.-\fermata |   % 47
 }
 
 
@@ -390,18 +372,21 @@ 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" \transpose a e \LeadVox \new Voice = "riffs" \transpose a e \Riffs >> }
+			\new Voice = "lead" \transpose a e \LeadVox
+			\new Voice = "riffs" \transpose a e \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 			\new Lyrics \lyricsto "lead" \LeadVoxTextC
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \transpose a e \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \transpose a e \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
@@ -412,11 +397,11 @@ Dynamics =
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
+	#(define fonts (make-pango-font-tree
+		"Times New Roman"
+		"LilyJAZZText"
+		"Luxi Mono"
+		(/ staffSize 20)))
 
 % Spread staves vertically across last page (default: t)
 	ragged-last-bottom = ##f
@@ -427,6 +412,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)
 }
+