X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=we-are-one-in-the-spirit.ly;h=ab125807074bac186fbbe0a8ae2726f22d6e5fcd;hb=5b3579b74923298347f7b3b4e011028e5632b53f;hp=ee9874ad8585b581156c4fe7a9acad6198ec2e33;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/we-are-one-in-the-spirit.ly b/we-are-one-in-the-spirit.ly
index ee9874a..ab12580 100644
--- a/we-are-one-in-the-spirit.ly
+++ b/we-are-one-in-the-spirit.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 "We Are One In The Spirit" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" }
 	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
-% Let's try a chord dictionary
-%	subtitle =  \markup { \center-column { "F#m" \fret-diagram-terse #"x;x;4;2;2;2;" } "       " \center-column { "F#m/F" \fret-diagram-terse #"x;x;3;2;2;2;" } "       " \center-column { "F#m/E" \fret-diagram-terse #"x;x;2;2;2;2;" }  "       " \center-column { "F#m/Eb" \fret-diagram-terse #"x;x;1;2;2;2;" }  "       " \center-column { "Em7" \fret-diagram-terse #"o;2;2;o;3;o;" }  "       " \center-column { "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 \minor
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	\once \override TextScript #'padding = #2.0
@@ -48,11 +44,10 @@ Global =
 	% Intro
 
 	s1*4 \bar "||"   % 1-4
-	s1*4 \bar "||:"   % 5-8
+	s1*4 \bar ".|:-||"   % 5-8
 
 	\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" }
 
@@ -109,7 +104,7 @@ Global =
 
 %bleh
 \break
-s2. s4^\markup { \large \bold \italic { Free Time } } |   % 39
+	s2. s4^\markup { \large \bold \italic { Free Time } } |   % 39
 	s1*3 \bar "|."   % 40-42
 }
 
@@ -119,12 +114,6 @@ s2. s4^\markup { \large \bold \italic { Free Time } } |   % 39
 %
 LeadVox = \relative c'
 {
-%	\set Staff.instrument = #"Lead vox"
-	\clef G
-	\override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	r1 |   % 1
@@ -199,10 +188,6 @@ LeadVoxText = \lyricmode
 
 Riffs = \relative c
 {
-	\clef G
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 %	\tiny
@@ -249,7 +234,7 @@ Chords = \chordmode
 
 	% Verse
 
-	e4.:sus4.7 a8:5.9 s2  |   % 23
+	e4.:sus4.7 a8:3.5.9 s2  |   % 23
 	e4.:m9 a8:9 s2 |   % 24
 
 	e4.:m9 a8:9 s2 |   % 25
@@ -284,19 +269,12 @@ 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
-
-%Not small enough...
 	\teeny
-%	\magnify #0.3
+
 	% Intro
 
 	 |   % 1
@@ -379,17 +357,13 @@ Dynamics =
 %		\new 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
+			\Global		% The "roadmap" that everything else depends on
 			\new Voice = "lead" \LeadVox
-%			\new Voice \Riffs
-%			\new Lyrics \lyricsto "lead" \LeadVoxText
 		>>
 	>>
 }
@@ -397,11 +371,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
@@ -412,6 +386,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)
 }
+