Updated/Fixed 2/4 Marches and 3/4 Marches (+ template)

2-4_marches/barren_rocks_of_aden/notes.pipes.ily

@@ -2,6 +2,7 @@
 % Pipes
 \version "2.18.2"
 composerPipes = ""
+arrangerPipes = ""
 pipeglobal = {
 	\bagpipeKey
 	}

2-4_marches/barren_rocks_of_aden/pipes.ly

@@ -36,6 +36,7 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
 \score {
@@ -43,6 +44,7 @@
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
 
+		\partial 8
 		\pipesA
 		\pipesA
 
@@ -61,5 +63,6 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }

2-4_marches/black_bear/drums.ly

@@ -7,6 +7,18 @@
 \include "./notes.tenor.ily"
 \include "./notes.side.ily"
 
+
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" {
@@ -17,9 +29,10 @@
 
 			<<
 				\new NullVoice = "format" {
-					\repeat volta 2 { \part \halfline \break \halfline } \break
+					\repeat volta 2 {
-					\part \halfline \break \halfline \bar "||" \break
+						\part \line \markTextEol "Fine"
-					\line \bar "|."
+					}\break
+					\part \line \markTextEol "D.C. al Fine" \bar "||"
 				}%End of Format
 				\new DrumVoice = "side" {
 					\snareA s8

2-4_marches/black_bear/full.ly

@@ -9,25 +9,34 @@
 \include "./notes.side.ily"
 \include "./notes.pipes.ily"
 
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
 		\new Staff {
 			\global
 			\bagpipeKey
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set Staff.instrumentName = \markup{ \instrumentPipes }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				{
 					\repeat volta 2 {
-						\part \line
+						\part \line \markTextEol "Fine"
 					}\break
-					\part \line \bar "||" \break
+					\part \line \markTextEol "D.C. al Fine" \bar "||"
-					\line \bar "|."
 				}%Format
 				{
 					\pipesA s8
 					\pipesB
-					\pipesCA s8
 				}%Pipes
 			>>
 		}
@@ -37,7 +46,6 @@
 			\sideglobal
 				\snareA s8
 				\snareBA
-				\snareBB
 		}
 		\new PipeBandDrumStaff = "tenor" {
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
@@ -48,7 +56,6 @@
 			r8 \tenorA s8
 
 			\tenorB
-			\tenorA s8
 		}
 		\new PipeBandDrumStaff = "bass" {
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
@@ -56,7 +63,6 @@
 			r8 \bassA s8
 
 			\bassB
-			\bassA s8
 		}
 	>>
 	\header {

2-4_marches/black_bear/mid.ly

@@ -6,172 +6,61 @@
 \include "./notes.bass.ily"
 \include "./notes.tenor.ily"
 
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
-<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly
+		\new PipeBandDrumStaff = "tenor" \with {
-		\new PipeBandDrumStaff = "side" {
+			instrumentName = \markup{ \instrumentTenor }
-			\global
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
-			\sideglobal
+		} {
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
-				<<
-				\new NullVoice = "format" {
-					\mark \markup { \normalsize {Intro } }
-					\emptyline
-					\bar "|."
-					
-					\mark \markup { \normalsize {Tune } }
-				  	\line \break
-					\line \break
-					\bar "|."
-	
-					\part \line \break
-					\line \break
-					\bar "|."
-				}%Format
-	
-				\new DrumVoice = "side" {
-					\intro
-					\snareA s8
-					\snareA s8
-			
-					\snareBA
-					\snareBB
-				
-				}%Pipes
-||||||| merged common ancestors
-		\new PipeBandDrumStaff = "side" {
-			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
-
-			\global
-			<<
-				{
-					\line \break
-					\line \break
-					\bar "|."
-
-					\part \line \break
-					\part \line \break
-					\bar "|."
-			}%End of Format
-				{
-					\snareA
-					s8
-					\snareA
-					s8
-
-					\snareBA
-					\snareBB
-				}
-=======
-		\new PipeBandDrumStaff = "tenor" {
-		  \global
 			\tenorglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\global
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 			<<
-				\new NullVoice = "format" {
+				{
-					\repeat volta 2 { \part \halfline \break \halfline } \break
+					\repeat volta 2 {
-					\part \halfline \break \halfline \bar "||" \break
+						\part \line
+					}
+					\break
+
+					\part \line \bar "||" 
+					\break
 					\line \bar "|."
-				}%End of Format
+
-				\new DrumVoice = "side" {
+				}%Format
+				{
 					r8 \tenorA s8
 
 					\tenorB
 					\tenorA s8
-				}%End of side
+
->>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly
+				}%Music
 			>>
-<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly
-||||||| merged common ancestors
 		}
-		\new PipeBandDrumStaff = "bass" {
+		\new PipeBandDrumStaff = "bass" \with {
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+			shortInstrumentName = \markup{ \shortInstrumentBass }
-=======
+		} {
-
-		}
-		\new PipeBandDrumStaff = "bass" {
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
->>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly
 
-<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly
-			}
-		\new PipeBandDrumStaff = "tenor" {
-			\tenorglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-	
-			\emptyline
-	
-			\tenorA
-			\tenorA
-	
-			s8 \tenorBA
-			\tenorBB
-||||||| merged common ancestors
-			\bassAA
-			\bassAB
-
-			s8
-			\bassAA
-			s8
-			\bassAB
-		}
-		\new PipeBandDrumStaff = "tenor" {
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-
-			\tenorA
-			\tenorA
-
-			s8
-			\tenorBA
-			s8
-			\tenorBB
-=======
 			r8 \bassA s8
 			\bassB
 			\bassA s8
 
->>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly
-		}
-		\new PipeBandDrumStaff = "bass" {
-			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-	
-			\emptyline
-	
-			\bassAA
-			\bassAB
-	
-			s8 \bassAA
-			\bassAB
 		}
 	>>
-	\layout {
-		\context {
-			\PipeBandDrumStaff
-			\RemoveEmptyStaves
-			\override VerticalAxisGroup.remove-first = ##t
-		}
-	}
 	\header {
 		title = \title
 		meter = \meter
 		composer = \markup {
 			\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 }}#} )
 			}

2-4_marches/black_bear/notes.pipes.ily

@@ -6,7 +6,7 @@ pipeglobal = {
   \bagpipeKey
 }
 pipesA = {
-	\grg a16. [ b32 ] |
+	\tag #'upbeat { \grg a16. [ b32 ] | }
 	\thrwd d8 [ \dbld d8 ] \grg f16.[  d32  A16.  f32  ]|
 	\thrwd d8 [ \dbld d8 ] \grg f16.[  d32  A16.  f32  ]|
 	\dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] |
@@ -29,14 +29,3 @@ pipesB = {
 	\grg d32 [ f16.  \grg d32  f16. ] e16. [ g32 \grA f32 g16. ] |
 	A8 [ \grip A8 ] \grg A16. [ g32 f16.  e32 ]
 }
-pipesCA = {
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32  A16.  f32 ] |
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32  A16.  f32 ] |
-	\dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] |
-	\grg c32 [ d16.  \grg b32  \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ]
-
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16.  f32 ] |
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16.  f32 ] |
-	\dble e8 [ \grip e8 ] \grg e16. [ g32 \grA f32 e16. ] |
-	\thrwd d8 [ \grg f8 ] \thrwd d8
-	}

