New Tunes + small fixes

Banks of the Lee
Hills of Glenorchy
The Panda

fixes:
Sands of Kuwait
When the Pipers Play side

6-8_marches/hills_of_glenorchy/full.ly

@@ -0,0 +1,111 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\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 \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\global
+			\pipeglobal
+			<<
+				\new NullVoice = "format" {
+					\repeat volta 2 {
+						\part \halfline
+						\halfline
+					}
+					\break
+					\repeat volta 2 {
+						\part \halfline
+						\halfline
+					}
+				}%Format
+
+				\new Voice = "pipes" {
+					\pipesA s8
+
+					\pipesB s8
+				}%Pipes
+			>>
+		}
+%{		\new Staff = "song" {
+  			\lyricsglobal
+			\new Voice = "lyrics" {
+
+			}
+		}
+}%
+%{		\new Lyrics = "verse1" {
+		  \lyricsglobal
+		  \lyricsto "lyrics" {
+			\verseA
+		  }
+		}
+%}
+%{		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
+		} {
+			\pipessecndglobal
+
+		}
+%}
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
+			\sideglobal
+
+			\snareA s8
+			\snareB s8
+		}
+%{		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+		}
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
+			\bassglobal
+
+		}
+%}
+	>>
+	\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 }}#} )
+			}
+		}
+	}
+}

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

@@ -0,0 +1,33 @@
+% 6/8 Hills of Glenorchy
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+arrangerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+}
+% Music
+pipesA = {
+	A8 |
+	\hdble e4 a8 \grg a4 \taor a8 |
+	\grg e4 \grip e8 \dblg g4 d8 |
+	\dblb b8. \gre a16 \grd b8  \grg G8. \grd G16 \gre G8 |
+	\grg b16 \grd G8. \grd b8  \thrwd d4 f8 |
+
+	\dble e4 a8 \grg a4 \taor a8 |
+	\grg e4 \grip e8 \dblg g4 A8 |
+	g16 \grA e8. g8  \hdbld d8. b16 \grd G8  |
+	\grg a4 \taor a8 \wbirl a4
+}
+pipesB = {
+	\grg b32 d16. |
+	\grg e8. f16 e8 \dble e8. d16 \gre b8 |
+	\grg e8. f16 g8 \hdblf f4 e8 |
+	\thrwd d8. e16 d8 \dbld d8. b16 \grd G8 |
+	\thrwd d8. e16 \grg d8 \dblf f8. e16 d8 |
+
+	\grg e8. f16 e8  \dble e8. d16 \gre b8 |
+	\grg e8. f16 g8  \hdblf f4 e8 |
+	d16 \gre b8. \dblg g8  \hdbld d8. b16 \grd G8 |
+	\grg a4 \taor a8 \wbirl a4
+}

6-8_marches/hills_of_glenorchy/pipes.ly

@@ -0,0 +1,58 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\part \halfline
+					\break
+					\halfline
+				}
+				\break
+				\repeat volta 2 {
+					\part \halfline
+					\break
+					\halfline
+				}
+			}%Format
+
+			\new Voice = "pipes" {
+				\pipesA s8
+
+				\pipesB s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
+\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
+		arranger = \arrangerPipes
+	}
+}

airs/banks_of_the_lee/config.ily

@@ -0,0 +1,18 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\key d \major
+	\time 3/4
+	}
+confTempo = { 
+	\tempo 4 = 80 
+	}
+%% Format
+part = { \partial 8 \grace{s4.} s8 }
+measure = { \grace {s1} s2. | }
+halfline = { \repeat unfold 4 \measure }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Banks of the Lee"
+meter = "Air"

airs/banks_of_the_lee/notes.pipes.ily

