Update to ensure charts work with latest version of Lilypond.

[music] / agnus-dei.ly

diff --git a/agnus-dei.ly b/agnus-dei.ly
index 66420d2b5f73452c42a3c253aa243db21df89129..ed56d09a5b003a62f8034d33f6280bb0d9550515 100644 (file)
--- a/agnus-dei.ly
+++ b/agnus-dei.ly
@@ -12,8 +12,6 @@ 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 "Agnus Dei" }
        composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Michael W. Smith" }
 %      arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -37,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
        \key a \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
 
        \once \override TextScript #'padding = #2.0
@@ -47,7 +45,7 @@ Global =
 
        % Intro
 
-       s1*4 \bar "||:"   % 1-4
+       s1*4 \bar ".|:-||"   % 1-4
 
        \repeat volta 2
        {
@@ -85,7 +83,7 @@ LeadVox = \relative c'
 {
 %      \set Staff.instrument = #"Lead vox"
        \clef G
-       \override Staff.TimeSignature #'style = #'()
+%      \override Staff.TimeSignature #'style = #'()
 %Hm. Needed anymore?
 %      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
@@ -121,6 +119,7 @@ LeadVox = \relative c'
        r1 |   % 21
 }
 
+
 LeadVoxText = \lyricmode
 {
        Al -- _ _ le -- lu -- _ ia, _
@@ -200,14 +199,12 @@ Chords = \chordmode
 %
 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
+
        % Intro
 
        c4 c c c |   % 1
@@ -264,32 +261,32 @@ Dynamics =
                \set Score.skipBars = ##t
                \set Score.melismaBusyProperties = #'()
 
-%              \new Staff
-               <<
-                       \new ChordNames \Chords
-%Capo 4 edition
-%                      \new ChordNames \transpose b g \Chords
-                       \new RhythmicStaff << \Rhythm \Dynamics >>
-               >>
+               \Global         % The "roadmap" that everything else depends on
 
-               \new Staff
+               \context Staff
                <<
-                       \Global                                         % The "roadmap" that everything else depends on
                        \new Voice = "lead" \LeadVox
                        \new Voice \Riffs
                        \new Lyrics \lyricsto "lead" \LeadVoxText
                >>
+
+               <<
+                       \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"
+               "JazzText"
+               "Luxi Mono"
+               (/ staffSize 20)))
 
 % Spread staves vertically across last page (default: t)
        ragged-last-bottom = ##f
@@ -300,6 +297,4 @@ 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)
 }