2-4_marches/black_bear/notes.side.ily

@@ -7,7 +7,7 @@ sideglobal = { \eighthBeaming }
 
 snareA = \drummode {
 	\tutti {
-		d16. g32 |
+	  \tag #'upbeat { d16. g32 | }
 		d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
 		d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
 		\flam d8 d8:32(		g8)
@@ -22,6 +22,9 @@ snareA = \drummode {
 	} g32 |
 	\flam d16. g32-> d32 g d g	d8
 }
+snareBB = \drummode {
+  \removeWithTag #'upbeat \snareA
+}
 
 snareBA = \drummode {
 	g8 |

2-4_marches/black_bear/pipes.ly

@@ -5,6 +5,12 @@
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
 \score {
     \new Staff {
 		\global
@@ -12,16 +18,13 @@
 		<<
 			{
 				\repeat volta 2 {
-					\part \line
+						\part \line \markTextEol "Fine"
 					}\break
-				\part \line \bar "||" \break
+					\part \line \markTextEol "D.C. al Fine" \bar "||"
-				\line \bar "|."
-
 			}
 			{
 				\pipesA s8
 				\pipesB
-				\pipesCA
 			}
 		>>
 	}
@@ -40,7 +43,7 @@
 		\pipesA
 		\pipesA
 		\pipesB
-		\pipesCA
+		\removeWithTag #'upbeat \pipesA
 	}
 	\midi { \confTempo }
 	\header {

2-4_marches/black_bear/tenor.ly

@@ -37,28 +37,3 @@
 		composer = \composerTenor
 	}
 }
-
-midiTenor = midiDrumPitches
-midiTenor.right-hand = \tenorDefault
-midiTenor.left-hand = \tenorDefault
-\score {
-	\new PipeBandDrumStaff 
-	\with {
-		drumPitchTable = #(alist->hash-table midiTenor)
-	}
-	{ \global \tenorglobal
-		%%Tune
-		\tenorA 
-		r8 \tenorA
-		
-		\tenorB
-		\tenorA r8
-	}
-	\midi { \confTempo }
-	\header {
-		title = \title
-		meter = \meter
-		instrument = \instrumentPipes
-		composer = \composerPipes
-	}
-}

2-4_marches/brown_haired_maiden/config.ily

@@ -7,7 +7,6 @@ confTempo = {
 	\tempo 4 = 80
 	}
 %% Format
-part = { \partial 8 s8 }
 measure = { \grace {s4} s2 | }
 halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }

