Added some airs with lyrics, and updated templates accordingly

airs/morag_of_dunvegan/full.ly

@@ -0,0 +1,89 @@
+\version "2.19.0"
+
+\include "config.ily"
+\include "notes.bass.ily"
+\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+%\include "notes.pipes.seconds.ily"
+%\include "notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new Voice = "format"
+			  	{
+					\repeat volta 2 {\line}\break\repeat volta 2 {\line}\break
+				}%Format
+
+				\new Voice = "pipes"
+				{
+					\pipesA
+					\pipesB
+				}%Pipes
+			>>
+		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "pipes" {
+%			\verseA
+%		  }
+%		}
+%		\new Staff = "seconds" {
+%			\pipessecndglobal
+%			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
+%
+%
+%		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+			\snareA
+			\snareB
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			\tenorA
+			\tenorB
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+			\bassA
+			\bassB
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(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=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}