Band names should not be in the title

4-4_marches/auld_lang_syne/side.cmpd.ly

@@ -12,7 +12,7 @@
 		<<
 			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\line
+					\halfline
 				}
 			}%Format
 			

5-4_marches/cullen_bay/side.48th.ly

@@ -22,7 +22,8 @@
 		>>
 	}
 	\header {
-		title = \markup \column { \title \normalsize "48th HIGHRS" }
+		title = \title
+		band = "48th HLDRS"
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide

5-4_marches/cullen_bay/side.cmpd.ly

@@ -19,7 +19,8 @@
 		>>
 	}
 	\header {
-		title = \markup { \title "(Canadian Memorial Pipes and Drums)" }
+		title = \title
+		band = "Canadian Memorial Pipes and Drums"
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide

6-8_marches/the_steamboat/config.ily

@@ -13,5 +13,5 @@ halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
-title = "The Steamboat / Hills of Caithness"
+title = "The Steamboat (Hills of Caithness)"
 meter = "March"

6-8_marches/the_steamboat/notes.pipes.ily

@@ -1,7 +1,8 @@
-% 6/8 the Steamboat / Hills of Caithness
+% 6/8 the Steamboat (Hills of Caithness)
 % Pipes
 \version "2.18.2"
-composerPipes = "Trad., 1936, pts 3 & 4 by R. Petre" %Ruaraith Petre
+composerPipes = "Trad., 1936"
+composerPipesAdd = ", pts 3 & 4 by R. Petre" %Ruaraith Petre
 pipeglobal = {
 	\bagpipeKey
 	}

6-8_marches/the_steamboat/pipes.cmpd.ly

@@ -0,0 +1,55 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+			\repeat volta 2 {\part \line}
+			\break
+			\repeat volta 2 {\part \line}
+			\break
+			\bar "|."
+			}%Format
+			{ 
+			\pipesA s8
+
+			\pipesB s8
+
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+
+		\partial 8
+		\pipesA
+		\pipesA
+
+		\pipesB
+		\pipesB
+		
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}

6-8_marches/the_steamboat/pipes.ly

@@ -38,7 +38,7 @@
 		title = \title
 		meter = \meter
 		instrument = \instrumentPipes
-		composer = \composerPipes
+		composer = \markup { \composerPipes \composerPipesAdd }
 	}
 }
 \score {

standards/24_44_standards.side.cmpd.ly

@@ -10,7 +10,8 @@
 		\drummode { \repeat volta 2 { \partial 8 \pempty \midstd \pempty \endtwo } }% End of drums %
 	}
 	\header {
-		title = "2/4 Standards (Canadian Memorial Pipes & Drums)"
+		title = "2/4 Standards"
+		band = "Canadian Memorial Pipes and Drums"
 		meter = "Quick March"
 		composer = ""
 		instrument = "Side"
@@ -38,7 +39,8 @@
     }
 
 	\header {
-		title = "4/4 Standards (Canadian Memorial Pipes & Drums)"
+		title = "4/4 Standards"
+		band = "Canadian Memorial Pipes and Drums"
 		meter = "Quick March"
 		composer = ""
 		instrument = "Side"

standards/34_standards.side.cmpd.ly

@@ -18,7 +18,8 @@
 		}% End of drums %
 	}
 	\header {
-		title = "3/4 Standards (Canadian Memorial Pipes & Drums)"
+		title = "3/4 Standards"
+		band = "Canadian Memorial Pipes and Drums"
 		meter = "Quick March"
 		composer = ""
 		instrument = "Side"

standards/68_standards.side.cmpd.ly

@@ -17,7 +17,8 @@
 	}
 
 	\header {
-		title = "6/8 Standards (Canadian Memorial Pipes & Drums)"
+		title = "6/8 Standards"
+		band = "Canadian Memorial Pipes and Drums"
 		meter = "Quick March"
 		composer = ""
 		instrument = "Side"

standards/98_standards.side.ly

@@ -19,6 +19,7 @@
 	}
 	\header {
 		title = "9/8 Standards"
+		band = "Canadian Memorial Pipes and Drums"
 		meter = "Quick March"
 		composer = ""
 		instrument = "Side"