X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=o-little-town-of-bethlehem.ly;h=80b7604e029c54e29dd61efe1e58fedcb97515a6;hb=HEAD;hp=55bbd86351a4bfda7b8afeffa13910389dfe618d;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/o-little-town-of-bethlehem.ly b/o-little-town-of-bethlehem.ly
index 55bbd86..80b7604 100644
--- a/o-little-town-of-bethlehem.ly
+++ b/o-little-town-of-bethlehem.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 = #20
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -10,67 +10,79 @@ 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 Little Town Of Bethlehem" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Lewis H. Redner" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" }
-	tagline  = "Engraved by JLH and Lilypond 2.8.8"
+	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 a4 |   % 0
+	\partial 4*1 s4 |   % 0
 
 	\repeat volta 2
 	{
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		a4 a af a |   % 1
-		c4 bf d, g |   % 2
-		f4 e8 ( f ) g4 c, |   % 3
-		a'2. a4 |   % 4
-		a4 a d c |   % 5
-		c4 bf d, g |   % 6
-		f4 e8 ( f ) a4 g |   % 7
-		f2. a4 \bar "||"   % 8
-
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		a4 a g f |   % 9
-		e2 e4 e |   % 10
-		d4 e f g |   % 11
-		a2. a4 |   % 12
-		a4 a af a |   % 13
-		c4 bf d, d' |   % 14
-		c4 f, a4. g8 |   % 15
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1*8 \bar "||"   % 1-8
+
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s1*7 |   % 9-15
 	}
 	\alternative
 	{
 		{
-			f2. a4 |   % 16
+			s1 |   % 16
 		}
 		{
-			f1^\fermata \bar "|."   % 17
+			s1 \bar "|."   % 17
 		}
 	}
 }
 
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	% Intro
+
+	a4 |   % 0
+
+	a4 a af a |   % 1
+	c4 bf d, g |   % 2
+	f4 e8 ( f ) g4 c, |   % 3
+	a'2. a4 |   % 4
+	a4 a d c |   % 5
+	c4 bf d, g |   % 6
+	f4 e8 ( f ) a4 g |   % 7
+	f2. a4 |   % 8
+
+	a4 a g f |   % 9
+	e2 e4 e |   % 10
+	d4 e f g |   % 11
+	a2. a4 |   % 12
+	a4 a af a |   % 13
+	c4 bf d, d' |   % 14
+	c4 f, a4. g8 |   % 15
+
+	f2. a4 |   % 16
+
+	f1^\fermata |   % 17
+}
+
+
 LeadVoxText = \lyricmode
 {
 	O lit -- tle town of Beth -- le -- hem, how still we _ see thee lie!
@@ -93,92 +105,66 @@ LeadVoxTextB = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
-	\partial 4*1 s4 |   % 0
-
-	\repeat volta 2
-	{
-		f2 f4:dim7 f |   % 1
-		bf2:5.9 g:m7 |   % 2
-		f2/c g4:m7/c c:7.9- |   % 3
-		f1:maj7 |   % 4
-		f2/ef d:7 |   % 5
-		g2.:m bf4:m6 |   % 6
-		f2/c g4:m7/c c:7.9- |   % 7
-		f2:sus4 f |   % 8
-
-		f2 g4:dim7 gs:dim7 |   % 9
-		a1 |   % 10
-		d4:m a:7/e f:6 g:m/bf |   % 11
-		a2:sus4 a |   % 12
-		f2 f4:dim7 f |   % 13
-		bf2:5.9 g:7/b |   % 14
-		f2/c g4:m/c c:7.9- |   % 15
-	}
-	\alternative
-	{
-		{
-			f2:sus4 f |   % 16
-		}
-		{
-			f2:sus4 f |   % 17
-		}
-	}
+	s4 |   % 0
+
+	f2 f4:dim7 f |   % 1
+	bf2:3.5.9 g:m7 |   % 2
+	f2/c g4:m7/c c:7.9- |   % 3
+	f1:maj7 |   % 4
+	f2/ef d:7 |   % 5
+	g2.:m bf4:m6 |   % 6
+	f2/c g4:m7/c c:7.9- |   % 7
+	f2:sus4 f |   % 8
+
+	f2 g4:dim7 gs:dim7 |   % 9
+	a1 |   % 10
+	d4:m a:7/e f:6 g:m/bf |   % 11
+	a2:sus4 a |   % 12
+	f2 f4:dim7 f |   % 13
+	bf2:3.5.9 g:7/b |   % 14
+	f2/c g4:m/c c:7.9- |   % 15
+
+	f2:sus4 f |   % 16
+
+	f2:sus4 f |   % 17
 }
 
 
 %
 % 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 s4 |   % 0
+	s4 |   % 0
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 1
-		c4 c c c |   % 2
-		c4 c c c |   % 3
-		c4 c c c |   % 4
-		c4 c c c |   % 5
-		c4 c c c |   % 6
-		c4 c c c |   % 7
-		c4 c c c \bar "||"   % 8
-
-		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
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 16
-		}
-		{
-			c2 c^\fermata \bar "|."   % 17
-		}
-	}
+	c4 c c c |   % 1
+	c4 c c c |   % 2
+	c4 c c c |   % 3
+	c4 c c c |   % 4
+	c4 c c c |   % 5
+	c4 c c c |   % 6
+	c4 c c c |   % 7
+	c4 c c c |   % 8
+
+	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
+
+	c2 c^\fermata |   % 17
 }
 
 
@@ -192,77 +178,49 @@ Dynamics =
 	s4_\markup { \dynamic mf \italic { band in } } s2. |   % 8
 	s1*6
 	s4_\markup { \italic { rit. 2nd X } } s2. |   % 15
-
-%{
-	\override TextScript #'extra-offset = #'( 0.0 . -1.0 )
-
-	\partial 4*1 s4_\f |   % 0
-	s4_\markup { \italic { full band, snare } } s2. |   % 1
-	s1*2
-	s4 s \> s s \! |   % 4
-	s4_\markup { \dynamic mf \italic { piano only } } s2. |   % 5
-	s1*11
-	s4_\markup { \dynamic mp \italic { bass in, cym } } s2. |   % 17
-	s1*2
-	s4 s \< s s_\f |   % 20
-	s1*2
-	s2 s_\markup { \italic { dr. fill } } |   % 23
-	s4_\markup { \italic { dr. groove, s-stick 2&4 } } s2. |   % 24
-	s1*13
-	s4_\markup { \dynamic mp \italic { no backbeat } } s2. |   % 38
-	s1*2
-	s4 s \< s s_\f |   % 41
-	s4_\markup { \italic { backbeat } } s2. |   % 42
-	s1*2
-	s2 s_\markup { \italic { dr. fill } } |   % 45
-	s4_\markup { \italic { Majestic, slower w/snare } } s2. |   % 46
-	s1*11
-	s4_\markup { \dynamic mp \italic { no backbeat } } s2. |   % 58
-	s1*2
-	s4 s \< s_\markup { \hspace #0.0 \raise #-2.0 \italic { dr.fill } } s_\f |   % 61
-	s4_\markup { \italic { backbeat } } s2. |   % 62
-	s1*6
-	s4_\markup { \italic { rit. } } s2. |   % 69
-%}
 }
 
 
 \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 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
 }
+