X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=away-in-a-manger.ly;h=f5ca9154a95946c6db83b8b95dc2bbd34032fa26;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=5f7051f1d9651ed3fee361d7e46da3169a606e76;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/away-in-a-manger.ly b/away-in-a-manger.ly
index 5f7051f..f5ca915 100644
--- a/away-in-a-manger.ly
+++ b/away-in-a-manger.ly
@@ -27,13 +27,13 @@ staffSize = #20
 Global =
 {
 	\key f \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
 
 	% Intro
 
 	\partial 4*1 s4 \bar "||"   % 0
-	s2.*5 \bar "||:"   % 1-5
+	s2.*5 \bar ".|:-||"   % 1-5
 
 	\repeat volta 2
 	{
@@ -72,12 +72,12 @@ LeadVox = \relative c''
 
 	% Intro
 
-	\partial 4*1 s4 \bar "||"   % 0
+	\partial 4*1 s4 |   % 0
 	s2. |   % 1
 	s2. |   % 2
 	s2. |   % 3
 	s2. |   % 4
-	s2 c4 \bar "||:"   % 5
+	s2 c4 |   % 5
 
 	% Verse
 
@@ -102,7 +102,7 @@ LeadVox = \relative c''
 
 	f,2. ~ |   % 23
 
-	f2 c'4 \bar "||"   % 24
+	f2 c'4 |   % 24
 
 	% Last verse
 
@@ -121,7 +121,7 @@ LeadVox = \relative c''
 	bf'4. a8 g4 |   % 37
 	a4 g f |   % 38
 	g d e |   % 39
-	f2.^\fermata \bar "|."   % 40
+	f2.^\fermata |   % 40
 }
 
 LeadVoxText = \lyricmode
@@ -170,12 +170,8 @@ Riffs = \relative c'
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	\partial 4*1 s4 |   % 0
@@ -225,10 +221,9 @@ Chords = \chordmode
 
 Rhythm = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -237,7 +232,7 @@ Rhythm = \relative c
 	c4 c c |   % 2
 	c4 c c |   % 3
 	c4 c c |   % 4
-	c4 c c \bar "||:"   % 5
+	c4 c c \bar ".|:-||"   % 5
 
 	% Verse
 
@@ -283,10 +278,16 @@ Dynamics =
 \score
 {
 	<<
-		\set Score.skipBars = ##t
-		\set Score.melismaBusyProperties = #'()
+		\context 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 Staff
+		\new ChoirStaff
 		<<
 			\new ChordNames \Chords
 %Capo 4 edition
@@ -294,14 +295,8 @@ Dynamics =
 			\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
-		>>
+		\set Score.skipBars = ##t
+		\set Score.melismaBusyProperties = #'()
 	>>
 }
 
@@ -310,7 +305,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "JazzText"
     "Luxi Mono"
     (/ staffSize 20)))
 
@@ -323,6 +318,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)
 }
+