X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=more-love-more-power.ly;fp=more-love-more-power.ly;h=36ad05c05d0124ddb3fa2372cba54ec0f5f6fd69;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=09adfc79c03bf7b2b637d0d893e7d0b8c4af4b1c;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/more-love-more-power.ly b/more-love-more-power.ly
index 09adfc7..36ad05c 100644
--- a/more-love-more-power.ly
+++ b/more-love-more-power.ly
@@ -1,8 +1,10 @@
-\version "2.16.0"
+% This is missing everything from the chart
+
+\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 = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -10,153 +12,88 @@ staffSize = #18
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "More Love, More Power" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Del Hierro" }
 	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 e \minor
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
 	\repeat volta 2
 	{
-		c4 c c c |   % 1
-		c4 c c c |   % 2
-		c4 c c c |   % 3
-		c4 c c c |   % 4
+		s1*4 |   % 1-4
 	}
 
 	\repeat volta 2
 	{
 		% Verse
 
-		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 \bar "||"   % 12
+		s1*8 \bar "||"   % 5-12
 
-		c4 c c c |   % 13
-		c4 c c c |   % 14
-		c4 c c c |   % 15
-		c4 c c c |   % 16
-		c4 c c c |   % 17
-		c4 c c c |   % 18
-		c4 c c c |   % 19
-		c4 c c c \bar "||"   % 20
+		s1*8 \bar "||"   % 13-20
 
 		% Chorus
 
-		c4 c c c |   % 21
-		c4 c c c |   % 22
-		c4 c c c |   % 23
-		c4 c c c |   % 24
-		c4 c c c |   % 25
-		c4 c c c |   % 26
-		c4 c c c |   % 27
-		c4 c c c |   % 28
-		c4 c c c |   % 29
-		c4 c c c |   % 30
-		c4 c c c |   % 31
-		c4 c c c |   % 32
-		c4 c c c |   % 33
-		c4 c c c |   % 34
-		c4 c c c |   % 35
+		s1*15 |   % 21-35
 	}
 	\alternative
 	{
 		{
-			c4 c c c |   % 36
-			c4 c c c |   % 37
-			c4 c c c |   % 38
-			c4 c c c |   % 39
-			c4 c c c |   % 40
-			c4 c c c |   % 41
-			c4 c c c |   % 42
-			c4 c c c |   % 43
-			c4 c c c |   % 44
+			s1*9 |   % 36-44
 		}
 		{
-			c4 c c c |   % 45
+			s1 |   % 45
 		}
 	}
 
 	\repeat volta 4
 	{
-		c4 c c c |   % 46
-		c4 c c c |   % 47
+		s1*2 |   % 46-47
 	}
 	\alternative
 	{
 		{
-			c4 c c c |   % 48
-			c4 c c c |   % 49
+			s1*2 |   % 48-49
 		}
 		{
-			c4 c c c |   % 50
-			c4 c c c |   % 51
+			s1*2 |   % 50-51
 		}
 	}
 
 	\repeat volta 2
 	{
-		c4 c c c |   % 52
-		c4 c c c |   % 53
-		c4 c c c |   % 54
-		c4 c c c |   % 55
-		c4 c c c |   % 56
-		c4 c c c |   % 57
-		c4 c c c |   % 58
-		c4 c c c |   % 59
-		c4 c c c |   % 60
-		c4 c c c |   % 61
-		c4 c c c |   % 62
-		c4 c c c |   % 63
-		c4 c c c |   % 64
-		c4 c c c |   % 65
+		s1*14 |   % 52-65
 	}
 	\alternative
 	{
 		{
-			c4 c c c |   % 66
-			c4 c c c |   % 67
+			s1*2 |   % 66-67
 		}
 		{
-			c4 c c c |   % 68
+			s1 |   % 68
 		}
 	}
 
-	c4 c c c |   % 69
+	s1 |   % 69
 
 	\repeat volta 2
 	{
-		c4 c c c |   % 70
-		c4 c c c |   % 71
-		c4 c c c |   % 72
-		c4 c c c |   % 73
+		s1*4 |   % 70-73
 	}
 
-	c1^\fermata \bar "|."   % 74
+	s1 \bar "|."   % 74
 
 
 
