Merge branch 'tunekeys'

airs/abide_with_me/config.ily

@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 4/4
+	\key a \mixolydian
 }
 confTempo = {
   	\tempo 4 = 60

airs/abide_with_me/notes.pipes.ily

@@ -4,8 +4,8 @@
 composerPipes = "W. H. Monk"
 arrangerPipes = "J.J. van Ommen Kloeke"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipes = {
 	\grg c2 \grip c4 \gre b4 

airs/alexander_mackenzie/config.ily

@@ -2,7 +2,8 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = {
 	\tempo 4. = 60
 }

airs/alexander_mackenzie/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesAA = {
 	\grg e16. [ d32 ] |

airs/alexander_mackenzie/notes.pipes.seconds.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipessecnd = ""
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipessecndA = {
 	\grg c16. [ f32 ] |
 	\dble e8 [ \grg c8. d16 ] \grg c4 \grg c8 |

airs/going_home/config.ily

@@ -1,7 +1,7 @@
 \version "2.19.0"
 %% Globals
 global = {
-	\key d \major
+	\key a \mixolydian
 	\time 6/8
 	}
 confTempo = {

airs/going_home/notes.pipes.ily

@@ -4,7 +4,7 @@
 composerPipes = "A. Dvořák (W. A. Fisher)"
 arrangerPipes = ""
 pipeglobal = {
-	\key a \major
+	\key a \mixolydian
 }
 % Music
 pipesAA = {
@@ -42,4 +42,4 @@ pipesBB = {
 	\grg f4 g8 \dblA A4. |
 	\grg b4 c8 \grg b4 \grG a8 |
 	\grg a4. \wbirl a4.
-	}
+	}

airs/highland_cathedral/config.ily

@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 4/4
+	\key d \major
 	}
 confTempo = { 
 	\tempo 4 = 40 

airs/highland_cathedral/notes.pipes.ily

@@ -1,10 +1,11 @@
 % 4/4 Highland Cathedral
 % Pipes
 \version "2.18.2"
-composerPipes = "arr. Marc Gouswaart"
+composerPipes = "M. Korb, U. Roever, 1982"
+arrangerPipes = "Marc Gouswaart"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	d4. e16 [ f16 ] \dble e8 [ d8 ] \grg a8 [ d8 ] |

airs/highland_cathedral/pipes.ly

@@ -42,6 +42,7 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
 \score {
@@ -59,5 +60,6 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }

airs/miss_kirkwood/config.ily

@@ -2,8 +2,8 @@
 %% Globals
 global = {
 	\time 6/8
-  }
-
+	\key a \mixolydian
+}
 confTempo = {
   	\tempo 4. = 46
 }

airs/miss_kirkwood/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	e8 |

airs/miss_kirkwood/notes.pipes.seconds.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipesSecnd = ""
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipessecndA = {
 	e8 |
 	\dble e4. \dbld d4 c8 |

airs/morag_of_dunvegan/config.ily

@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 2. = 45 
-	}
+}
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace {s1} s2. | }

airs/morag_of_dunvegan/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "N. Mathieson"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	\grg c4 \grip c8 \dblc c8 [ \gre b8 \grG a8 ] |

airs/salute_to_the_royal_fendersmith/config.ily

@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 12/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4. = 40 
-	}
+}
 %% Format
 part = { \partial 4. \grace{s4.} s4. }
 measure = { \grace {s1} s1. | }

airs/salute_to_the_royal_fendersmith/notes.pipes.ily

@@ -4,7 +4,7 @@
 composerPipes = "PM J.M. Banks"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {

airs/salute_to_the_royal_fendersmith/notes.pipes.seconds.ily

@@ -4,7 +4,7 @@
 composerPipesSecnd = "PM J.M. Banks"
 arrangerPipesSecnd = ""
 pipessecndglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipessecndAA = { % Same as pipesA

airs/salute_to_the_royal_fendersmith/pipes.full.c.ly

@@ -0,0 +1,59 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+\include "./notes.pipes.seconds.ily"
+%\include "./notes.pipes.thirds.ily"
+
+mbreak = \break
+pipes = {\pipeglobal \pipesA \pipesB }
+pipesII = {
+			\pipessecndglobal
+  \pipessecndAA \pipessecndAB
+  \pipessecndBA \pipessecndBB
+}
+
+\score {
+	\new StaffGroup <<
+		\new Staff = "pipes" \with{
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\global
+			<<
+			  	\new NullVoice = "format" {
+					\part \halfline \mbreak \halfline \bar "||"
+					\break
+					\halfline \mbreak \halfline \bar "|."
+				}%Format
+				\set Staff.printPartCombineTexts = ##f
+				\partcombine \pipes \pipesII
+			>>
+		}
+%		\new Staff = "thirds" \with {
+%			instrumentName = \markup{ \instrumentPipes \instrumentThrd }
+%			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentThrd}
+%		} {
+%			\pipesthrdglobal
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerPipesthrd))  #{ \markup {\line { \composerPipesthrd  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerPipesthrd))  #{ \markup {\line { \instrumentPipesthrd }}#} )
+			}
+		}
+	}
+}

airs/the_mist_covered_mountains/config.ily

@@ -2,8 +2,8 @@
 %% Globals
 global = {
 	\time 6/8
-	}
-
+	\key b \minor
+}
 confTempo = {
   \tempo 2. = 40
 }

airs/the_mist_covered_mountains/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key b \minor
+}
 % Music
 pipesA = {
  \grg b4. \taor b4. |

airs/the_mist_covered_mountains/pipes.ly

@@ -9,21 +9,14 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			{
-			  	\repeat volta 2 { 
-					\line 
-			  	} 
-			  	\break
-				\repeat volta 2 {
-					\line
-				}
-			}%Format
-			{
-			  \pipesA
-			  \pipesB
-			}
-		>>
+	
+	   	\repeat volta 2 { 
+	 		\pipesA
+	   	} 
+	   	\break
+	 	\repeat volta 2 {
+	 		\pipesB
+	 	}
 	}
 	\header {
 		title = \title