@@ -0,0 +1,29 @@
+% 3/4 Banks of the Lee
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+arrangerPipes = "D. Rickard"
+pipeglobal = {
+	\bagpipeKey
+}
+% Music
+pipesA = {
+	\repeat volta 2 {
+		\grg b8  d8  |
+		\grg e4. f8 \grg e8  d8  |
+		e8  \grg a8~  a4. b8 |
+		\grg d8  e8~  e4 \grg d8  b8  |
+		\grg a8  \grd G8~  G4 \grg e8  g8  |
+		A4. g8 A8  g8  |
+		e8  \grg G8~  G4. a8 |
+	} \alternative {
+		{
+			\grg b4. a8 \grg b8  d8  |
+			\dble e2 
+		}
+		{
+			\grg b8  \grG a8~  a4. \wbirl a8 |
+			\gre a2 
+		}
+	}
+}

airs/banks_of_the_lee/pipes.ly

@@ -0,0 +1,40 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+
+		\partial 4
+		\pipesA
+		\bar "|."
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 4
+		%\unfoldRepeats \pipesA
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}

airs/sands_of_kuwait/notes.pipes.ily

@@ -8,7 +8,6 @@ pipeglobal = {
 }
 % Music
 pipesA = {
-	e8 |
 	a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ]~  f4 \grg e8 [ d8 ] |
 	\grg G4~ G8 [ \grd G8 ] ~ G8 [ d8 ] \grG a4 ~ a4 \grg \tuplet 3/2 { f8. [ e16 d8 ] } |
 	\grg a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ] ~ f4 \grg e8 [ d8 ] |
@@ -22,9 +21,9 @@ pipesA = {
 
 pipesBA = {
 	\dblA A4~ A8 [ a8 ] \grg \tuplet 3/2 { a8. [ d16 A8 ] } e16 [ f8. ]~ f4 \grg e8 [ d8 ] |
-	\grg G4~ G8 [ \grd G8 ]~ \tuplet 3/2 { G8. [ b16 d8 ] } \grG a4~ a8 [ f8 ] \tuplet 3/2 { f8. [ e16 d8 ] } |
+	\grg G4~ G8 [ \grd G8 ]~ \tuplet 3/2 { G8. [ b16 d8 ] } \grG a4~ a8 [ f8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } |
 	\dblA A4~ A8 [ a8 ] \grg \tuplet 3/2 { a8. [ d16 A8 ] } e16 [ f8. ]~ f4 \grg e8 [ d8 ] |
-	\dble e4 %{^te %} e8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4~ e8 [ f8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } |
+	\dble e4~ e8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4~ e8 [ f8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } |
 }
 
 pipesBBA = {
@@ -37,5 +36,5 @@ pipesBBB = {
 	a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ]~ f4 \grg e8 [ d8 ] |
 	\grg G4~ G8 [ \grd G8 ]~ G8 [ d8 ] \grG a4~ a4 \grg \tuplet 3/2 { a8. [ b16 c8 ] } |
 	\thrwd d4~ d8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4~ e8 [ a8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } |
-	\grg d4~ d4~ d4 \slurd d4~ d4 d4
+	\grg d4~ d4~ d4 \slurd d4~ d4~ d4
 }

airs/sands_of_kuwait/pipes.ly

@@ -9,31 +9,20 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			\new NullVoice = "format" {
-				\part
-				\repeat volta 2 {
-					\line
-				}
-				\break
-				\repeat volta 2 {
-					\halfline
-					\break
-				} \alternative {
-					{\halfline \break}
-					\halfline
-				}
-				\bar "|."
 
-			}%Format
+		\repeat volta 2 {
-			\new Voice = "pipes" {
+			\pipesA
-				\pipesA
+		}
+		\break
+		\repeat volta 2 {
+			\pipesBA
+			\break
+		} \alternative {
+			{\pipesBBA \break}
+			\pipesBBB
+		}
+		\bar "|."
 
-				\pipesBA
-				\pipesBBA
-				\pipesBBB
-			}
-		>>
 	}
 	\header {
 		title = \title
@@ -47,15 +36,20 @@
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
-
+		\unfoldRepeats {
-		\pipesA
+			\repeat volta 2 {
-		\pipesA
+				\pipesA
-
+			}
-		\pipesBA
+			\break
-		\pipesBBA
+			\repeat volta 2 {
-
+				\pipesBA
-		\pipesBA
+				\break
-		\pipesBBB
+			} \alternative {
+				{\pipesBBA \break}
+				\pipesBBB
+			}
+			\bar "|."
+		}
 
 	}
 	\midi { \confTempo }