2-4_marches/brown_haired_maiden/notes.pipes.ily

@@ -2,6 +2,10 @@
 % Pipes
 \version "2.18.2"
 composerPipes = "Trad."
+arrangerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+}
 pipesA = {
 	\grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] |
 	\thrwd d8. [ e16 ] \dblf f4 |

2-4_marches/brown_haired_maiden/pipes.ly

@@ -8,9 +8,9 @@
 \score {
     \new Staff {
 		\global
-		\bagpipeKey
+		\pipeglobal
 		<<
-			{ 
+			\new NullVoice = "format" {
 				\repeat volta 2 {
 					\line
 				}
@@ -22,10 +22,10 @@
 					{ \halfline }
 					{ \halfline }
 				}
-	
 				\bar "|."
-			}
+			}%Format
-			{ 
+
+			\new Voice = "pipes" {
 				\pipesA
 
 				\pipesB
@@ -39,5 +39,26 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\pipesA
+
+		\pipesB
+		\pipesBA
+		\pipesB
+		\pipesBB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }

2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily

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

2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily

@@ -1,7 +1,11 @@
-% 2/4 Teribus
+% 2/4 Corriechoillie's 43rd Welcome to the Northern Meeting
 % Pipes
 \version "2.18.2"
-composerPipes = "PM W. Ross, arr. PM G.J. van Achterbergh"
+composerPipes = "PM W. Ross"
+arrangerPipes = "PM G.J. van Achterbergh"
+pipeglobal = {
+	\bagpipeKey
+}
 pipesA = {
 	e8 |
 	\grg a8. [ b16 ] \grG a8 [ \thrwd d8 ] |

2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly

@@ -8,9 +8,9 @@
 \score {
     \new Staff {
 		\global
-		\bagpipeKey
+		\pipeglobal
 		<<
-			{
+			\new NullVoice = "format" {
 				\repeat volta 2 {
 					\part \line
 				}
@@ -22,10 +22,10 @@
 					{ \halfline }
 					{ \halfline }
 				}
-	
 				\bar "|."
-			}
+			}%Format
-			{
+
+			\new Voice = "pipes" {
 				\pipesA s8
 
 				\pipesB
@@ -39,5 +39,26 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8
+		\pipesA s8
+
+		\pipesB
+		\pipesBA s8
+		\pipesBB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }

2-4_marches/duncan_mcinness/notes.side.ily

@@ -79,5 +79,4 @@ snareDAC = \drummode {
 		>>
 
 		\flamd d8 d8:32(	g4)
-		\bar "|."
 }

2-4_marches/high_road_to_gairloch/notes.pipes.ily

@@ -2,6 +2,11 @@
 % Pipes
 \version "2.18.2"
 composerPipes = "Trad."
+arrangerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+}
+
 pipesA = {
 	\grg e8. [ f16 ] \grg e8 [ a8 ] |
 	\dblc c8 [ \gre a8 ] \dble e4 |

2-4_marches/high_road_to_gairloch/pipes.ly

@@ -8,22 +8,21 @@
 \score {
     \new Staff {
 		\global
-		\bagpipeKey
+		\pipeglobal
-		<<
+		\set Staff.midiInstrument = #"bagpipe"
-            		{
+
-				\line 
-				\line
-			}
-			{
 				\pipesA
+				\bar "||"
 				\pipesB
-			}
+				\bar "|."
-		>>
 	}
 	\header {
 		title = \title
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
+	\layout { }
+	\midi { \confTempo }
 }

2-4_marches/mairis_wedding/config.ily

@@ -7,7 +7,6 @@ confTempo = {
 	\tempo 4 = 80
 	}
 %% Format
-part = { \partial 8 s8 }
 measure = { \grace {s1} s2 | }
 halfline = { \repeat unfold 4 \measure }
 line = { \repeat unfold 2 { \halfline } }

2-4_marches/mairis_wedding/notes.pipes.ily

@@ -1,7 +1,8 @@
 % 2/4 Maries Wedding
 % Pipes
 \version "2.18.2"
-composerPipes = ""
+composerPipes = "Trad."
+arrangerPipes = ""
 pipeglobal = {
 	\bagpipeKey
 	}

2-4_marches/mairis_wedding/pipes.ly

@@ -37,6 +37,7 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
 \score {
@@ -56,5 +57,6 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }

2-4_marches/pipers_cave/config.ily

@@ -7,11 +7,12 @@ confTempo = {
 	\tempo 4 = 90
 	}
 %% Format
-part = { \partial 8 s8 }
+partspacer = { \grace {s4} s8 }
+part = { \partial 8 }
 measure = { \grace { s4 } s2 | }
 halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
-title = "Piper's Cave"
+title = "The Piper's Cave"
 meter = "March"

2-4_marches/pipers_cave/notes.pipes.ily

@@ -2,6 +2,10 @@
 % Pipes
 \version "2.18.2"
 composerPipes = "PM J. Sutherland, 1936"
+arrangerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+}
 pipesA = {
 	\dblc c16. [ b32 ] |
 	\grg a4 \wbirl a8. [ b16 ] |
@@ -34,5 +38,5 @@ pipesBB = {
 	\grg a4 \wbirl a8. [ b16 ] |
 	\grip c8 [ f8 ] \slure f8 [ A16 f16 ] |
 	\dble e8. [ c16 ] \grg b8 [ \dblc c16 b16 ] |
-	\grg a4 \wbirl a4 
+	\grg a4 \wbirl a8
 }

2-4_marches/pipers_cave/pipes.ly

@@ -8,24 +8,25 @@
 \score {
     \new Staff {
 		\global
-		\bagpipeKey
+		\pipeglobal
 		<<
-			{
+			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\part \line
+					\part \partspacer \line
 				}
 				\break
 				\repeat volta 2 {
-					\part s2*3 s4 s8
+					\part \partspacer s2*3 s4 s8
 				}
 				\alternative {
-					{s8 \halfline}
+					{\partspacer | \halfline}
-					{s8 \halfline}
+					{\partspacer | \halfline}
 				}
 
 				\bar "|."
-			}
+			}%Format
-			{
+
+			\new Voice = "pipes" {
 				\pipesA s8
 
 				\pipesB
@@ -39,5 +40,30 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
+\score {
+	\unfoldRepeats {\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\repeat volta 2 {
+			\part \pipesA
+		}
+
+		\repeat volta 2 {
+			\part \pipesB
+		} \alternative {
+			\pipesBA
+			\pipesBB
+		}
+	} }
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }

2-4_marches/teribus/config.ily

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

2-4_marches/teribus/notes.pipes.ily

@@ -1,7 +1,11 @@
 % 2/4 Teribus
 % Pipes
 \version "2.18.2"
-composerPipes = "Trad., arr. PM G.J. van Achterbergh"
+composerPipes = "Trad."
+arrangerPipes = "PM G.J. van Achterbergh"
+pipeglobal = {
+	\bagpipeKey
+}
 pipesA = {
 	a8 |
 	\thrwd d8 [ \gre a8 ] \thrwd d8. [ e16 ] |
@@ -12,7 +16,7 @@ pipesA = {
 	\thrwd d8 [ \gre a8 ] \thrwd d8. [ e16 ] |
 	\grg f8 [ A8 ] \hdblf f8 [ d8 ] |
 	\dblg g8. [ f16 ] \dble e8. [ A16 ] |
-	\hdblf f8 [ d8 ] \dbld d8 |
+	\hdblf f8 [ d8 ] \dbld d8
 }
 pipesB = {
 	\dblg g8

2-4_marches/teribus/pipes.ly

@@ -8,9 +8,9 @@
 \score {
     \new Staff {
 		\global
-		\bagpipeKey
+		\pipeglobal
 		<<
-			{
+			\new NullVoice = "format" {
 				\repeat volta 2 {
 					\part \line
 				}
@@ -22,10 +22,10 @@
 					{ \halfline }
 					{ \halfline }
 				}
-	
 				\bar "|."
-			}
+			}%Format
-			{
+
+			\new Voice = "pipes" {
 				\pipesA s8
 
 				\pipesB
@@ -39,5 +39,26 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8
+		\pipesA s8
+
+		\pipesB
+		\pipesBA s8
+		\pipesBB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }

3-4_marches/ballad_of_the_green_berets/lyrics.ly

@@ -58,10 +58,15 @@
   \fill-line{
 	\column {
 	  \verseAblock
+	}
 	\combine \null \vspace #0.5
+	\column {
 	  \verseBblock
+	}
 	  \combine \null \vspace #0.5
+	\column {
 		\verseCblock
 	}
 	}
   }
+}

3-4_marches/ballad_of_the_green_berets/notes.lyrics.ily

@@ -19,25 +19,25 @@ lyricsAB = {
 	c8 [ c8 ] c4. a8 |
 	b8 [ b8 ] a2 |
 	e8 [ e8 ] e4. e8 |
-	\tuplet 3/2 { f8 f8 e8 } e2 | 
+	\tuplet 3/2 { f8 f8 e8 } e4. e8 |
 
 	A8 [ A8 ] A4. f8 |
-	d8 [ f8 ] e2 |
+	d8 [ f8 ] e4. e8 |
 	c8 [ c8 ] b4. c16 [ c16 ] |
 	b8. a16 a2 |
 }
 
 verseA = \lyricmode {
 	\set stanza = #"1."
-	Fight- ing sol- diers from the sky
+	Fight -- ing sol -- diers from the sky
-	Fear- less men who jump and die
+	Fear -- less men who jump and die
 	Men who mean just what they say
-	The brave men of the Green Ber- et
+	The brave men of the Green Ber -- et
 
-	Sil- ver wings  u- pon their chest
+	Sil -- ver wings  u -- pon their chest
-	These are men, the Neth- er- lands' best
+	These are men, the Neth -- er -- lands' best
-	One hun- dred men will test today
+	One hun -- dred men will test to -- day
-	But only three win the Green Ber- et
+	But on -- ly three win the Green Ber- et
 }
 verseAblock = \markup \column {
   	\line{ \bold "1." }

3-4_marches/balmoral/notes.pipes.seconds.ily

@@ -1,7 +1,7 @@
 % 3/4 Balmoral (seconds)
 % Pipes
 \version "2.18.2"
-composerPipessecnd = ""
+composerPipesSecnd = ""
 pipessecndglobal = {
 	\bagpipeKey
 	}

3-4_marches/balmoral/notes.pipes.thirds.ily

@@ -1,7 +1,7 @@
 % 3/4 Balmoral (thirds)
 % Pipes
 \version "2.18.2"
-composerPipesthrd = ""
+composerPipesThrd = ""
 pipesthrdglobal = {
 	\bagpipeKey
 	}

3-4_marches/balmoral/pipes.full.ly

@@ -7,44 +7,54 @@
 \include "./notes.pipes.seconds.ily"
 \include "./notes.pipes.thirds.ily"
 
+\layout {
+	indent = 8.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
-		\new Staff = "pipes"  {
+		\new Staff = "pipes" \with{
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\global
 			\pipeglobal
-			\set Staff.instrumentName = \markup{ \instrumentPipes }
-			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
-				{
+			  	\new NullVoice = "format" {
 					\repeat volta 2 { \line }
 					\break
 					\repeat volta 2 { \line }
 				}%Format
-				{
+				\new Voice = "pipes" {
 					\pipesA
 
 					\pipesB
 				}%Pipes
 			>>
 		}
-		\new Staff = "seconds" {
+		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd}
+		} {
 			\pipessecndglobal
-			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
-			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
 
 			\pipessecndA
 
 			\pipessecndB
+
 		}
-		\new Staff = "thirds" {
+		\new Staff = "thirds" \with {
+			instrumentName = \markup{ \instrumentPipesThrd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesThrd}
+		} {
 			\pipesthrdglobal
-			\set Staff.instrumentName = \markup{ \instrumentPipes Thirds }
-			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 3rd }
 
 			\pipesthrdA
 
 			\pipesthrdB
 		}
+
 	>>
 	\header {
 		title = \title
@@ -63,3 +73,48 @@
 		}
 	}
 }
+\score {
+	\new StaffGroup <<
+		\global
+		\new Staff = "pipes" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\pipeglobal
+			%%Tune
+			\pipesA
+			\pipesB
+
+		}
+		\new Staff = "seconds" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
+			\pipessecndglobal
+			%% Seconds
+			\pipessecndA
+			\pipessecndB
+
+		}
+		\new Staff = "thirds" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipesThrd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesThrd }
+		} {
+			\pipesthrdglobal
+			%% Thirds
+			\pipesthrdA
+			\pipesthrdB
+
+		}
+	>>
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}

3-4_marches/balmoral/pipes.ly

@@ -29,3 +29,24 @@
 		composer = \composerPipes
 	}
 }
+
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\repeat unfold 2 {
+			\pipesA
+		}
+		\repeat unfold 2 {
+			\pipesB
+		}
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}

3-4_marches/balmoral/pipes.seconds.ly

@@ -25,7 +25,28 @@
 	\header {
 		title = \title
 		meter = \meter
-		instrument = \instrumentPipessecnd
+		instrument = \instrumentPipesSecnd
-		composer = \composerPipessecnd
+		composer = \composerPipesSecnd
 	}
 }
+\score {
+	\new Staff { \global \pipessecndglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\repeat unfold 2 {
+			\pipessecndA
+		}
+		\repeat unfold 2 {
+			\pipessecndB
+		}
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSecnd
+		composer = \composerPipesSecnd
+		arranger = \arrangerPipesSecnd
+	}
+
+}

3-4_marches/balmoral/pipes.thirds.ly

@@ -25,7 +25,28 @@
 	\header {
 		title = \title
 		meter = \meter
-		instrument = \instrumentPipesthrd
+		instrument = \instrumentPipesThrd
+		composer = \composerPipesThrd
+	}
+}
+\score {
+	\new Staff { \global \pipesthrdglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\repeat unfold 2 {
+			\pipesthrdA
+		}
+		\repeat unfold 2 {
+			\pipesthrdB
+		}
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentThrd
 		composer = \composerPipesthrd
+		arranger = \arrangerPipesthrd
 	}
+
 }

3-4_marches/collins_cattle/notes.pipes.ily

@@ -2,6 +2,7 @@
 % Pipes
 \version "2.18.2"
 composerPipes = ""
+arrangerPipes = ""
 pipeglobal = {
 	\bagpipeKey
 	}

3-4_marches/collins_cattle/pipes.ly

@@ -26,5 +26,27 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\repeat unfold 2 {
+			\pipesA
+		}
+		\repeat unfold 2 {
+			\pipesB
+		}
+
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }

3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily

@@ -2,6 +2,7 @@
 % Pipes
 \version "2.18.2"
 composerPipes = "R. Watt"
+arrangerPipes = ""
 pipeglobal = {
 	\bagpipeKey
 	}

3-4_marches/lochanside/notes.pipes.ily

@@ -2,6 +2,7 @@
 % Pipes
 \version "2.18.2"
 composerPipes = "PM J. MacLellan, DCM"
+arrangerPipes = ""
 pipeglobal = {
 	\bagpipeKey
 }

3-4_marches/lochanside/pipes.ly

@@ -38,6 +38,7 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
 \score {
@@ -57,5 +58,6 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }

3-4_marches/my_land/pipes.ly

@@ -32,6 +32,7 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
 \score {
@@ -50,5 +51,6 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }

3-4_marches/on_the_road_to_passchendaele/full.ly

@@ -9,13 +9,19 @@
 \include "./notes.side.ily"
 \include "./notes.pipes.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 }
 			<<
 				{
 					\repeat volta 2 { \line }		\break
@@ -37,10 +43,11 @@
 				}%Pipes
 			>>
 		}