@@ -219,26 +156,12 @@ LeadVox = \relative c'
 %}
 }
 
-LeadVoxText = \lyricmode
-{
-	More love, more po- wer
-	more of you in my life
-	More love, more po- wer
-	more of you in my life
-
-	And I will wor- ship you with all of my heart
-}
-
 
 %
-% Chord names
+% Lead vocal
 %
-
-Chords = \chordmode
+LeadVox = \relative c'
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	\repeat volta 2
@@ -362,184 +285,268 @@ Chords = \chordmode
 		c4 c c c |   % 73
 	}
 
-	c1 |   % 74
+	c1^\fermata |   % 74
+}
+
+
+LeadVoxText = \lyricmode
+{
+	More love, more po- wer
+	more of you in my life
+	More love, more po- wer
+	more of you in my life
+
+	And I will wor- ship you with all of my heart
 }
 
 
 %
-% Chord rhythms
+% Chord names
 %
+Chords = \chordmode
+{
+	% Intro
+
+	c4 c c c |   % 1
+	c4 c c c |   % 2
+	c4 c c c |   % 3
+	c4 c c c |   % 4
+
+	% Verse
+
+	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
+	c4 c c c |   % 17
+	c4 c c c |   % 18
+	c4 c c c |   % 19
+	c4 c c c |   % 20
+
+	% Chorus
+
+	c4 c c c |   % 21
+	c4 c c c |   % 22
+	c4 c c c |   % 23
+	c4 c c c |   % 24
+	c4 c c c |   % 25
+	c4 c c c |   % 26
+	c4 c c c |   % 27
+	c4 c c c |   % 28
+	c4 c c c |   % 29
+	c4 c c c |   % 30
+	c4 c c c |   % 31
+	c4 c c c |   % 32
+	c4 c c c |   % 33
+	c4 c c c |   % 34
+	c4 c c c |   % 35
+
+	c4 c c c |   % 36
+	c4 c c c |   % 37
+	c4 c c c |   % 38
+	c4 c c c |   % 39
+	c4 c c c |   % 40
+	c4 c c c |   % 41
+	c4 c c c |   % 42
+	c4 c c c |   % 43
+	c4 c c c |   % 44
+
+	c4 c c c |   % 45
+
+	c4 c c c |   % 46
+	c4 c c c |   % 47
+
+	c4 c c c |   % 48
+	c4 c c c |   % 49
+
+	c4 c c c |   % 50
+	c4 c c c |   % 51
+
+	c4 c c c |   % 52
+	c4 c c c |   % 53
+	c4 c c c |   % 54
+	c4 c c c |   % 55
+	c4 c c c |   % 56
+	c4 c c c |   % 57
+	c4 c c c |   % 58
+	c4 c c c |   % 59
+	c4 c c c |   % 60
+	c4 c c c |   % 61
+	c4 c c c |   % 62
+	c4 c c c |   % 63
+	c4 c c c |   % 64
+	c4 c c c |   % 65
+
+	c4 c c c |   % 66
+	c4 c c c |   % 67
+
+	c4 c c c |   % 68
+
+	c4 c c c |   % 69
+
+	c4 c c c |   % 70
+	c4 c c c |   % 71
+	c4 c c c |   % 72
+	c4 c c c |   % 73
+
+	c1 |   % 74
+}
 
-% Use a RhythmicStaff on the chords instead of this?
-% It almost works, but not quite. Doesn't collapse chords above to single notes...
 
