X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=this-little-light-of-mine.ly;h=e44ffcbc420700e38f40ede8613dd27332545878;hb=HEAD;hp=6fdb3b4d792a5a9cd465d063bf456a8039daa03f;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/this-little-light-of-mine.ly b/this-little-light-of-mine.ly
index 6fdb3b4..e44ffcb 100644
--- a/this-little-light-of-mine.ly
+++ b/this-little-light-of-mine.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)
@@ -12,14 +12,10 @@ 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 "This Little Light Of Mine" }
-%	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Group" }
+	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Group" }
 	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
-% Let's try a chord dictionary
-%	subtitle = \markup { \center-align { "F#m" \fret-diagram-terse #"x;x;4;2;2;2;" } "       " \center-align { "F#m/F" \fret-diagram-terse #"x;x;3;2;2;2;" } "       " \center-align { "F#m/E" \fret-diagram-terse #"x;x;2;2;2;2;" }  "       " \center-align { "F#m/Eb" \fret-diagram-terse #"x;x;1;2;2;2;" }  "       " \center-align { "Em7" \fret-diagram-terse #"o;2;2;o;3;o;" }  "       " \center-align { "A13" \fret-diagram-terse #"x;o;2;o;2;2;" }  }
 }
 
 % Useful tweak abbreviations (hn = harmony note)
@@ -37,7 +33,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key e \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -75,18 +71,7 @@ Global =
 %
 LeadVox = \relative c'
 {
-%	\set Staff.instrument = #"Lead vox"
-	\clef G
-	\override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
-	s1*4 |   % 1-4
-
-	r1 |   % 5
-	r1 |   % 6
-	r1 |   % 7
-	r1 |   % 8
+	s1*8 |   % 1-8
 
 	b8 cs16 b e fs8 e16 ~ e4 r |   % 9
 	gs8 gs 16 gs gs fs8 e16 ~ e4 r |   % 10
@@ -117,6 +102,7 @@ LeadVox = \relative c'
 	r1 |   % 30
 }
 
+
 LeadVoxText = \lyricmode
 {
 	This lit -- tle light of mine, _
@@ -162,10 +148,7 @@ LeadVoxTextC = \lyricmode
 
 Riffs = \relative c'
 {
-	\clef G
 	\override NoteHead #'style = #'cross
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -173,7 +156,9 @@ Riffs = \relative c'
 	\stemDown e8[ r e] r e[ r e] r |   % 1
 	e8[ r e] r e[ r e] r \stemNeutral |   % 2
 	<< \override NoteHead #'style = #'cross { r8 b'[ r b] r b[ r b] } \\ \override NoteHead #'style = #'cross { e,8[ r e] r e[ r e] r } >> |   % 3
-	<< { r8 b'[ r b] r b[ r b] } \\ { e,8[ r e] r e[ r e] r } >> |   % 4
+
+	\repeat "percent" 5
+	{ << { r8 b'[ r b] r b[ r b] } \\ { e,8[ r e] r e[ r e] r } >> } |   % 4-8
 	\normalsize
 }
 
@@ -185,9 +170,9 @@ Chords = \chordmode
 {
 	s1*4 |   % 1-4
 
-	e2 r8 cs:m d4 |   % 5
-	e2 r8 g a4 |   % 6
-	e2 r8 cs:m d4 |   % 7
+	e2 s8 cs:m d4 |   % 5
+	e2 s8 g a4 |   % 6
+	e2 s8 cs:m d4 |   % 7
 	e1 |   % 8
 
 	e1 |   % 9
@@ -213,9 +198,9 @@ Chords = \chordmode
 	e2/b b |   % 25
 	e1 |   % 26
 
-	e2 r8 cs:m d4 |   % 27
-	e2 r8 g a4 |   % 28
-	e2 r8 cs:m d4 |   % 29
+	e2 s8 cs:m d4 |   % 27
+	e2 s8 g a4 |   % 28
+	e2 s8 cs:m d4 |   % 29
 	e1 |   % 30
 }
 
@@ -223,15 +208,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...
-%
 Rhythm = \relative c
 {
-%%	\set Voice.autoBeaming = ##f
-%%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	s1*4 |   % 1-4
 
@@ -276,7 +257,7 @@ Dynamics =
 	s1 |   % 2
 	s4_\markup { \italic { add clap } } s2. |   % 3
 	s1 |   % 4
-	s4_\markup { \italic { w/stomp & clap } } s2. |   % 5
+	s4_\markup { \italic { band in } } s2. |   % 5
 }
 
 
@@ -286,7 +267,7 @@ Dynamics =
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-%		\new Staff
+%		\new ChoirStaff
 		<<
 			\new ChordNames \Chords
 %Capo 4 edition
@@ -296,7 +277,7 @@ Dynamics =
 
 		\new Staff
 		<<
-			\Global						% The "roadmap" that everything else depends on
+			\Global		% The "roadmap" that everything else depends on
 			\new Voice = "lead" \LeadVox
 			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
@@ -309,11 +290,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
@@ -324,6 +305,5 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
-%let's try this: [It works! Huzzah!]
-	page-top-space = 0
 }
+