-		\new PipeBandDrumStaff = "side" {
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup { \shortInstrumentSide }
+		} {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			\snareAA
 			\snareAB
@@ -67,14 +74,14 @@
 			\column \right-align {
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				%$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+				%$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
 			}
 			\column \right-align {
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				%$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+				%$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
 			}
 		}
 	}

3-4_marches/on_the_road_to_passchendaele/full.lyrics.ly

@@ -11,14 +11,21 @@
 \include "./notes.lyrics.ily"
 
 
+\layout {
+	indent = 7.0
+	short-indent = 5.0
+}
+
 #(set-default-paper-size "a4" 'portrait)
+
 \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 }
 			<<
 				{
 					\repeat volta 2 { \line }		\break
@@ -63,11 +70,11 @@
 				  \verseBBA
 				}
 			}
-		\new PipeBandDrumStaff = "side" {
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup { \shortInstrumentSide }
+		} {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
-
 			\snareAA
 			\snareAB
 

3-4_marches/on_the_road_to_passchendaele/pipes.ly

@@ -36,3 +36,23 @@
 		composer = \composerPipes
 	}
 }
+
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\pipesA \pipesA
+
+		\pipesB \pipesBA
+		\pipesB \pipesBB
+
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}

3-4_marches/red_hackle/config.ily