airs/when_the_pipers_play/side.ly

@@ -12,7 +12,7 @@
 		<<
 			\new NullVoice = "format" {
 				\partial 4 s4
-				\repeat volta 2 {
+				\repeat volta 4 {
 					\halfline
 					\measure
 					\measure

jigs/the_panda/config.ily

@@ -0,0 +1,18 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\key d \major
+	\time 6/8
+	}
+confTempo = { 
+	\tempo 4. = 120 
+	}
+%% Format
+part = { \partial 8 \grace{s4.} s8 }
+measure = { \grace {s1} s2. | }
+halfline = { \repeat unfold 4 \measure }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "The Panda"
+meter = "Jig"

jigs/the_panda/notes.pipes.ily

@@ -0,0 +1,33 @@
+% 6/8 The Panda
+% Pipes
+\version "2.18.2"
+composerPipes = "R. Mathieson"
+arrangerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+}
+% Music
+pipesAA = {
+	\grg c8 [ a8 \grd a8 ] \grg d8 [ a8 \grd a8 ] |
+	e8 [ \grg e8 \gra e8 ] \grg e8 [ d8 c8 ] |
+	\grg c8 [ d8 \slurc d8 ] \grg G8 [ d8 G8 ] |
+	\grg c8 [ d8 e8 ] \grg e8 [ d8 b8 ] |
+}
+pipesAB = {
+	\grg c8 [ a8 \grd a8 ] \grg d8 [ a8 \grd a8 ] |
+	e8 [ \grg e8 \gra e8 ] \grg e8 [ d8 c8 ] |
+	\grg c8 [ d8 \slurc d8 ] \grg e8 [ d8 b8 ] |
+	\grg b8 [ a8 G8 ] \grg a4.
+}
+pipesBA = {
+	\grA g8 [ e8 \gra e8 ] \grg e8 [ f8 g8 ] |
+	A8 [ a8 A8 ] g8 [ e8 \gra e8 ] |
+	\grg c8 [ d8 \slurc d8 ] \grg G8 [ d8 G8 ] |
+	\grg c8 [ d8 e8 ] \grg e8 [ d8 b8 ] |
+}
+pipesBBA = {
+	\grA g8 [ e8 \gra e8 ] \grg e8 [ f8 g8 ] |
+	A8 [ a8 A8 ] g8 [ e8 \gra e8 ] |
+	\grg c8 [ d8 \slurc d8 ] \grg e8 [ d8 b8 ] |
+	\grg b8 [ a8 G8 ] \grg a4.
+}

jigs/the_panda/pipes.ly

@@ -0,0 +1,65 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+IIofII = \markup { "2." \text \small" of 2" }
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			\new NullVoice = "format" {
+				\halfline
+				\set Score.repeatCommands = #(list (list 'volta IIofII)) 
+				\halfline
+				\bar ":|."
+				\set Score.repeatCommands = #'((volta #f))
+				\break
+				
+				\halfline
+				\set Score.repeatCommands = #'((volta "1.")) 
+				\halfline
+				\bar ":|."
+				\set Score.repeatCommands = #'((volta #f)) 
+			}%Format
+			\new Voice = "pipes" {
+				\pipesAA
+				\pipesAB
+
+				\pipesBA
+				\pipesBBA
+
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\repeat unfold 2 {
+			\pipesAA \pipesAB
+		}
+
+		\pipesBA \pipesBBA
+		\pipesBA \pipesAB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}