X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=template.ly;h=8d2d324c799639a7a759abf7edc70d8a642d2d2f;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=a3786b0991c3c049cb8d25cfd354b4e59dc6cdb1;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/template.ly b/template.ly
index a3786b0..8d2d324 100644
--- a/template.ly
+++ b/template.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 = #16
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,73 +12,105 @@ staffSize = #16
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
-	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "O For A Thousand Tongues" }
+	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "A Template" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
-	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
+	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Some One" }
 	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.instrument = #"Lead vox"
 	\clef G
 	\key f \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	s2. |   % 1
-	s2. |   % 2
-	s2. |   % 3
-	s2. |   % 4
-	s2. |   % 5
-	s2. |   % 6
-	s2. |   % 7
-	r2 c4 \bar "||:"   % 8
+	s2.*8 \bar ".|:-||"   % 1-8
 
 	\repeat volta 2
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		f8 f g4 g |   % 9
-		a8 g f4 g |   % 10
-		a8 a bf4 a |   % 11
-		g4. r8 c4 |   % 12
-		c8 a a4 f |   % 13
-		f8 d d4 f8 ( d ) |   % 14
-		c8 f f4 g |   % 15
-
-		\voiceTwo f2. |   % 16
-		s2. |   % 17
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s2.*9 |   % 9-17
 	}
 	\alternative
 	{
 		{
-			s2. |   % 18
-			r2 c4 |   % 19
+			s2.*2 |   % 18-19
 		}
 		{
 			s2. |   % 20
 		}
 	}
 
-	r2 c4 \oneVoice \bar "||"   % 21
+	s2. \bar "||"   % 21
 
 	% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