@@ -13,5 +13,5 @@ halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
-title = "Red Hackle"
+title = "Red Hackle Pipeband"
 meter = "Retreat"

3-4_marches/red_hackle/notes.pipes.ily

@@ -6,24 +6,24 @@ pipeglobal = {
 	\bagpipeKey
 	}
 pipesA = {
-	\grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] \bar "|"
+	\grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] |
-	\thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|"
+	\thrwd d8 [ f8 ] \dblf f4 \grg e4 |
-	\grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] |
-	\thrwd d8. [ c16 ] \dblb b2 \bar "|" \break
+	\thrwd d8. [ c16 ] \dblb b2 |
 
-	\grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] \bar "|"
+	\grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] |
-	\thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|"
+	\thrwd d8 [ f8 ] \dblf f4 \grg e4 |
-	\grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] |
-	\thrwd d8. [ b16 ] \grG a2 
+	\thrwd d8. [ b16 ] \grG a2 |
 }
 pipesB = {
-	A8 [ c8 ] \grip c4 \grg a8 [ \grd c8 ] \bar "|"
+	A8 [ c8 ] \grip c4 \grg a8 [ \grd c8 ] |
-	\thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|"
+	\thrwd d8 [ f8 ] \dblf f4 \grg e4 |
-	A8 [ c8 ] \grip c4 \grg a8 [ f8 ] \bar "|"
+	A8 [ c8 ] \grip c4 \grg a8 [ f8 ] |
-	\grg e8. [ d16 ] \dblb b2 \bar "|" \break
+	\grg e8. [ d16 ] \dblb b2 |
 
-	A8 [ c8 ] \grip c4 \grg a8 [ \grd c8 ] \bar "|"
+	A8 [ c8 ] \grip c4 \grg a8 [ \grd c8 ] |
-	\thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|"
+	\thrwd d8 [ f8 ] \dblf f4 \grg e4 |
-	\grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] |
-	\thrwd d8. [ b16 ] \grG a2 
+	\thrwd d8. [ b16 ] \grG a2 |
 }

