Merge branch 'tunekeys'

4-4_marches/48th_highlanders_of_holland/notes.pipes.ily

@@ -4,7 +4,7 @@
 composerPipes = "PM Rev. Dr. K. B. Bice, 2015"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {

4-4_marches/51st_highland_division/config.ily

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

4-4_marches/51st_highland_division/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesAAA = {
 	\dble e8. [ c16 ] |
 	a4 \taor a8. [ b16 ] \dblc c8 [ \gre b8 ] \dblc c8 [ e8 ] |

4-4_marches/auld_lang_syne/config.ily

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

4-4_marches/auld_lang_syne/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "Trad."
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
  e4 |
  \grg a4~ a8 [ \wbirl a8 ] \gre a4 \grd c4 |

4-4_marches/auld_lang_syne/pipes.d.ly

@@ -0,0 +1,30 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+\score {
+    \transpose a d {
+	  \new Staff {
+		\global
+		\pipeglobal
+		\repeat volta 2 { 
+			\partial 4
+			\pipesA s4
+		}
+		\break
+		\repeat volta 2 {
+			\partial 4
+			\pipesB s4
+		}
+	}
+  }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}

4-4_marches/battle_of_waterloo/config.ily

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

4-4_marches/battle_of_waterloo/notes.pipes.ily

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

4-4_marches/bonnie_galloway/notes.pipes.ily

@@ -5,29 +5,25 @@
 hvthrwd = { \gripthrwd }
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
-pipesA = {
-	\grg f4 f8 [ c8 ] \grg e4 d4 |
-	\grg b8 [ d8 ] d4 \grg a2 |
-	\grg a4 a8 [ b8 ] \hvthrwd d4 f4 |
-	\grg e4 e8 [ f8 ] \dble e4 a4 | 
-
-	\grg f4 f8 [ c8 ] \grg e4 d4 |
-	\grg b8 [ d8 ] d4 \gre a2 |
-	\grg a4 a8 [ b8 ] \hvthrwd d4 f4 |
-	\grg e4 e8 [ d8 ] \dbld d2 
+pipesAA = {
+	\grg f4~ f8 [ c8 ] \grg e4 d4 |
+	\grg b8 [ d8~ ] d4 \grg a2 |
+	\grg a4~ a8 [ b8 ] \hvthrwd d4 f4 |
+	\grg e4~ e8 [ f8 ] \dble e4 a4 | 
+}
+pipesAB = {
+	\grg f4~ f8 [ c8 ] \grg e4 d4 |
+	\grg b8 [ d8~ ] d4 \gre a2 |
+	\grg a4~ a8 [ b8 ] \hvthrwd d4 f4 |
+	\grg e4~ e8 [ d8 ] \dbld d2 
 }
 
-pipesB = {
-	\dblA A4 A8 [ \grg A8 ] f4 \hvthrwd d4 |
+pipesBA = {
+	\dblA A4~ A8 [ \grg A8 ] f4 \hvthrwd d4 |
 	\dblA A4 d4 \dblf f2 |
-	\dblA A4 A8 [ \grg A8 ] f4 \hvthrwd d4 |
+	\dblA A4~ A8 [ \grg A8 ] f4 \hvthrwd d4 |
 	\grg c8 [ b8 ] \grg c8 [ d8 ] \dble e4 a4 | 
-
-	\grg f4 f8 [ c8 ] \grg e4 d4 |
-	\grg b8 [ d8 ] d4 \grg a2 |
-	\grg a4 a8 [ b8 ] \hvthrwd d4 f4 |
-	\grg e4 e8 [ d8 ] \dbld d4 
 }

4-4_marches/bonnie_lass_o_fyvie/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "Trad."
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 pipesA = {
 	a8 |
 	\thrwd d4 \dbld d8. [ e16 ] \thrwd d4~ d8 [ a8 ] |

4-4_marches/cabar_feidh/config.ily

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

4-4_marches/cabar_feidh/notes.pipes.agira.ily

@@ -6,7 +6,7 @@ titleAgira = "Cabar Feidh (Agira Version)"
 meterAgira = "March"
 instrumentPipesAgira = "Pipes"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAgiraA = {

4-4_marches/cabar_feidh/notes.pipes.charge.ily

@@ -6,8 +6,8 @@ meterCharge = "The Charge"
 titleCharge = "Cabar Feidh"
 instrumentPipesCharge = "Pipes"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesChargeA = {
 	e8 |

4-4_marches/cabar_feidh/notes.pipes.ily

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

4-4_marches/cockney_jocks/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	a8 |

4-4_marches/dawning_of_the_day/config.ily

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

4-4_marches/dawning_of_the_day/notes.pipes.ily

@@ -1,10 +1,11 @@
 % 4/4 Dawning of the Day
 % Pipes
 \version "2.18.2"
-composerPipes = "Trad., arr. PM T.F.J. de Boone"
+composerPipes = "Trad."
+arrangerPipes = "PM T.F.J. de Boone"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipeAlines = {
  \grg a8 [ b8 ] |

4-4_marches/dawning_of_the_day/notes.pipes.seconds.ily

@@ -1,10 +1,11 @@
 % 4/4 Dawning of the Day
 % Pipes (Seconds)
 \version "2.18.2"
-composerPipessecnd = "Trad., arr. PM T.F.J. de Boone"
+composerPipesSecnd = "Trad."
+arrangerPipesSecnd = "PM T.F.J. de Boone"
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipessecndAA = {
 	\grg c8 [ d8 ] |
 	\grg e4 \grG e4 \grg e4 \grg d8 [ e8 ] |

4-4_marches/dawning_of_the_day/pipes.full.ly

@@ -45,11 +45,11 @@
 		composer = \markup \large {
 			\column \right-align {
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerPipesSecnd))  #{ \markup {\line { \composerPipesSecnd ":" }} #} )
 			}
 			\column \right-align {
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerPipesSecnd))  #{ \markup {\line { \instrumentPipesSecnd }}#} )
 			}
 		}
 	}

4-4_marches/dawning_of_the_day/pipes.ly

@@ -29,6 +29,7 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
 \score {
@@ -44,4 +45,11 @@
 		\pipesBB
 	}
 	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
 }

4-4_marches/dawning_of_the_day/pipes.seconds.ly

@@ -26,10 +26,12 @@
 	\header {
 		title = \title
 		meter = \meter
-		instrument = \instrumentPipessecnd
-		composer = \composerPipessecnd
+		instrument = \instrumentPipesSecnd
+		composer = \composerPipesSecnd
+		arranger = \arrangerPipesSecnd
 	}
-}\score {
+}
+\score {
 	\new Staff { \global \pipessecndglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
@@ -42,4 +44,11 @@
 		\pipessecndBB 
 	}
 	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipesSecnd
+		composer = \composerPipesSecnd
+		arranger = \arrangerPipesSecnd
+	}
 }

4-4_marches/flett_of_flotta/config.ily

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

4-4_marches/flett_of_flotta/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "PM Donald MacLeod"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	\grg f8. [ e16 ]  |
 	\dblc c8. [ e16 ] \dblc c8 [ \gre b8 ] \dblc c4 \gre a8 [ \grd c8 ]  |

4-4_marches/green_glens_of_antrim/notes.pipes.ily

@@ -4,8 +4,8 @@
 composerPipes = "Traditional"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-}