+	\mark \markup { \override #'(font-family . sans) { \box { B } } }
+	s2.*7 \bar "||"   % 22-28
+	s2.*2 |   % 29-30
+
+	\key g \major
+
+	s2.*2 \oneVoice \bar "||"   % 31-32
+
+	% Verse
+
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	s2.*7 \bar "||"   % 22-28
+
+	% Ending
+
+	s2.^\markup { \hspace #0.0 \raise #3.0 \italic { Play figure throughout D } } |   % 40
+	s2.*3 |   % 41-43
+
+	\repeat volta 2
+	{
+		\mark \markup { \override #'(font-family . sans) { \box { D } } }
+		s2.*8 |   % 44-51
+	}
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	s2.*7 |   % 1-7
+	r2 c4 |   % 8
+
+	% Verse
+
+	f8 f g4 g |   % 9
+	a8 g f4 g |   % 10
+	a8 a bf4 a |   % 11
+	g4. r8 c4 |   % 12
+	c8 a a4 f |   % 13
+	f8 d d4 f8 ( d ) |   % 14
+	c8 f f4 g |   % 15
+
+	\voiceTwo f2. |   % 16
+	s2. |   % 17
+
+	s2. |   % 18
+	r2 c4 |   % 19
+
+	s2. |   % 20
+
+	r2 c4 \oneVoice |   % 21
+
+	% Verse
 
 	f8 f g4 g |   % 22
 	a8 g f4 g |   % 23
@@ -86,50 +118,42 @@ LeadVox = \relative c'
 	g4. r8 c4 |   % 25
 	c8 a a4 f |   % 26
 	f8 d d4 f8 ( d ) |   % 27
-	c8 f f4 g \bar "||"   % 28
+	c8 f f4 g |   % 28
 
 	\voiceTwo f2. |   % 29
 	s2. |   % 30
 
-	\key g \major
-
 	s2. |   % 31
-	r2 d4 \oneVoice \bar "||"   % 32
+	r2 d4 |   % 32
 
 	% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
-
 	g8 g a4 a |   % 22
 	b8 a g4 a |   % 23
 	b8 b c4 b |   % 24
 	a4. r8 d4 |   % 25
 	d8 b b4 g |   % 26
 	g8 e e4 g8 ( e ) |   % 27
-	d8 g g4 a \bar "||"   % 28
+	d8 g g4 a |   % 28
 
 	% Ending
 
-	\voiceTwo g2.^\markup { \hspace #0.0 \raise #3.0 \italic { Play figure throughout D } } |   % 40
+	\voiceTwo g2. |   % 40
 	s2. |   % 41
 	s2. |   % 42
 	r2 d4 \oneVoice |   % 43
 
-	\repeat volta 2
-	{
-\mark \markup { \override #'(font-family . sans) { \box { D } } }
-
-		g8 g16 a ( ~ a4. g8 ) |   % 44
-		g2 r4 |   % 45
-		r4 a4. g8 |   % 46
-		g2 d4 |   % 47
-		g8 g16 a ( ~ a4. g8 ) |   % 48
-		g2 r4 |   % 49
-		r4 a4. b8 |   % 50
-		g2^\fermata d4 |   % 51
-	}
+	g8 g16 a ( ~ a4. g8 ) |   % 44
+	g2 r4 |   % 45
+	r4 a4. g8 |   % 46
+	g2 d4 |   % 47
+	g8 g16 a ( ~ a4. g8 ) |   % 48
+	g2 r4 |   % 49
+	r4 a4. b8 |   % 50
+	g2^\fermata d4 |   % 51
 }
 
+
 LeadVoxText = \lyricmode
 {
 	O for a thou -- sand tongues to sing
@@ -165,12 +189,6 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c''
 {
-	\clef G
-	\key f \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
@@ -212,12 +230,8 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	f2. |   % 1
@@ -229,31 +243,23 @@ Chords = \chordmode
 	d2.:m9 |   % 7
 	bf2. |   % 8
 
-	\repeat volta 2
-	{
-		% Verse
+	% Verse
 
-		f4 c2/e |   % 9
-		d8:m c bf2 |   % 10
-		f4/c bf/c f/c |   % 11
-		c2 c4/e |   % 12
-		f2 f4/a |   % 13
-		bf2 g4:m7 |   % 14
-		f4/c bf/c c |   % 15
+	f4 c2/e |   % 9
+	d8:m c bf2 |   % 10
+	f4/c bf/c f/c |   % 11
+	c2 c4/e |   % 12
+	f2 f4/a |   % 13
+	bf2 g4:m7 |   % 14
+	f4/c bf/c c |   % 15
 
-		f2. |   % 16
-		bf2. |   % 17
-	}
-	\alternative
-	{
-		{
-			f2. |   % 18
-			bf2. |   % 19
-		}
-		{
-			d2.:m9 |   % 20
-		}
-	}
+	f2. |   % 16
+	bf2. |   % 17
+
+	f2. |   % 18
+	bf2. |   % 19
+
+	d2.:m9 |   % 20
 
 	bf2. |   % 21
 
@@ -290,27 +296,22 @@ Chords = \chordmode
 	e2.:m9 |   % 42
 	c2. |   % 43
 
-	\repeat volta 2
-	{
-		g2. |   % 44
-		c2. |   % 45
-		g2. |   % 46
-		c2. |   % 47
-		g2. |   % 48
-		c2. |   % 49
-		e2.:m9 |   % 50
-		c2. |   % 51
-	}
+	g2. |   % 44
+	c2. |   % 45
+	g2. |   % 46
+	c2. |   % 47
+	g2. |   % 48
+	c2. |   % 49
+	e2.:m9 |   % 50
+	c2. |   % 51
 }
 
+
 %
 % Alternate chord changes (2nd verse)
 %
 ChordsSup = \chordmode
 {
-%Bah, can't we set this globally?
-	\popChords
-
 	% Intro
 
 	s2.*8 |   % 1-8
@@ -323,20 +324,15 @@ ChordsSup = \chordmode
 	c2:sus4 c4 |   % 12
 }
 
+
 %
 % 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 3/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -347,35 +343,27 @@ StaffC = \relative c
 	c4 c c |   % 5
 	c4 c c |   % 6
 	c4 c c |   % 7
-	c4 c c \bar "||:"   % 8
+	c4 c c |   % 8
 
-	\repeat volta 2
-	{
-		% Verse
+	% Verse
 
-		c4 c2 |   % 9
-		c8 c c4 c |   % 10
-		c4 c c |   % 11
-		c4 c c-> |   % 12
-		c4 c c |   % 13
-		c4 c c |   % 14
-		c4 c c |   % 15
+	c4 c2 |   % 9
+	c8 c c4 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
-	}
-	\alternative
-	{
-		{
-			c4 c c |   % 18
-			c4 c c |   % 19
-		}
-		{
-			c4 c c |   % 20
-		}
-	}
+	c4 c c |   % 16
+	c4 c c |   % 17
+
+	c4 c c |   % 18
+	c4 c c |   % 19
+
+	c4 c c |   % 20
 
-	c4 c c \bar "||"   % 21
+	c4 c c |   % 21
 
 	% Verse
 
@@ -385,13 +373,13 @@ StaffC = \relative c
 	c2 c4-> |   % 25
 	c4-> c-> c |   % 26
 	c4 c c |   % 27
-	c4 c c \bar "||"   % 28
+	c4 c c |   % 28
 
 	c4 c c |   % 29
 	c4 c c |   % 30
 
 	c4 c c |   % 31
-	c4 c c \bar "||"   % 32
+	c4 c c |   % 32
 
 	% Verse
 
@@ -401,7 +389,7 @@ StaffC = \relative c
 	c4 c c |   % 36
 	c4 c c |   % 37
 	c4 c c |   % 38
-	c4 c c \bar "||"   % 39
+	c4 c c |   % 39
 
 	% Ending
 
@@ -410,17 +398,14 @@ StaffC = \relative c
 	c4 c c |   % 42
 	c4 c c |   % 43
 
-	\repeat volta 2
-	{
-		c4 c c |   % 44
-		c4 c c |   % 45
-		c4 c c |   % 46
-		c4 c c |   % 47
-		c4 c c |   % 48
-		c4 c c |   % 49
-		c4 c c |   % 50
-		c4^\fermata c c |   % 51
-	}
+	c4 c c |   % 44
+	c4 c c |   % 45
+	c4 c c |   % 46
+	c4 c c |   % 47
+	c4 c c |   % 48
+	c4 c c |   % 49
+	c4 c c |   % 50
+	c4^\fermata c c |   % 51
 }
 
 
@@ -440,40 +425,45 @@ 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 ChordNames = "chords2" \ChordsSup
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new ChordNames \ChordsSup
+			\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
 }
+