3-4_marches/shoals_of_herring/notes.pipes.ily

@@ -1,4 +1,4 @@
-% <<TimeSig>> <<Title>>
+% 3/4 Shoals of Herring
 % Pipes
 \version "2.18.2"
 composerPipes = ""

defs.ily

@@ -3,28 +3,50 @@
 
   Not critical if missing. But there is complaining..
 %}
+% instrumentName
 instrumentSide = "Side"
 instrumentTenor = "Tenor"
 instrumentBass = "Bass"
 instrumentLyrics = "Lyrics"
 instrumentPipes = "Pipes"
-instrumentPipessecnd = "Seconds"
+instrumentPipesSecnd = "Seconds"
-instrumentPipesthrd = "Thirds"
+instrumentPipessecnd = \instrumentPipesSecnd %TODO: Remove Me
+instrumentPipesThrd = "Thirds"
+instrumentPipesthrd = \instrumentPipesThrd %TODO: Remove Me
 instrumentSecnd = "Seconds"
 instrumentThrd = "Thirds"
+
+% shortInstrumentName
 shortInstrumentLyrics = ""
 shortInstrumentSide = "S.D."
 shortInstrumentTenor = "T.D."
 shortInstrumentBass = "B.D."
 shortInstrumentPipes = "P."
-shortInstrumentPipessecnd = "P2"
+shortInstrumentPipesSecnd = "P.2"
-shortInstrumentPipesthrd = "P3"
+shortInstrumentPipessecnd = \shortInstrumentPipesSecnd %TODO: Remove Me
+shortInstrumentPipesThrd = "P.3"
+shortInstrumentPipesthrd = \shortInstrumentPipesThrd %TODO: Remove Me
 shortInstrumentSecnd = "2nd"
 shortInstrumentThrd = "3rd"
