X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=we-are-an-offering.ly;h=a5bb67c0940881955ac220653795891026a50da6;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=33a6bc7fff0e70cc904005c84cab223d607a6c88;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/we-are-an-offering.ly b/we-are-an-offering.ly
index 33a6bc7..a5bb67c 100644
--- a/we-are-an-offering.ly
+++ b/we-are-an-offering.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 = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -13,50 +13,41 @@ staffSize = #18
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "We Are An Offering" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Dwight Liles" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Shamus Hammons" }
-	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"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\clef G
 	\key c \major
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	R1^\markup { Moderately slow ballad } |   % 1
-	R1 |   % 2
-	R1 |   % 3
-	r2 r8 c c d |   % 4
+	s1^\markup { Moderately slow ballad } |   % 1
+	s1*3 \bar ".|:-||"   % 2-4
 
 	% A section
 
 	\repeat volta 2
 	{
-%\mark \markup { \override #'(font-family . sans) { \box { A } } }
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
 
-		e16 ( d ) c8 ~ c4 r8 c e f |   % 5
-		g2 r8 c, e g |   % 6
-		a4. b16 c g4 \times 2/3 { e8 f g } |   % 7
+		s1*3 |   % 5-7
 	}
 	\alternative
 	{
 		{
-			f16 e d8 ~ d4 r8 c c d |   % 8
+			s1 |   % 8
 		}
 		{
-			f16 e d8 ~ d2 r4 |   % 9
+			s1 |   % 9
 		}
 	}
 
@@ -64,29 +55,65 @@ LeadVox = \relative c'
 	{
 		% B section
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		g4. f16 g e2 |   % 10
-		a4. g16 a f4. r8 |   % 11
-		b4. a16 b c8 b a b |   % 12
-		c4. b8 g4 r8 a |   % 13
-		bf4. a8 f2 |   % 14
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s1*5 |   % 10-14
 	}
 	\alternative
 	{
 		{
 			\time 2/4
-			r8 c8 c d^\markup { \hspace #-1.8 \raise #1.5 \bold "D.S." } \bar "||"   % 15
+			s4. s8^\markup { \hspace #-1.8 \raise #1.5 \bold "D.S." } \bar "||"   % 15
 			\time 4/4
 		}
 		{
-			\time 2/4 r8 c8 c d \bar "||" \time 4/4   % 16
+			\time 2/4 s2 \bar "||" \time 4/4   % 16
 		}
 	}
 
 	% A section
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	s1*4 |   % 17-20
+
+	% Ending
+
+	s1*3 \bar "|."   % 21-23
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	R1*3 |   % 1-3
+	r2 r8 c c d |   % 4
+
+	% A section
+
+	e16 ( d ) c8 ~ c4 r8 c e f |   % 5
+	g2 r8 c, e g |   % 6
+	a4. b16 c g4 \times 2/3 { e8 f g } |   % 7
+
+	f16 e d8 ~ d4 r8 c c d |   % 8
+
+	f16 e d8 ~ d2 r4 |   % 9
+
+	% B section
+
+	g4. f16 g e2 |   % 10
+	a4. g16 a f4. r8 |   % 11
+	b4. a16 b c8 b a b |   % 12
+	c4. b8 g4 r8 a |   % 13
+	bf4. a8 f2 |   % 14
+
+	r8 c8 c d |   % 15
+
+	r8 c8 c d |   % 16
+
+	% A section
 
 	e16 ( d ) c8 ~ c4 r8 c e f |   % 17
 	g2 r8 c, e g |   % 18
@@ -97,7 +124,7 @@ LeadVox = \relative c'
 
 	e16 d c8 ~ c2. ~ |   % 21
 	c2 r |   % 22
-	r1^\fermata \bar "|."   % 23
+	r1^\fermata |   % 23
 }
 
 
@@ -139,12 +166,8 @@ LeadVoxTextB = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	c2 d:m7 |   % 1
@@ -154,41 +177,25 @@ Chords = \chordmode
 
 	% A section
 
-	\repeat volta 2
-	{
-		c2 d:m7 |   % 5
-		c1/e |   % 6
-		f2 c |   % 7
-	}
-	\alternative
-	{
-		{
-			bf2 g |   % 8
-		}
-		{
-			bf2 g4:sus4.7 g |   % 9
-		}
-	}
+	c2 d:m7 |   % 5
+	c1/e |   % 6
+	f2 c |   % 7
 
-	\repeat volta 2
-	{
-		% B section
+	bf2 g |   % 8
 
-		e2:m7 a:m7 |   % 10
-		d2:m7 g |   % 11
-		e2:7 a:m |   % 12
-		f2 c |   % 13
-		bf2 d:m7/g |   % 14
-	}
-	\alternative
-	{
-		{
-			\time 2/4 g2 \time 4/4 |   % 15
-		}
-		{
-			\time 2/4 g2 \time 4/4 |   % 16
-		}
-	}
+	bf2 g4:sus4.7 g |   % 9
+
+	% B section
+
+	e2:m7 a:m7 |   % 10
+	d2:m7 g |   % 11
+	e2:7 a:m |   % 12
+	f2 c |   % 13
+	bf2 d:m7/g |   % 14
+
+	g2 |   % 15
+
+	g2 |   % 16
 
 	% A section
 
@@ -208,17 +215,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 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -229,41 +230,25 @@ StaffC = \relative c
 
 	% A section
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 5
-		c4 c c c |   % 6
-		c4 c c c |   % 7
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 8
-		}
-		{
-			c4 c c c |   % 9
-		}
-	}
+	c4 c c c |   % 5
+	c4 c c c |   % 6
+	c4 c c c |   % 7
 
-	\repeat volta 2
-	{
-		% B section
+	c4 c c c |   % 8
 
-		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
-	}
-	\alternative
-	{
-		{
-			\time 2/4 c2 \time 4/4 \bar "||"   % 15
-		}
-		{
-			\time 2/4 c2 \time 4/4 \bar "||"   % 16
-		}
-	}
+	c4 c c c |   % 9
+
+	% B section
+
+	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
+
+	c2 |   % 15
+
+	c2 |   % 16
 
 	% A section
 
@@ -276,42 +261,50 @@ StaffC = \relative c
 
 	c4 c c c |   % 21
 	c4 c c c |   % 22
-	c1^\fermata \bar "|."   % 23
+	c1^\fermata |   % 23
 }
 
 
 \score
 {
 	<<
-%		\new ChoirStaff = "Vox"
+		\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 Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
-		\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
-	{
-%		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
 }
+