+	\key d \major
+  }
 % Music
 pipesA = {
 	a8. [ d16 ] |

4-4_marches/hills_of_argyll/config.ily

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

4-4_marches/hills_of_argyll/notes.pipes.ily

@@ -4,8 +4,8 @@
 composerPipes = "G. McIntyre"
 arrangerPipes = "S. Cassells"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesAA = {
  \grg a8. [ b16 ] |

4-4_marches/maple_leaf_forever/notes.pipes.ily

@@ -3,7 +3,7 @@
 \version "2.18.2"
 composerPipes = "Alexander Muir"
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 tb = { \pgrace { A32[ b ] } }
 % Music

4-4_marches/minstrel_boy/config.ily

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

4-4_marches/minstrel_boy/notes.pipes.ily

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

4-4_marches/rowan_tree/config.ily

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

4-4_marches/rowan_tree/notes.pipes.ily

@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA = {

4-4_marches/scotland_the_brave/config.ily

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

4-4_marches/scotland_the_brave/notes.pipes.ily

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

4-4_marches/the_crusaders_march/config.ily

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

4-4_marches/the_crusaders_march/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	\grg a8. [ b16 ]  |
 	\grg c4 \grip c4 \dblc c4 \gre a8. [ \grd c16 ]  |

4-4_marches/the_leaving_of_liverpool/config.ily

@@ -2,8 +2,8 @@
 %% Globals
 global = {
 	\time 4/4
-	}
-
+	\key a \mixolydian
+}
 %% Format
 part = { \partial 4 s4 }
 measure = { \grace { s4 } s1 | }

4-4_marches/the_leaving_of_liverpool/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesAA = {
 	\grg a8. [ b16 ] 
 	\grip c4 \dblc c8 [ e8 ] \thrwd d8 [ c8 ] \dblb b8 [ a8 ] |

4-4_marches/the_old_rustic_bridge/config.ily

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

4-4_marches/the_old_rustic_bridge/notes.pipes.ily

@@ -3,28 +3,28 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesAA = {
-\grg a8. [ d16 ] \bar "|"
- \grg f4 \gre f8. [ g16 ] \hdblf f4 \thrwd d8. [ c16 ] \bar "|"
- \dblb b4 \gre G8 [ \whslurd d8 ] \grg a4. \grd a8 \bar "|"
- \grg b4 \grg c8 [ d8 ] \dbld d4 \grg c8. [ d16 ] \bar "|"
- \grg e4 \gra e8. [ f16 ] \grg e4 \grg a8. [ d16 ] \bar "|"
+	\grg a8. [ d16 ] |
+	\grg f4 \gre f8. [ g16 ] \hdblf f4 \thrwd d8. [ c16 ] |
+	\dblb b4 \gre G8 [ \whslurd d8 ] \grg a4. \grd a8 |
+	\grg b4 \grg c8 [ d8 ] \dbld d4 \grg c8. [ d16 ] |
+	\grg e4 \gra e8. [ f16 ] \grg e4 \grg a8. [ d16 ] |
 }
 
 pipesAB = {
- \grg f4 \gre f8. [ g16 ] \hdblf f4 \thrwd d8. [ c16 ] \bar "|"
- \dblb b4 \gre G8 [\whslurd d8 ] \grg a4. \grd a8 \bar "|"
- \grg b4 \grg e8 [ g8 ] \grA f8 [ e8 ] \grg c8 [ a8 ] \bar "|"
- \thrwd d2 \dbld d4
+	\grg f4 \gre f8. [ g16 ] \hdblf f4 \thrwd d8. [ c16 ] |
+	\dblb b4 \gre G8 [\whslurd d8 ] \grg a4. \grd a8 |
+	\grg b4 \grg e8 [ g8 ] \grA f8 [ e8 ] \grg c8 [ a8 ] |
+	\thrwd d2 \dbld d4
 }
 
 pipesBA = {
- \grg e8. [ d16 ] \bar "|"
- \grg c4 \grip c8. [ d16 ] \grg e4 \grg f8 [ e8 ] \bar "|"
- \dble e4 \grg b8. [ c16 ] \thrwd d4. \grc d8 \bar "|"
- \dblc c4 \dblA A8 [ c8 ] \grg e8 [ d8 ] \grg c8 [ b8 ] \bar "|"
- \grg a4 \grg b4 \grip c4 \grg b8 [ \grG a8 ] \bar "|"
+	\grg e8. [ d16 ] |
+	\grg c4 \grip c8. [ d16 ] \grg e4 \grg f8 [ e8 ] |
+	\dble e4 \grg b8. [ c16 ] \thrwd d4. \grc d8 |
+	\dblc c4 \dblA A8 [ c8 ] \grg e8 [ d8 ] \grg c8 [ b8 ] |
+	\grg a4 \grg b4 \grip c4 \grg b8 [ \grG a8 ] |
 }

4-4_marches/the_pikemans_march/config.ily

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

4-4_marches/the_pikemans_march/notes.pipes.ily

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

4-4_marches/were_no_awa_tae_bide_awa/config.ily

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

4-4_marches/were_no_awa_tae_bide_awa/notes.pipes.ily

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

4-4_marches/wings/config.ily

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

4-4_marches/wings/notes.pipes.ily

@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA = {