X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=silent-night.ly;h=88827ddc2d5827579484a4785d45878b87e33f27;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=0fac93b5f73479188244d06ea01d4ffb585ef465;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/silent-night.ly b/silent-night.ly
index 0fac93b..88827dd 100644
--- a/silent-night.ly
+++ b/silent-night.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,78 +10,88 @@ 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 "Silent Night" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Franz Gruber" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
-	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 bf \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	r2. |   % 1
-	r2. |   % 2
-	r2. |   % 3
-	r2. |   % 4
+	s2.*4 |   % 1-4
 
 	\repeat volta 2
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		f4. ( g8 ) f4 |   % 5
-		d2. |   % 6
-		f4. ( g8 ) f4 |   % 7
-		d2. |   % 8
-		c'2 c4 |   % 9
-		a2. |   % 10
-		bf2 bf4 |   % 11
-		f2. \bar "||"   % 12
-
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		g2 g4 |   % 13
-		bf4. ( a8 ) g4 |   % 14
-		f4. g8 f4 |   % 15
-		d2. |   % 16
-		g2 g4 |   % 17
-		bf4. ( a8 ) g4 |   % 18
-		f4. g8 f4 |   % 19
-		d2. \bar "||"   % 20
-
-		c'2 c4 |   % 21
-		ef4. c8 a4 |   % 22
-		bf2. ( |   % 23
-		d2. ) |   % 24
-		bf4 ( f ) d |   % 25
-		f4. ef8 c4 |   % 26
-		bf2. ~ |   % 27
-		bf2. |   % 28
-
-		r2. |   % 29
-		r2. |   % 30
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s2.*8 \bar "||"   % 5-12
+
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s2.*8 \bar "||"   % 13-20
+		s2.*10 |   % 21-30
 	}
 
-	r2.^\fermata \bar "|."   % 31
+	s2. \bar "|."   % 31
 }
 
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	r2.*4 |   % 1-4
+
+	% Verse
+
+	f4. ( g8 ) f4 |   % 5
+	d2. |   % 6
+	f4. ( g8 ) f4 |   % 7
+	d2. |   % 8
+	c'2 c4 |   % 9
+	a2. |   % 10
+	bf2 bf4 |   % 11
+	f2. |   % 12
+
+	g2 g4 |   % 13
+	bf4. ( a8 ) g4 |   % 14
+	f4. g8 f4 |   % 15
+	d2. |   % 16
+	g2 g4 |   % 17
+	bf4. ( a8 ) g4 |   % 18
+	f4. g8 f4 |   % 19
+	d2. |   % 20
+
+	c'2 c4 |   % 21
+	ef4. c8 a4 |   % 22
+	bf2. ( |   % 23
+	d2. ) |   % 24
+	bf4 ( f ) d |   % 25
+	f4. ef8 c4 |   % 26
+	bf2. ~ |   % 27
+	bf2. |   % 28
+
+	r2. |   % 29
+	r2. |   % 30
+
+	r2.^\fermata |   % 31
+}
+
+
 LeadVoxText = \lyricmode
 {
 	Si -- _ lent night, ho -- _ ly night,
@@ -118,12 +128,8 @@ LeadVoxTextC = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	bf2.:sus2 |   % 1
@@ -131,37 +137,37 @@ Chords = \chordmode
 	bf2.:sus2 |   % 3
 	ef2.:maj9 |   % 4
 
-	\repeat volta 2
-	{
-		% Verse
-
-		bf2.:sus2 |   % 5
-		ef2.:maj9 |   % 6
-		bf2.:sus2 |   % 7
-		bf2. |   % 8
-		c2.:m11 |   % 9
-		f2.:7 |   % 10
-		bf2. |   % 11
-		f2.:m7/bf |   % 12
-		ef2.:maj7 |   % 13
-		c2.:m11 |   % 14
-		d2.:m7 |   % 15
-		g2.:m11 |   % 16
-		ef2.:maj7 |   % 17
-		c2.:m11 |   % 18
-		d2.:m7 |   % 19
-		g2.:m11 |   % 20
-		af2.:5.9 |   % 21
-		ef2/f f4:7 |   % 22
-		g2.:m7 |   % 23
-		c2.:sus2/e |   % 24
-		bf2./f |   % 25
-		ef2./f |   % 26
-		bf2.:sus2 |   % 27
-		ef2.:maj9 |   % 28
-		bf2.:sus2 |   % 29
-		ef2.:maj9 |   % 30
-	}
+	% Verse
+
+	bf2.:sus2 |   % 5
+	ef2.:maj9 |   % 6
+	bf2.:sus2 |   % 7
+	bf2. |   % 8
+	c2.:m11 |   % 9
+	f2.:7 |   % 10
+	bf2. |   % 11
+	f2.:m7/bf |   % 12
+
+	ef2.:maj7 |   % 13
+	c2.:m11 |   % 14
+	d2.:m7 |   % 15
+	g2.:m11 |   % 16
+	ef2.:maj7 |   % 17
+	c2.:m11 |   % 18
+	d2.:m7 |   % 19
+	g2.:m11 |   % 20
+
+	af2.:3.5.9 |   % 21
+	ef2/f f4:7 |   % 22
+	g2.:m7 |   % 23
+	c2.:sus2/e |   % 24
+	bf2./f |   % 25
+	ef2./f |   % 26
+	bf2.:sus2 |   % 27
+	ef2.:maj9 |   % 28
+
+	bf2.:sus2 |   % 29
+	ef2.:maj9 |   % 30
 
 	bf2.:sus2 |   % 31
 }
@@ -170,17 +176,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 3/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -189,39 +189,39 @@ StaffC = \relative c
 	c4 c c |   % 3
 	c4 c c |   % 4
 
-	\repeat volta 2
-	{
-		% 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
-		c4 c c |   % 25
-		c4 c c |   % 26
-		c4 c c |   % 27
-		c4 c c |   % 28
-		c4 c c |   % 29
-		c4 c c |   % 30
-	}
-
-	c2.^\fermata \bar "|."   % 31
+	% 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
+	c4 c c |   % 25
+	c4 c c |   % 26
+	c4 c c |   % 27
+	c4 c c |   % 28
+
+	c4 c c |   % 29
+	c4 c c |   % 30
+
+	c2.^\fermata |   % 31
 }
 
 
@@ -237,40 +237,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 Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 			\new Lyrics \lyricsto "lead" \LeadVoxTextC
 		>>
 
-		\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
 }
+