X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=as-the-deer.ly;h=73932b092e928be313b0a5cba148348fe5ec94eb;hb=HEAD;hp=86ebac91a0a7af1f2d171f448d43a9d04ccab0f5;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/as-the-deer.ly b/as-the-deer.ly
old mode 100755
new mode 100644
index 86ebac9..73932b0
--- a/as-the-deer.ly
+++ b/as-the-deer.ly
@@ -20,20 +20,6 @@ staffSize = #20
 	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
 }
 
-
-%{
-tweak = #(define-music-function (parser location sym val arg)
-	   (symbol? scheme? ly:music?)
-
-	   "Add @code{sym . val} to the @code{tweaks} property of @var{arg}."
-
-	   (set!
-	    (ly:music-property arg 'tweaks)
-	    (acons sym val
-		   (ly:music-property arg 'tweaks)))
-	   arg)
-%}
-
 % Useful tweak abbreviations (hn = harmony note)
 
 hn = #(define-music-function (parser location arg) (ly:music?)
@@ -49,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key c \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -234,9 +220,10 @@ LeadVoxTextB = \lyricmode
 	e -- ven though you _ are a king,
 
 	I love you more than a -- ny o -- ther
-	so much more than a -- ny -- thing.
+	so much more than a -- ny -- thing. _
 }
 
+
 %
 % Riffs
 %
@@ -264,9 +251,6 @@ Riffs = \relative c'
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	c2 e:m/b |   % 1
@@ -344,8 +328,9 @@ Chords = \chordmode
 
 Rhythm =
 {
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -439,11 +424,11 @@ Dynamics =
 \score
 {
 	<<
-		\Global						% The "roadmap" that everything else depends on
+		\Global			% The "roadmap" that everything else depends on
 
 		\context Staff
 		<<
-			\context Staff << \new Voice = "lead" \LeadVox \new Voice \Riffs >>
+			<< \new Voice = "lead" \LeadVox \new Voice \Riffs >>
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
@@ -464,12 +449,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
-		"Luxi Mono"
-		(/ staffSize 20)))
-	#(define fonts (make-pango-font-tree
-		"Times New Roman"
-		"DomCasual BT"
+		"JazzText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -482,6 +462,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)
 }
+