X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=show-me-your-glory.ly;h=715dc214f91733b98b9fee61e18be62a251870d7;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=582da14e6bfc777eb5f9ef3209a9cb20a357eda3;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/show-me-your-glory.ly b/show-me-your-glory.ly
index 582da14..715dc21 100644
--- a/show-me-your-glory.ly
+++ b/show-me-your-glory.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 = #20
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,14 +12,10 @@ staffSize = #20
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Show Me Your Glory" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Third Day" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
 	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 d \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -102,12 +98,6 @@ 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
-
 	r1 |   % 1
 	r1 |   % 2
 	r1 |   % 3
@@ -160,6 +150,7 @@ LeadVox = \relative c''
 	r1-\fermata |   % 40
 }
 
+
 LeadVoxText = \lyricmode
 {
 	Caught a glimpse of your splen -- dor
@@ -200,11 +191,6 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c'
 {
-	\clef G
-	\override NoteHead #'style = #'cross
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 %{
 	\tiny
@@ -283,11 +269,9 @@ Chords = \chordmode
 %
 Rhythm = \relative c
 {
-%%	\set Voice.autoBeaming = ##f
-%%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
-\teeny
+	\teeny
 
 	c4 c c c |   % 1
 	c4 c c8. c16 ~ c8 c ~ |   % 2
@@ -364,36 +348,36 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-%		\new Staff
+		\context Staff
 		<<
-			\new ChordNames \Chords
-%Capo 4 edition
-%			\new ChordNames \transpose b g \Chords
-			\new RhythmicStaff << \Rhythm \Dynamics >>
-		>>
-
-		\new Staff
-		<<
-			\Global						% The "roadmap" that everything else depends on
 			\new Voice = "lead" \LeadVox
 			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
+
+		\new ChoirStaff
+		<<
+			\new ChordNames \Chords
+%Capo 4 edition
+%			\new ChordNames \transpose b g \Chords
+			\new RhythmicStaff << \Rhythm \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
@@ -404,6 +388,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)
 }
+