X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=angels-we-have-heard-on-high.ly;h=e237fbb9760d264b3ec553690ce450415e15bb06;hb=c7291ba4fa2a8851839b23562a8d0db92d594e25;hp=a560c931ecf1d04babb4113588b9b93a23c7b577;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/angels-we-have-heard-on-high.ly b/angels-we-have-heard-on-high.ly
index a560c93..e237fbb 100644
--- a/angels-we-have-heard-on-high.ly
+++ b/angels-we-have-heard-on-high.ly
@@ -8,12 +8,10 @@ staffSize = #18
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
 
-%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %}
+%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %}
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Angels We Have Heard On High" }
 %	subtitle = \markup { \override #'(font-family . sans) \fontsize #1.5 "Capo 3 Version" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
@@ -25,14 +23,11 @@ staffSize = #18
 %
 % Lead vocal
 %
-
 LeadVox = \relative c''
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
 	\key f \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 \override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
@@ -52,7 +47,7 @@ LeadVox = \relative c''
 	s1 |   % 9
 	s1 |   % 10
 	s1 |   % 11
-	s1 \bar "||:"   % 12
+	s1 \bar ".|:-||"   % 12
 
 	\repeat volta 2
 	{
@@ -151,7 +146,7 @@ LeadVox = \relative c''
 LeadVoxText = \lyricmode
 {
 	An -- gels we have heard on high
-	sweet -- ly sing -- ing o’er the plains,
+	sweet -- ly sing -- ing o’er the plains,
 	And the moun -- tains in re -- ply
 	e -- cho back their joy -- ous strains.
 
@@ -188,7 +183,7 @@ Riffs = \relative c'
 {
 	\clef G
 	\key f \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 \override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
@@ -211,12 +206,8 @@ Riffs = \relative c'
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	f4 s8. bf2:sus2/f s16 |   % 1
@@ -325,11 +316,10 @@ Chords = \chordmode
 
 StaffC = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -345,7 +335,7 @@ StaffC = \relative c
 	c4-> c-> c-> c-> |   % 9
 	c4 c c c |   % 10
 	c4-> c8. c16-> ~ c4 c |   % 11
-	c4-> c8. c16-> ~ c4 c \bar "||:"   % 12
+	c4-> c8. c16-> ~ c4 c \bar ".|:-||"   % 12
 
 	\repeat volta 2
 	{
@@ -458,31 +448,24 @@ Dynamics =
 \score
 {
 	<<
+		\context Staff
 		<<
-%			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-			\new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> }
+			<< \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >>
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
+			\new ChordNames \Chords
 % Capo 3 version
 %			\new ChordNames = "chords" \transpose f d \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
-
-	\layout
-	{
-%		\context { \Staff \RemoveEmptyStaves }
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
 }
 
 
@@ -490,9 +473,18 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "JazzText"
     "Luxi Mono"
     (/ staffSize 20)))
 
-%  top-margin = -0.25 \in
+% Don't spread staves vertically across last page (default: t)
+	ragged-last-bottom = ##f
+% Don't spread staves vertically across the page (default: f)
+%	ragged-bottom = ##t
+% Allow partial line for last stave (default: f)
+	ragged-last = ##t
+
+% To find out what's eating the space at the top...
+%	annotate-spacing = ##t
 }
+