+
+% composer
 composerLyrics = ""
 composerSide  = ""
 composerTenor = ""
 composerBass  = ""
 composerPipes = ""
-composerPipessecnd = ""
+composerPipesSecnd = ""
-composerPipesthrd = ""
+composerPipessecnd = \composerPipesSecnd %TODO: Remove Me
+composerPipesThrd = ""
+composerPipesthrd = \composerPipesThrd %TODO: Remove Me
+
+% arranger
+arrangerLyrics = ""
+arrangerSide  = ""
+arrangerTenor = ""
+arrangerBass  = ""
+arrangerPipes = ""
+arrangerPipesSecnd = ""
+arrangerPipessecnd = \arrangerPipesSecnd %TODO: Remove Me
+arrangerPipesThrd = ""
+arrangerPipesthrd = \arrangerPipesThrd %TODO: Remove Me

template/pipes.full.ly

@@ -7,6 +7,11 @@
 \include "./notes.pipes.seconds.ily"
 %\include "./notes.pipes.thirds.ily"
 
+\layout {
+	indent = 8.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
 		\new Staff = "pipes" \with {
@@ -25,15 +30,15 @@
 			>>
 		}
 		\new Staff = "seconds" \with {
-			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+			instrumentName = \markup{ \instrumentPipesSecnd }
-			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd}
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
 		} {
 			\pipessecndglobal
 
 		}
 %{		\new Staff = "thirds" \with {
-			instrumentName = \markup{ \instrumentPipes \instrumentThrd }
+			instrumentName = \markup{ \instrumentPipesThrd }
-			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentThrd}
+			shortInstrumentName = \markup{ \shortInstrumentPipeTthrd }
 		} {
 			\pipesthrdglobal
 
@@ -60,24 +65,33 @@
 \score {
 	\new StaffGroup <<
 		\global
-		\new Staff = "pipes" {
+		\new Staff = "pipes" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\pipeglobal
-			\set Staff.midiInstrument = #"bagpipe"
 			%%Tune
 
 		}
-		\new Staff = "seconds" {
+		\new Staff = "seconds" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
 			\pipessecndglobal
-			\set Staff.midiInstrument = #"bagpipe"
 			%% Seconds
 
 		}
-%		\new Staff = "thirds" {
+%{		\new Staff = "thirds" \with {
-%			\pipesthrdglobal
+			midiInstrument = #"bagpipe"
-%			\set Staff.midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipesThrd }
-%			%% Thirds
+			shortInstrumentName = \markup{ \shortInstrumentPipeThrd }
-%
+		} {
-%		}
+			\pipesthrdglobal
+			%% Thirds
+
+%}		}
 	>>
 	\midi { \confTempo }
 	\header {

template/pipes.ly

@@ -31,6 +31,7 @@
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
+
 	}
 	\midi { \confTempo }
 	\header {

template/pipes.thirds.ly

@@ -28,7 +28,7 @@
 	}
 }
 \score {
-	\new Staff { \global \pipethrdglobal
+	\new Staff { \global \pipesthrdglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
 	}