Added lyrics to Amazing Grace

airs/amazing_grace/config.ily

@@ -8,7 +8,7 @@ confTempo = {
 	\tempo 4 = 60
 	}
 %% Format
-part = { \partial 4 s4 }
+part = { \partial 4 \grace{ s4 } s4 }
 measure = { \grace { s4 } s4*3 | }
 halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }

airs/amazing_grace/full.ly

@@ -8,18 +8,25 @@
 %\include "./notes.tenor.ily"
 \include "./notes.side.ily"
 \include "./notes.pipes.ily"
+\include "./notes.lyrics.ily"
+
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
 
 \score {
 	\new StaffGroup <<
-		\new Staff {
+		\new Staff \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\global
 			\pipeglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
-				{
+				\new Voice = "format" {
+					\part
 					\repeat volta 2 {
-					  \part
 					  \line \break
 					  \line \break
 					  \line \break
@@ -31,26 +38,33 @@
 					 }
 					 \bar "|."
 				}%Format
-				{
+				\new Voice = "pipes" {
 					\pipesA
 					\pipesAendA s4
 					\pipesAendB s4
 				}%Pipes
+				\new NullVoice = "lyrics-aligner" {
+					\lyricsA
+				}
 			>>
 		}
-		\new PipeBandDrumStaff = "side" {
+		\new Lyrics = "lyrics1" {
+			\lyricsto  "lyrics-aligner" {
+				\verseA
+			}
+		}
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 				\snarePart
 				\snareAA
 				\snareAB
 				\snareAC
-				\snareAD
+				\keepWithTag #'with-volta \snareAD
-
+				\snareADendB s4
-				\snareADendA
-				\snareADendB
 		}
 %		\new PipeBandDrumStaff = "tenor" {
 %			\tenorglobal
@@ -70,17 +84,20 @@
 		meter = \meter
 		composer = \markup \large {
 			\column \right-align {
-				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  \arrangerPipes ":" }} #} )
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
 				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
 				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
 			}
 			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
 				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
 				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
 			}
 		}
+
 	}
 }

airs/amazing_grace/notes.lyrics.ily

@@ -0,0 +1,31 @@
+% 4/4 Abide with Me
+% Lyrics
+\version "2.18.2"
+composerLyrics = "J. Newton"
+lyricsA = {
+	d4 |
+	d2 d4 |
+	d2 d4 |
+	d2 d4 |
+	d2 d4 |
+	d2 d4 |
+	d2 d4 |
+	d2~ d4~ | d2
+
+	d4 |
+	d2 d4 |
+	d2 d4 |
+	d2 d4 |
+	d2 d4 |
+	d2 d4 |
+	d2 d4 |
+	d2~ d4~ | d2
+}
+verseA = \lyricmode {
+	\set stanza = #"1."
+	A -- ma -- zing grace!
+	How sweet the sound, that saved a wretch like me! __ __
+
+	I once was lost, but now am found.
+	Was blind, but now I see. __ __
+}

airs/amazing_grace/notes.side.ily

@@ -1,32 +1,56 @@
 % 3/4 Amazing Grace
 % Side
 \version "2.18.2"
-composerSide = ""
+composerSide = "v1.0"
+arrangerSide = ""
 sideglobal = {}
+
+optdragd = \drummode { \drumgrace { \startParenthesis g16[ \endParenthesis g] } } 
+optdragg = \drummode { \drumgrace { \startParenthesis d16[ \endParenthesis d] } } 
+optdrag = #(autohandFunc optdragg optdragd)
+
 snarePart = \drummode {
-			\flamd d8. g16 |
+			\optflam d8. g16 |
 }
+snareAAraw = \drummode {
+	\tag #'repeating { d2->)\! }
+	\tag #'not-repeating {\flam d2 }
+		\flam d8 g32 d16. |
+	\flam g2 \flam d8. g16 |
+	d2:32( d4:32)(\> |
+	d2)\! \flam d8. g16 |
+}
+
+
 snareAA = \drummode {
-	\flamd d2)\! \flamd d8 g32 d16. |
+	\keepWithTag #'not-repeating \snareAAraw
-	\flamd d2 \flamd d8. g16 |
-	d4:32( d4:32)( d4:32)(\> |
-	d2)\! \flamd d8. g16 |
 }
 snareAB = \drummode {
-	\flamd d2 \flamd d8 g32 d16. |
+	\flam d2 \flam d8 g32 d16. |
-	\flamd d2 \flamd d8. \flamg g16-> |
+	\flam g2 \flam d8. g16 |
-	d4:32(\< d4:32)( d4:32)(\> |
+	d2.:32(\<  |
-	d4:32)(\! d4:32)( d4:32)(\< |
+	d4:32)(\> d4:32)(\! d4:32)(\< |
 }
 snareAC = \drummode {
-	d2->)\! d8 g32 d16. |
+	\keepWithTag #'repeating \snareAAraw
-	\flamd d2 d8. g16 |
+}
-	d4:32( d4:32)( d4:32)(\> |
+
-	d2)\! \flamd d8. g16 |
+snareADA = \drummode {
+	\flam d2 \flam d8 g32 d16. |
+	\flam g2 \optdrag g4 |
+}
+snareADendA = \drummode {
+	d4:32(\> d4:32)( d4:32)(\! |
+	d4:32)( d4:32)(\<
+		\tag #'with-volta {d4:32) \! \laissezVibrer}
+		\tag #'no-volta { d4:32)( }
+}
+snareADendB = \drummode {
+	d2.:32( \f \>  |
+	d2:32)\p
 }
 snareAD = \drummode {
-	\flamd d2 d8 g32 d16. |
+	\snareADA
-	\flamd d2 \dragd d4 |
+	\snareADendA
-	d4:32(\> d4:32)( d4:32)(\! |
-	d4:32)( d4:32)(\< d4:32( <>)\!)
 }
+

airs/amazing_grace/pipes.ly

@@ -42,6 +42,7 @@
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
+		\partial 4
 		\pipesA
 		\pipesAendA
 

airs/amazing_grace/side.ly

@@ -15,15 +15,21 @@
 					\line \break
 					\line \break
 					\line \break
-					\line \break
+					\halfline
 				}
+				\alternative {
+					{ \halfline }
+					{ \halfline }
+				}
+				\bar "|."
 			}
 			{
 				\snarePart
 				\snareAA
 				\snareAB
 				\snareAC
-				\snareAD
+				\keepWithTag #'with-volta \snareAD
+				\snareADendB
 			}
 		>>
 	}
@@ -32,5 +38,6 @@
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
+		arranger = \arrangerSide
 	}
 }