X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=word-of-god-speak.ly;h=746c369517d96ddb670f377398edf8ba2d9fd622;hb=cdf57606f385bc4493fed4e3860bce0ce657dc40;hp=ea9c02261a305613573c0f0c07e3a6dc98c1ea03;hpb=a5196859a3fdd56824144ef4a298a0b580a2ffdc;p=music

diff --git a/word-of-god-speak.ly b/word-of-god-speak.ly
old mode 100755
new mode 100644
index ea9c022..746c369
--- a/word-of-god-speak.ly
+++ b/word-of-god-speak.ly
@@ -15,7 +15,7 @@ staffSize = #18
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Word Of God, Speak" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
-	tagline  = "Engraved by JLH and Lilypond 2.8.2"
+	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
 }
 
 % Useful tweak abbreviations (hn = harmony note)
@@ -26,6 +26,18 @@ hn = #(define-music-function (parser location arg) (ly:music?)
   (set! (ly:music-property arg 'tweaks)
     (acons 'font-size -3.0 (ly:music-property arg 'tweaks))) arg)
 
+%
+% Song's structure
+%
+
+Global = 
+{
+	\clef G
+	\key c \major
+	\override Staff.TimeSignature #'style = #'()
+	\time 4/4
+}
+
 
 %
 % Lead vocal
@@ -363,13 +375,14 @@ Chords = \chordmode
 % Use a RhythmicStaff on the chords instead of this?
 % It almost works, but not quite. Doesn't collapse chords above to single notes...
 
-StaffC = \relative c
+Rhythm = \relative c
 {
 %	\set Voice.autoBeaming = ##f
 %	\set Staff.instrumentName = #"Rhythm"
 	\override Staff.TimeSignature #'style = #'()
 	\time 4/4
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -479,6 +492,7 @@ Dynamics =
 
 \score
 {
+%{
 	<<
 		<<
 %			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
@@ -495,6 +509,25 @@ Dynamics =
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
+%}
+	<<
+		\set Score.skipBars = ##t
+		\set Score.melismaBusyProperties = #'()
+
+%		\new Staff
+		<<
+			\new ChordNames \Chords
+			\new RhythmicStaff << \Rhythm \Dynamics >>
+		>>
+
+		\new Staff
+		<<
+			\Global
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
+			\new Lyrics \lyricsto "lead" \LeadVoxText
+		>>
+	>>
 }