X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=in-christ-alone.ly;h=3e5f7bc6c303bf494aec76e3341c8e90ecdc08f8;hb=HEAD;hp=e386812e182fc6edfac33e8639e638ac27b08fc2;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/in-christ-alone.ly b/in-christ-alone.ly
index e386812..3e5f7bc 100644
--- a/in-christ-alone.ly
+++ b/in-christ-alone.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 "In Christ Alone" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Stuart Townend/Keith Getty" }
 %	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. " }
 	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 d \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
 
 	% Intro
@@ -46,9 +42,9 @@ Global =
 	s1*0^\markup { \large \bold { Not too fast } }
 % Capo 4 version
 %	s1*0^\markup { \hspace #0.0 \raise #2.0 \larger \bold { "Moderate pop (*** CAPO 4 ***)" } }
-
-	s2.*17 \bar "|."   % 1-17
-%		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+	\partial 8*3 s4. |   % 0
+	s2.*15 |   % 1-15
+	\partial 8*3 s4. \bar "|."   % 16
 }
 
 
@@ -57,13 +53,10 @@ 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
 
-	r4 r8 a b8. d16 |   % 0
+%	r4 r8 a b8. d16 |   % 0
+	a8 b8. d16 |   % 0
 	d4. a8 b d |   % 1
 	e2 fs8 e16 d |   % 2
 	b8 fs' e4. d8 |   % 3
@@ -82,7 +75,8 @@ LeadVox = \relative c'
 	d4. a8 b d |   % 13
 	e2 fs8 e16 d |   % 14
 	b8 fs' e4. d8 |   % 15
-	d4. r8 r4 |   % 16
+%	d4. r8 r4 |   % 16
+	d4. |   % 16
 }
 
 LeadVoxText = \lyricmode
@@ -144,10 +138,6 @@ LeadVoxTextD = \lyricmode
 
 Riffs = \relative c''
 {
-	\clef G
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 %{
@@ -162,10 +152,8 @@ Riffs = \relative c''
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
-	s4. d8 g4/a |   % 0
+%	s4. d8 g4/a |   % 0
+	d8 g4/a |   % 0
 	d2 g4 |   % 1
 	a4:sus4 a b:m |   % 2
 	g4 a4. g8/a |   % 3
@@ -184,24 +172,22 @@ Chords = \chordmode
 	d4:sus4 d g |   % 13
 	a4:sus4 a b:m |   % 14
 	g4 a4. g8/a |   % 15
-	d4. s |   % 16
+%	d4. s |   % 16
+	d4. |   % 16
 }
 
 
 %
 % 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
 
-	r4 r8 c c4 |   % 0
+%	r4 r8 c c4 |   % 0
+	c8 c4 |   % 0
 	c4 c c |   % 1
 	c4 c c |   % 2
 	c4 c4. c8 |   % 3
@@ -220,7 +206,8 @@ Rhythm = \relative c
 	c4 c c |   % 13
 	c4 c c |   % 14
 	c4 c4. c8 |   % 15
-	c4. r |   % 16
+%	c4. r |   % 16
+	c4. |   % 16
 }
 
 
@@ -242,20 +229,12 @@ 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
@@ -263,17 +242,25 @@ Dynamics =
 			\new Lyrics \lyricsto "lead" \LeadVoxTextC
 			\new Lyrics \lyricsto "lead" \LeadVoxTextD
 		>>
+
+		\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
@@ -284,6 +271,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)
 }
+