Changed setup of all scores, now possible to extend easily

airs/morag_of_dunvegan/bass.ly

@@ -12,8 +12,9 @@
 		>>
 	}
 	\header {
-		title = "Morag of Dunvegan"
-		meter = "Slow Air"
-		instrument = "Bass"
+		title = \title
+		meter = \meter
+		instrument = \instrumentBass
+		composer = \composerBass
 	}
 }

airs/morag_of_dunvegan/config.ily

@@ -6,4 +6,13 @@ global = {
 
 %% Format
 formatA = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break }
-formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break }
+formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break }
+
+%% Headers
+title = "Morag of Dunvegan"
+meter = "Slow Air"
+
+composerSide  = ""
+composerTenor = ""
+composerBass  = ""
+composerPipes = ""

airs/morag_of_dunvegan/drums.ly

@@ -8,8 +8,8 @@
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" {
-			\set PipeBandDrumStaff.instrumentName = #"Side "
-			\set PipeBandDrumStaff.shortInstrumentName = #"S.D. "
+			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			\global
 			<<
@@ -18,22 +18,34 @@
 			>>
 		}
 		\new PipeBandDrumStaff = "bass" {
-			\set PipeBandDrumStaff.instrumentName = #"Bass "
-			\set PipeBandDrumStaff.shortInstrumentName = #"B.D. "
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 			\bassA
 			\bassB
 		}
 		\new PipeBandDrumStaff = "tenor" {
-			\set PipeBandDrumStaff.instrumentName = #"Tenor"
-			\set PipeBandDrumStaff.shortInstrumentName = #"T.D. "
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
 			\tenorA
 			\tenorB
 		}
 	>>
 	\header {
-		title = "Morag of Dunvegan"
-		meter = "Slow Air"
+		title = \title
+		meter = \meter
+		composer = \markup \tiny {
+			\column \right-align {
+				$(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=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
 	}
 }

airs/morag_of_dunvegan/side.ly

@@ -12,8 +12,9 @@
 		>>
 	}
 	\header {
-		title = "Morag of Dunvegan"
-		meter = "Slow Air"
-		instrument = "Side"
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
 	}
 }

airs/morag_of_dunvegan/tenor.ly

@@ -12,8 +12,9 @@
 		>>
 	}
 	\header {
-		title = "Morag of Dunvegan"
-		meter = "Slow Air"
-		instrument = "Tenor"
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
 	}
 }