+%
+% Chord rhythms
+%
 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
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 1
-		c4 c c c |   % 2
-		c4 c c c |   % 3
-		c4 c c c |   % 4
-	}
-
-	\repeat volta 2
-	{
-		% Verse
-
-		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 \bar "||"   % 12
-
-		c4 c c c |   % 13
-		c4 c c c |   % 14
-		c4 c c c |   % 15
-		c4 c c c |   % 16
-		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 |   % 1
+	c4 c c c |   % 2
+	c4 c c c |   % 3
+	c4 c c c |   % 4
 
-		% Chorus
+	% Verse
 
-		c4 c c c |   % 21
-		c4 c c c |   % 22
-		c4 c c c |   % 23
-		c4 c c c |   % 24
-		c4 c c c |   % 25
-		c4 c c c |   % 26
-		c4 c c c |   % 27
-		c4 c c c |   % 28
-		c4 c c c |   % 29
-		c4 c c c |   % 30
-		c4 c c c |   % 31
-		c4 c c c |   % 32
-		c4 c c c |   % 33
-		c4 c c c |   % 34
-		c4 c c c |   % 35
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 36
-			c4 c c c |   % 37
-			c4 c c c |   % 38
-			c4 c c c |   % 39
-			c4 c c c |   % 40
-			c4 c c c |   % 41
-			c4 c c c |   % 42
-			c4 c c c |   % 43
-			c4 c c c |   % 44
-		}
-		{
-			c4 c c c |   % 45
-		}
-	}
+	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
+	c4 c c c |   % 17
+	c4 c c c |   % 18
+	c4 c c c |   % 19
+	c4 c c c |   % 20
 
-	\repeat volta 4
-	{
-		c4 c c c |   % 46
-		c4 c c c |   % 47
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 48
-			c4 c c c |   % 49
-		}
-		{
-			c4 c c c |   % 50
-			c4 c c c |   % 51
-		}
-	}
+	% Chorus
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 52
-		c4 c c c |   % 53
-		c4 c c c |   % 54
-		c4 c c c |   % 55
-		c4 c c c |   % 56
-		c4 c c c |   % 57
-		c4 c c c |   % 58
-		c4 c c c |   % 59
-		c4 c c c |   % 60
-		c4 c c c |   % 61
-		c4 c c c |   % 62
-		c4 c c c |   % 63
-		c4 c c c |   % 64
-		c4 c c c |   % 65
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 66
-			c4 c c c |   % 67
-		}
-		{
-			c4 c c c |   % 68
-		}
-	}
+	c4 c c c |   % 21
+	c4 c c c |   % 22
+	c4 c c c |   % 23
+	c4 c c c |   % 24
+	c4 c c c |   % 25
+	c4 c c c |   % 26
+	c4 c c c |   % 27
+	c4 c c c |   % 28
+	c4 c c c |   % 29
+	c4 c c c |   % 30
+	c4 c c c |   % 31
+	c4 c c c |   % 32
+	c4 c c c |   % 33
+	c4 c c c |   % 34
+	c4 c c c |   % 35
+
+	c4 c c c |   % 36
+	c4 c c c |   % 37
+	c4 c c c |   % 38
+	c4 c c c |   % 39
+	c4 c c c |   % 40
+	c4 c c c |   % 41
+	c4 c c c |   % 42
+	c4 c c c |   % 43
+	c4 c c c |   % 44
+
+	c4 c c c |   % 45
+
+	c4 c c c |   % 46
+	c4 c c c |   % 47
+
+	c4 c c c |   % 48
+	c4 c c c |   % 49
+
+	c4 c c c |   % 50
+	c4 c c c |   % 51
+
+	c4 c c c |   % 52
+	c4 c c c |   % 53
+	c4 c c c |   % 54
+	c4 c c c |   % 55
+	c4 c c c |   % 56
+	c4 c c c |   % 57
+	c4 c c c |   % 58
+	c4 c c c |   % 59
+	c4 c c c |   % 60
+	c4 c c c |   % 61
+	c4 c c c |   % 62
+	c4 c c c |   % 63
+	c4 c c c |   % 64
+	c4 c c c |   % 65
+
+	c4 c c c |   % 66
+	c4 c c c |   % 67
+
+	c4 c c c |   % 68
 
 	c4 c c c |   % 69
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 70
-		c4 c c c |   % 71
-		c4 c c c |   % 72
-		c4 c c c |   % 73
-	}
+	c4 c c c |   % 70
+	c4 c c c |   % 71
+	c4 c c c |   % 72
+	c4 c c c |   % 73
 
-	c1^\fermata \bar "|."   % 74
+	c1^\fermata |   % 74
 }
 
 
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+			\new Voice = "lead" \LeadVox
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 		>>
 
-		\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
-	}
 }
 
 
 \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)))
+
+% 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
 }
+