X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=take-my-life-and-let-it-be-consecrated.ly;h=f1f10498ce0cf8004be040085d6e0ac8fe6f6d28;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=744f5c9bcb5d49da613ac24d00c874fb958e1b49;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/take-my-life-and-let-it-be-consecrated.ly b/take-my-life-and-let-it-be-consecrated.ly
index 744f5c9..f1f1049 100644
--- a/take-my-life-and-let-it-be-consecrated.ly
+++ b/take-my-life-and-let-it-be-consecrated.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)
@@ -10,68 +10,42 @@ 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 "Take My Life And Let It Be Consecrated" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	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 ef \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	s1 |   % 1
-	s1 |   % 2
-	s1 |   % 3
-	s1 |   % 4
+	s1*4 |   % 1-4
 
 	% Verse
 
 	\repeat volta 3
 	{
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1*9 |   % 5-13
 
-		ef4 ef ef8 ( bf ) ef ( g ) |   % 5
-		bf4 af g2 |   % 6
-		g4 g g8 ( f ) af ( f ) |   % 7
-		ef4 d8 ( f ) ef2 |   % 8
-		g4 g f f8 ( g ) |   % 9
-		af4 bf af ( g ) |   % 10
-		bf4 bf c bf |   % 11
-		bf8 ( af ) af ( g ) g4 ( f ) |   % 12
-		ef4 f g af8 ( f ) |   % 13
+		\time 2/4 s2 \time 4/4 |   % 14
 
-		\time 2/4
-
-		ef4 d |   % 14
-
-		\time 4/4
-
-\voiceTwo
-		ef1 |   % 15
-\oneVoice
-		s1 |   % 16
+		s1*2 |   % 15-16
 	}
 	\alternative
 	{
 		{
-			s1 |   % 17
-			s1 |   % 18
+			s1*2 |   % 17-18
 		}
 		{
 			s1 |   % 19
@@ -82,7 +56,41 @@ LeadVox = \relative c'
 
 	\key f \major
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
+	\mark \markup { \override #'(font-family . sans) { \box { B } } }
+	s1*15 \bar "|."   % 21-35
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	s1*4 |   % 1-4
+
+	% Verse
+
+	ef4 ef ef8 ( bf ) ef ( g ) |   % 5
+	bf4 af g2 |   % 6
+	g4 g g8 ( f ) af ( f ) |   % 7
+	ef4 d8 ( f ) ef2 |   % 8
+	g4 g f f8 ( g ) |   % 9
+	af4 bf af ( g ) |   % 10
+	bf4 bf c bf |   % 11
+	bf8 ( af ) af ( g ) g4 ( f ) |   % 12
+	ef4 f g af8 ( f ) |   % 13
+	ef4 d |   % 14
+	\voiceTwo ef1 \oneVoice |   % 15
+	s1 |   % 16
+
+	s1 |   % 17
+	s1 |   % 18
+
+	s1 |   % 19
+
+	s1 |   % 20
 
 	f4 f f8 ( c ) f ( a ) |   % 21
 	c4 bf a2 |   % 22
@@ -98,9 +106,10 @@ LeadVox = \relative c'
 	s1 |   % 32
 	s1 |   % 33
 	s1 |   % 34
-	r1^\fermata \bar "|."   % 35
+	r1^\fermata |   % 35
 }
 
+
 LeadVoxText = \lyricmode
 {
 	Take my life _ and _ let it be
@@ -137,11 +146,6 @@ LeadVoxTextC = \lyricmode
 
 Riffs = \relative c'
 {
-	\clef G
-	\key ef \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-
 	% Intro
 
 	\tiny
@@ -179,7 +183,6 @@ Riffs = \relative c'
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
 	% Intro
@@ -191,37 +194,23 @@ Chords = \chordmode
 
 	% Verse
 
-	\repeat volta 4
-	{
-		ef2 f:m11 |   % 5
-		af2:sus2 ef |   % 6
-		c2:m7 af:sus2 |   % 7
-		ef4/bf bf ef2 |   % 8
-		c2:m7 bf:11^9.7 |   % 9
-		f2:m11 af4/ef ef |   % 10
-		ef2/g af4  ef/g |   % 11
-		f2:m11 ef4/bf bf |   % 12
-		af4/c bf/d ef af:sus2 |   % 13
-
-		\time 2/4
+	ef2 f:m11 |   % 5
+	af2:sus2 ef |   % 6
+	c2:m7 af:sus2 |   % 7
+	ef4/bf bf ef2 |   % 8
+	c2:m7 bf:11^9.7 |   % 9
+	f2:m11 af4/ef ef |   % 10
+	ef2/g af4  ef/g |   % 11
+	f2:m11 ef4/bf bf |   % 12
+	af4/c bf/d ef af:sus2 |   % 13
+	ef4/bf bf |   % 14
+	c1:m11 |   % 15
+	af1:sus2 |   % 16
 
-		ef4/bf bf |   % 14
+	c1:m11 |   % 17
+	af2 bf:sus4.7 |   % 18
 
-		\time 4/4
-
-		c1:m11 |   % 15
-		af1:sus2 |   % 16
-	}
-	\alternative
-	{
-		{
-			c1:m11 |   % 17
-			af2 bf:sus4.7 |   % 18
-		}
-		{
-			c1:m11 |   % 19
-		}
-	}
+	c1:m11 |   % 19
 
 	af2:sus2 g:m11 |   % 20
 
@@ -239,24 +228,18 @@ Chords = \chordmode
 	bf1:sus2 |   % 32
 	f1 |   % 33
 	bf1:sus2 |   % 34
-	f |   % 35
+	f1 |   % 35
 }
 
 
 %
 % 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
 
@@ -267,39 +250,25 @@ StaffC = \relative c
 
 	% Verse
 
-	\repeat volta 3
-	{
-		c4_\markup { \italic { piano 1st X } } 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_\markup { \italic { piano 1st X } } 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 |   % 14
+	c4_\markup { \italic { band in 1st X } } c c c |   % 15
+	c4 c c c |   % 16
 
-		\time 2/4
+	c4 c c c |   % 17
+	c4 c c c |   % 18
 
-		c4 c |   % 14
+	c4 c c c |   % 19
 
-		\time 4/4
-
-		c4_\markup { \italic { band in 1st X } } c c c |   % 15
-		c4 c c c |   % 16
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 17
-			c4 c c c |   % 18
-		}
-		{
-			c4 c c c |   % 19
-		}
-	}
-
-	c4 c c \< c \! \bar "||"   % 20
+	c4 c c \< c \! |   % 20
 
 	c4_\markup { \italic { snare } } c c c |   % 21
 	c4 c c c |   % 22
@@ -315,42 +284,33 @@ StaffC = \relative c
 	c4 c c c |   % 32
 	c4 c c c |   % 33
 	c4 c c_\markup { \italic { rit. } } c |   % 34
-	c1^\fermata \bar "|."   % 35
+	c1^\fermata |   % 35
 }
 
 
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-			\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 Lyrics \lyricsto "lead" \LeadVoxTextC
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" \StaffC
+			\new ChordNames \Chords
+			\new RhythmicStaff \StaffC
 		>>
 
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
-
-	\layout
-	{
-%		\context { \Staff \RemoveEmptyStaves }
-%		ragged-last-bottom = ##t
-%		ragged-last = ##t
-	}
 }
 
 
@@ -358,7 +318,18 @@ StaffC = \relative c
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "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
 }
+