X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=you-are-my-all-in-all.ly;h=bb7846b601c685b63443dd96e2da592ba3c00bb9;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=838ad2bf767e059e58704126cedff30198f509de;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/you-are-my-all-in-all.ly b/you-are-my-all-in-all.ly
index 838ad2b..bb7846b 100644
--- a/you-are-my-all-in-all.ly
+++ b/you-are-my-all-in-all.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)
@@ -10,8 +10,6 @@ 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 "You Are My All In All" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -20,79 +18,106 @@ staffSize = #18
 
 
 %
-% 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 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
 	s1^\markup { \hspace #0.0 \raise #2.0 { 16th note ballad } } |   % 1
 	s1 |   % 2
 	\time 2/4 s2 \time 4/4 |   % 3
-	s1 \bar "||:"   % 4
+	s1 \bar ".|:-||"   % 4
 
 	\repeat volta 3
 	{
 		% A section
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		r4 f16 g a8 g g f e |   % 5
-		f4 f16 g a8 c, c f e |   % 6
-		d4 d16 e f8 f4 e |   % 7
-		f4. ( g16 f e2 ) |   % 8
-
-		r4 f16 g a8 g g f e |   % 9
-		f4 f16 g a8 c, c f e |   % 10
-		d4 d16 e f8 f4 e |   % 11
-		f2. r4 \bar "||"   % 12
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1*8 \bar "||"   % 5-12
 
 		% B section
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
-
-		a2 g |   % 13
-		f4 c' a2 |   % 14
-		bf4 bf a g |   % 15
-		a4. ( bf16 a g2 ) |   % 16
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
 
-		a2 g |   % 17
-		f4 c' a2 |   % 18
-		bf4 bf a g |   % 19
+		s1*7 |   % 13-19
 	}
 	\alternative
 	{
 		{
-			f2. r4 |   % 20
+			s1 |   % 20
 		}
 		{
-			f2. r4^\markup { \hspace #-2.0 \raise #1.0 \bold { D.S. } } \bar "||"   % 21
+			s2. s4^\markup { \hspace #-2.0 \raise #1.0 \bold { D.S. } } \bar "||"   % 21
 		}
 		{
-			f2. r4 \bar "||"   % 22
+			s1 \bar "||"   % 22
 		}
 	}
 
 	% Ending
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	s1*4 \bar "|."   % 23-26
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	s1 |   % 1
+	s1 |   % 2
+	s2 |   % 3
+	s1 |   % 4
+
+	% A section
+
+	r4 f16 g a8 g g f e |   % 5
+	f4 f16 g a8 c, c f e |   % 6
+	d4 d16 e f8 f4 e |   % 7
+	f4. ( g16 f e2 ) |   % 8
+
+	r4 f16 g a8 g g f e |   % 9
+	f4 f16 g a8 c, c f e |   % 10
+	d4 d16 e f8 f4 e |   % 11
+	f2. r4 |   % 12
+
+	% B section
+
+	a2 g |   % 13
+	f4 c' a2 |   % 14
+	bf4 bf a g |   % 15
+	a4. ( bf16 a g2 ) |   % 16
+
+	a2 g |   % 17
+	f4 c' a2 |   % 18
+	bf4 bf a g |   % 19
+
+	f2. r4 |   % 20
+
+	f2. r4 |   % 21
+
+	f2. r4 |   % 22
+
+	% Ending
 
 	a2 g |   % 23
 	f4 c' a2 |   % 24
 	bf4 bf a g |   % 25
-	f1^\fermata \bar "|."   % 26
+	f1^\fermata |   % 26
 }
 
+
 LeadVoxText = \lyricmode
 {
 	You are my strength when I am weak;
@@ -129,19 +154,13 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c''
 {
-	\clef G
-	\key f \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
 	r4 f16 g a8 g g16 f ~ f e8 f16 ~ |   % 1
 	f4 f16 g a8 c, c16 f ~ f e8 d16 ~ |   % 2
-	\time 2/4 d4 d16 e f8 \time 4/4 |   % 3
-	f2 e \bar "||:"   % 4
+	d4 d16 e f8 |   % 3
+	f2 e |   % 4
 	\normalsize
 }
 
@@ -149,22 +168,16 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	f2 c/e |   % 1
 	d2:m f/a |   % 2
-	\time 2/4 bf2 \time 4/4 |   % 3
+	bf2 |   % 3
 	f2/c c |   % 4
 
-	\repeat volta 3
-	{
-		% A section
+	% A section
 
 	f2 c/e |   % 5
 	d2:m f/a |   % 6
@@ -176,7 +189,7 @@ Chords = \chordmode
 	g2:m7 f4/c c |   % 11
 	bf2/f f |   % 12
 
-		% B section
+	% B section
 
 	f2 c/e |   % 13
 	d2:m f/a |   % 14
@@ -187,19 +200,11 @@ Chords = \chordmode
 	bf4/d c/e f2 |   % 18
 	g2:m7 f4/c c |   % 19
 
-	}
-	\alternative
-	{
-		{
-			bf2/f f |   % 20
-		}
-		{
-			bf2/f f |   % 21
-		}
-		{
-			bf2/f f |   % 22
-		}
-	}
+	bf2/f f |   % 20
+
+	bf2/f f |   % 21
+
+	bf2/f f |   % 22
 
 	% Ending
 
@@ -213,28 +218,20 @@ 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.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
 	c4 c c c |   % 1
 	c4 c c c |   % 2
-	\time 2/4 c4 c \time 4/4 |   % 3
+	c4 c |   % 3
 	c4 c c c |   % 4
 
-	\repeat volta 3
-	{
-		% A section
+	% A section
 
 	c4 c c c |   % 5
 	c4 c c c |   % 6
@@ -246,7 +243,7 @@ StaffC = \relative c
 	c4 c c c |   % 11
 	c4 c c c |   % 12
 
-		% B section
+	% B section
 
 	c4 c c c |   % 13
 	c4 c c c |   % 14
@@ -257,26 +254,19 @@ StaffC = \relative c
 	c4 c c c |   % 18
 	c4 c c c |   % 19
 
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 20
-		}
-		{
-			c4 c c c |   % 21
-		}
-		{
-			c4 c c c \bar "||"   % 22
-		}
-	}
+	c4 c c c |   % 20
+
+	c4 c c c |   % 21
+
+	c4 c c c |   % 22
 
 	% Ending
 
 	c2 c |   % 23
 	c4 c c2 |   % 24
 	c2 c4 c |   % 25
-	c2 c^\fermata \bar "|."   % 26
+	c2 c^\fermata |   % 26
+	\normalsize
 }
 
 
@@ -305,17 +295,20 @@ 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 RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
@@ -326,11 +319,11 @@ Dynamics =
 
 \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)))
 
 % Spread staves vertically across last page (default: t)
 %	ragged-last-bottom = ##f
@@ -341,6 +334,5 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
-%let's try this: [It works! Huzzah!]
-	obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }
+