X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mourning-into-dancing.ly;h=a4567922ebeae4f81d4900bbd8668da52ced7337;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=8964e81efa4f71073b14cb92f475f9469581b60d;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/mourning-into-dancing.ly b/mourning-into-dancing.ly
index 8964e81..a456792 100644
--- a/mourning-into-dancing.ly
+++ b/mourning-into-dancing.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 "Mourning Into Dancing" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Tommy Walker" }
 	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-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)
@@ -36,8 +32,9 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 %
 Global =
 {
+	\clef F
 	\key g \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	\once \override TextScript #'padding = #2.0
@@ -47,11 +44,8 @@ Global =
 
 	% Intro
 
-%\clef f
-%	s1*3
-%	s2.
-%\clef g
-	s1*4 \bar "||:"   % 1-4
+	s1*3
+	s2. \clef G s4 \bar ".|:-||"   % 1-4
 
 	\repeat volta 2
 	{
@@ -82,7 +76,7 @@ Global =
 
 	\mark \markup { \override #'(font-family . sans) { \box { C } } }
 
-	s1*8 \bar "||:"   % 31-38
+	s1*8 \bar ".|:-||"   % 31-38
 
 	\repeat volta 2
 	{
@@ -106,18 +100,12 @@ Global =
 %
 LeadVox = \relative c'
 {
-%	\set Staff.instrument = #"Lead vox"
-	\clef F
-	\override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	s1 |   % 1
 	s1 |   % 2
 	s1 |   % 3
-	s2. \clef G e8 g |   % 4
+	s2. e8 g |   % 4
 
 	% Verse
 
@@ -219,10 +207,6 @@ LeadVoxText = \lyricmode
 
 Riffs = \relative c
 {
-%	\clef G
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
@@ -325,17 +309,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
-
-%Not small enough...
+%Not small enough... (?)
 	\teeny
 %	\magnify #0.3
 
@@ -421,35 +399,35 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-%		\new Staff
+		\context Staff
+		<<
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
+			\new Lyrics \lyricsto "lead" \LeadVoxText
+		>>
+
+		\new ChoirStaff
 		<<
 			\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
-		>>
 	>>
 }
 
 
 \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
@@ -460,6 +438,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)
 }
+