Merge branch 'tunekeys'

6-8_marches/10th_hli_crossing_the_rhine/notes.pipes.ily

@@ -4,8 +4,8 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesAA = {
 	\grg a8 |

6-8_marches/72nd_highlanders/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	\grg f8. [ e16 ] |

6-8_marches/cock_o_the_north/config.ily

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

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

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

6-8_marches/farewell_to_the_creeks/config.ily

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

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

@@ -4,8 +4,9 @@
 composerPipes = "PM J. Robertson"
 arrangerPipes = "Seaforths of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
+
 % Music
 pipesA = {
 	A8 |

6-8_marches/glendaruel_highlanders/config.ily

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

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

@@ -6,7 +6,7 @@ composerPipesAdd = ", pts 3 & 4 PM D. R. MacLennan" % Seaforth Highlanders
 composerPipes = \markup { \composerPipes \composerPipesAdd }
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {

6-8_marches/hills_of_glenorchy/config.ily

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

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

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

6-8_marches/kilaloe/full.48th.ly

@@ -27,10 +27,13 @@ part = { \partial 4. \grace {s4} s4. }
 					\break
 					\line \bar "||"
 					\break
+
 					\part
 					\line
 					\break
-					\line \bar ".|:-||"
+					\line
+					\bar ".|:-||"
+
 					\break
 					\repeat volta 2 {
 						\part
@@ -77,11 +80,11 @@ part = { \partial 4. \grace {s4} s4. }
 		} {
 			\sideglobal
 
+			\repeat unfold 2 {
 				\snareA \snareA s4.
+			}
 
-				\snareB \snareB s4.
-
-				\snareC
+			\snareC s4.
 
 		}
 		\new PipeBandDrumStaff = "tenor" \with {
@@ -90,14 +93,13 @@ part = { \partial 4. \grace {s4} s4. }
 		} {
 			\tenorglobal
 
-			r4. \tenorAA
-			\tenorAB
+			\repeat unfold 2 {
+				r4. \tenorAA r4. |
+				\tenorAB s4. |
+			}
 
-			r4.	\tenorAA
-			\tenorAB
-
-			r4. \tenorBA
-			\tenorBB
+			r4. \tenorBA r4. |
+			\tenorBB s4. |
 			| % Volta bracket for pipes
 		}
 %		\new PipeBandDrumStaff = "bass" \with {
@@ -110,6 +112,7 @@ part = { \partial 4. \grace {s4} s4. }
 	>>
 	\header {
 		title = \title
+		band = "48th HIGHRS"
 		meter = \meter
 		composer = \markup \large {
 			\column \right-align {

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

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

6-8_marches/kilaloe/notes.side.48th.ily

@@ -2,20 +2,20 @@
 % Side
 \version "2.18.2"
 composerSide = ""
-arrangerSide = "48th HIGHRS, 2018"
+arrangerSide = "2018"
 sideglobal = {}
 
 % Music
 snareA = \drummode {
-		d4.:32(\< |
-		d4)\! g8 \flam d4 g8 |
-		d4.:32( d4.:32)(\<|
-		d4) \!g8 \flam d8 g d |
-		g4.:32( d4.:32)(\<|
-		d4)\! g8 \flam d4 g8:32( |
-		d8) g d \flam g8 d g |
-		\flam d4. d4.:32( |
-		d4.)
+	d4.:32(\< |
+	d4)\! g8 \flam d4 g8 |
+	d4.:32( d4.:32)(\<|
+	d4) \!g8 \flam d8 g d |
+	g4.:32( d4.:32)(\<|
+	d4)\! g8 \flam d4 d8:32( |
+	d8) g d \flam g8 d g |
+	\flam d4. d4.:32( |
+	d4.)
 }
 snareB = \drummode { \snareA }
 
@@ -35,12 +35,9 @@ snareC = \drummode {
 	d2.:32( |
 	d4.) \flam d8 g d |
 	g2.:32( |
-	d4) g8:32( d4) g8:32( |
+	d4) g8:32( g4) d8:32( |
 	d8) g d \flam d4. |
-	r4. r4 g8:32( |
+	r4. r4 d8:32( |
 	d8) g d \flam d4 g8 |
-	d4.:32( d4)
+	d4.:32(
 }
-
-
-

6-8_marches/kilaloe/notes.tenor.ily

@@ -10,7 +10,7 @@ tenorAA = \drummode {
 	d4. g4. | d4. r4.\rswipe | 
 	d4. g4. | d4. r4.\rswipe |
 	d4. g4. | d4. g4. |
-	d4.\up g4.\up | d4.\up r4. |
+	d4.\up g4.\up | d4.\up
 }
 tenorAB = \drummode {
 	\flourish{
@@ -18,7 +18,7 @@ tenorAB = \drummode {
 	  d4. d4. | g4. g4. |
 	  d4. d4. | g4. g4. |
 	}
-	d4.\up g4.\up | d4.\up r4. |
+	d4.\up g4.\up | d4.\up
 }
 tenorBA = \drummode {
 	\tenorAA
@@ -30,5 +30,5 @@ tenorBB = \drummode {
 	  d4. d4. | g4. g4. |
 	}
 	r4. r4. |
-	d4.\up g4.\up | d4.\up r4. |
+	d4.\up g4.\up | d4.\up
 }

6-8_marches/kilaloe/side.48th.ly

@@ -44,7 +44,8 @@ part = {\partial 4. \grace{ s4 } s4. }
 		>>
 	}
 	\header {
-		title = \markup \column { \title \normalsize "48th HIGHRS" }
+		title = \title
+		band = "48th HIGHRS"
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide

6-8_marches/kilaloe/tenor.ly

@@ -17,11 +17,11 @@
 			}%Format
 			
 			\new DrumVoice = "tenor" {
-				\tenorAA
-				\tenorAB
+				\tenorAA r4. |
+				\tenorAB r4. |
 
-				\tenorBA
-				\tenorBB
+				\tenorBA r4. |
+				\tenorBB r4. |
 			}
 		>>
 	}

6-8_marches/piobaireachd_of_donald_dubh/config.ily

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

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

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

6-8_marches/the_steamboat/config.ily

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

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

@@ -4,8 +4,8 @@
 composerPipes = "Trad., 1936"
 composerPipesAdd = ", pts 3 & 4 by R. Petre" %Ruaraith Petre
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	e8 |