Various Tune Fixes

Most are fixing (gracing) alignment by restructuring the Staff.

3-4_marches/green_hills_of_tyrol/pipes.ly

@@ -9,23 +9,13 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
+		\repeat volta 2 { 
-			\new NullVoice = "format" {
+			\pipesA 
-				\repeat volta 2 {
+		}
-					\line
+		\break
-				}
+		\repeat volta 2 {
-				\break
+			\pipesB
-				\repeat volta 2 {
+		}
-					\line
-				}
-			}%Format
-
-			\new Voice = "pipes" {
-				\pipesA
-
-				\pipesB
-			}
-		>>
 	}
 	\header {
 		title = \title

3-4_marches/lochanside/pipes.ly

@@ -9,29 +9,11 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
+		\repeat volta 2 { \pipesA }
-			\new NullVoice = "format" {
+		\break
-				\repeat volta 2 {
+		\repeat volta 2 { \pipesB }
-					\line
+		\break
-				}
+		\repeat volta 2 { \pipesC }
-				\break
-				\repeat volta 2 {
-					\line
-				}
-				\break
-				\repeat volta 2 {
-					\line
-				}
-			}%Format
-
-			\new Voice = "pipes" {
-				\pipesA
-
-				\pipesB
-
-				\pipesC
-			}
-		>>
 	}
 	\header {
 		title = \title

3-4_marches/my_land/pipes.ly

@@ -9,23 +9,13 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
+		\repeat volta 2 { 
-			\new NullVoice = "format" {
+			\pipesA 
-				\repeat volta 2 {
+		}
-					\line
+		\break
-				}
+		\repeat volta 2 {
-				\break
+			\pipesB
-				\repeat volta 2 {
+		}
-					\line
-				}
-			}%Format
-
-			\new Voice = "pipes" {
-				\pipesA
-
-				\pipesB
-			}
-		>>
 	}
 	\header {
 		title = \title

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

@@ -7,43 +7,43 @@ pipeglobal = {
 }
 % Music
 pipesAA = {
- \grg a8. [ b16 ] \grip c4~ c8 [ e8 ] |
+	\grg a8. [ b16 ] \grip c4~ c8 [ e8 ] |
- \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 |
+	\grg \tuplet 3/2 { d8 c8 b8 } \grG a2 |
- \thrwd d8. [ e16 ] \grg f4~ f8 [ A8 ] |
+	\thrwd d8. [ e16 ] \grg f4~ f8 [ A8 ] |
- \thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | 
+	\thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | 
 }
 pipesABA = {
- \grg c8. [ d16 ] \dble e4~ e8 [ f8 ] |
+	\grg c8. [ d16 ] \dble e4~ e8 [ f8 ] |
- \dble e8 [ c8 ] \dblb b8 [ \gre a8 ] a4 |
+	\dble e8 [ c8 ] \dblb b8 [ \gre a8 ] a4 |
- \grg b8 [ c8 ] \dble e8 [ f8 ] A8. [ f16 ] |
+	\grg b8 [ c8 ] \dble e8 [ f8 ] A8. [ f16 ] |
- \dble e8 [ a8 ] \dble c8 [ \gre b8~ ] b4
+	\dble e8 [ a8 ] \dble c8 [ \gre b8~ ] b4
 }
 pipesABB = {
- \grg c8 [ e8 ] \dblA A4~ A8 [ g8 ] |
+	\grg c8 [ e8 ] \dblA A4~ A8 [ g8 ] |
- A8. [ f16 ] \dble e8 [ a8 ] a4 |
+	A8. [ f16 ] \dble e8 [ a8 ] a4 |
- \grg \tuplet 3/2 { f8 e8 d8 } \dblc c4~ c8 [ e8 ] |
+	\grg \tuplet 3/2 { f8 e8 d8 } \dblc c4~ c8 [ e8 ] |
- \grg \tuplet 3/2 { d8 c8 b8 } \grG a2
+	\grg \tuplet 3/2 { d8 c8 b8 } \grG a2
 }
 
 pipesBA = {
-\grg e8. [ f16 ] \dble e4~ e8 [ c8 ] |
+	\grg e8. [ f16 ] \dble e4~ e8 [ c8 ] |
- \grg a8 [ c8 ] \dblf f8 [ e8 ] e4 |
+	\grg a8 [ c8 ] \dblf f8 [ e8 ] e4 |
- A8. [ g16 ] \dblA A4 A8 [ f8 ] |
+	A8. [ g16 ] \dblA A4 A8 [ f8 ] |
- \thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | 
+	\thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | 
 
- \grg c8. [ d16 ] \dble e4~ e8 [ f8 ] |
+	\grg c8. [ d16 ] \dble e4~ e8 [ f8 ] |
- \dble e8 [ c8 ] \dblb b8 [ \gre a8 ] a4 |
+	\dble e8 [ c8 ] \dblb b8 [ \gre a8 ] a4 |
- \grg b8 [ c8 ] \dble e8 [ f8 ] A8. [ f16 ] |
+	\grg b8 [ c8 ] \dble e8 [ f8 ] A8. [ f16 ] |
- \dble e8 [ a8 ] \dble c8 [ \gre b8 ] b4 | 
+	\dble e8 [ a8 ] \dble c8 [ \gre b8 ] b4 | 
 }
 pipesBB = {
- \grg a8. [ b16 ] \grip c4~ c8 [ e8 ] |
+	\grg a8. [ b16 ] \grip c4~ c8 [ e8 ] |
- \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 |
+	\grg \tuplet 3/2 { d8 c8 b8 } \grG a2 |
- \thrwd d8. [ e16 ] \grg f4~ f8 [ A8 ] |
+	\thrwd d8. [ e16 ] \grg f4~ f8 [ A8 ] |
- \thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | 
+	\thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | 
 
- \grg c8 [ e8 ] \dblA A4~ A8 [ g8 ] |
+	\grg c8 [ e8 ] \dblA A4~ A8 [ g8 ] |
- A8. [ f16 ] \dble e8 [ a8~ ] a4 |
+	A8. [ f16 ] \dble e8 [ a8~ ] a4 |
- \grg \tuplet 3/2 { f8 e8 d8 } \dblc c4~ c8 [ e8 ] |
+	\grg \tuplet 3/2 { f8 e8 d8 } \dblc c4~ c8 [ e8 ] |
- \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 
+	\grg \tuplet 3/2 { d8 c8 b8 } \grG a2 
 }

3-4_marches/pipe_major_jk_cairns/pipes.ly

@@ -9,30 +9,19 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\halfline
+					\pipesAA
 				} \alternative {
-					\halfline
+					\pipesABA
-					\halfline
+					\pipesABB
 				}\bar "|."
 
 				\break
-				\line \bar "||"
-				\break
-				\line \bar "|."
-			}%Format
-			
-			\new Voice = "pipes" {
-				\pipesAA
-				\pipesABA
-				\pipesABB
-
 				\pipesBA
+				\bar "||"
+				\break
 				\pipesBB
-			}
+				\bar "|."
-		>>
 	}
 	\header {
 		title = \title

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

@@ -1,4 +1,4 @@
-% <<TimeSig>> <<Title>>
+% 3/4 Red Hackle Pipeband
 % Pipes
 \version "2.18.2"
 composerPipes = ""

3-4_marches/red_hackle/pipes.ly

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

3-4_marches/shoals_of_herring/pipes.ly

@@ -9,26 +9,20 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
+
-			{
+		\repeat volta 2 {
-				\repeat volta 2 {\line}
-				\break
-				\repeat volta 2 {\halfline}
-				\alternative {
-					{\halfline}
-					{\halfline}
-				}
-				\bar "|." 
-			}
-			{
 			\pipesA
 			\pipesAB
-			
+		}
+		\break
+		\repeat volta 2 {
 			\pipesB
+		}
+		\alternative {
 			\pipesBA
 			\pipesAB
-			}
+		}
-		>>
+		\bar "|." 
 	}
 	\header {
 		title = \title

3-4_marches/torosay_castle/pipes.ly

@@ -9,35 +9,14 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			\new NullVoice = "format" {
-				\repeat volta 2 {
-					\line
-				}
-				\break
-				\repeat volta 2 {
-				  	\line
-				}
-				\break
-				\repeat volta 2 {
-				  	\line
-				}
-				\break
-				\repeat volta 2 {
-					\line
-				}
-			}%Format
 		
-			\new Voice = "pipes" {
+		\repeat volta 2 { \pipesA }
-				\pipesA
+		\break
-
+		\repeat volta 2 { \pipesB }
-				\pipesB
+		\break
-
+		\repeat volta 2 { \pipesC }
-				\pipesC
+		\break
-
+		\repeat volta 2 { \pipesD }
-				\pipesD
-			}
-		>>
 	}
 	\header {
 		title = \title

3-4_marches/when_the_battle_is_over/config.ily

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

3-4_marches/when_the_battle_is_over/pipes.ly

@@ -9,23 +9,13 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
+		\repeat volta 2 { 
-			\new NullVoice = "format" {
+			\pipesA 
-				\repeat volta 2 {
+		}
-					\line
+		\break
-				}
+		\repeat volta 2 {
-				\break
+			\pipesB
-				\repeat volta 2 {
+		}
-					\line
-				}
-			}%Format
-
-			\new Voice = "pipes" {
-				\pipesA
-
-				\pipesB
-			}
-		>>
 	}
 	\header {
 		title = \title

4-4_marches/48th_highlanders_of_holland/pipes.ly

@@ -9,25 +9,10 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
+				\partial 4 \pipesA s4 \bar "||" \break
-			\new NullVoice = "format" {
+				\partial 4 \pipesB s4 \bar "||" \break
-				\part \line 
+				\partial 4 \pipesC s4 \bar "||" \break
-				\bar "||" \break
+				\partial 4 \pipesD s4 \bar "|." \break
-				\part \line 
-				\bar "||" \break
-				\part \line 
-				\bar "||" \break
-				\part \line 
-				\bar "|." \break
-			}%Format
-
-			\new Voice = "pipes" {
-				\pipesA s4
-				\pipesB s4
-				\pipesC s4
-				\pipesD s4
-			}
-		>>
 	}
 	\header {
 		title = \title

4-4_marches/auld_lang_syne/pipes.ly

@@ -9,18 +9,15 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
+		\repeat volta 2 { 
-			{
+			\partial 4
-			\repeat volta 2 { \part \line }
-			\break
-			\repeat volta 2 { \part \line }
-			}
-			{
 			\pipesA s4
-
+		}
+		\break
+		\repeat volta 2 {
+			\partial 4
 			\pipesB s4
-			}
+		}
-		>>
 	}
 	\header {
 		title = \title

4-4_marches/bonnie_galloway/config.ily

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

4-4_marches/bonnie_galloway/pipes.ly

@@ -11,8 +11,9 @@
 		\pipeglobal
 		<<
 			{ 
-			\line \break
+				\line  \bar "||"
-			\line \break
+				\break
+				\line \bar "|."
 			}
 			{
 				\pipesA
@@ -33,6 +34,7 @@
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
 		\pipesA
+
 		\pipesB
 	}
 	\midi { \confTempo }

4-4_marches/dawning_of_the_day/config.ily

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

4-4_marches/dawning_of_the_day/pipes.ly

@@ -11,8 +11,8 @@
 		\pipeglobal
 		<<
 			{ 
-				\part \halfline \halfline \bar "|." \break
+				\part \halfline \halfline \bar "|." 
-
+				\break
 				\part \halfline \halfline \bar "|."
 			}%Format
 			{

4-4_marches/minstrel_boy/config.ily

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

4-4_marches/the_crusaders_march/pipes.ly

@@ -35,6 +35,7 @@
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
+		\partial 4
 		\pipesA
 
 		\pipesB

4-4_marches/the_old_rustic_bridge/config.ily

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

4-4_marches/the_pikemans_march/pipes.ly

@@ -18,7 +18,7 @@
 				}
 				\part \line \break
 				\line \break
-				\line \break
+				\line \bar "|."
 			}
 			{ 
 				\pipesA s8

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

@@ -7,14 +7,14 @@ pipeglobal = {
 	}
 % Music
 pipesA = {
-\grg a8. [ b16 ] |
+	\grg a8. [ b16 ] |
- \grip c4 c8 [ e8 ] \grg d8 [ c8 ] \grg b8 [ a8 ] |
+	\grip c4~ c8 [ e8 ] \grg d8 [ c8 ] \grg b8 [ a8 ] |
- \dblc c4 \gre a4 \wbirl a4 \dblc c8 [ e8 ] |
+	\dblc c4 \gre a4 \wbirl a4 \dblc c8 [ e8 ] |
- \dblA A2 \grip A8 [ g8 ] \hdblf f8 [ e8 ] |
+	\dblA A2 \grip A8 [ g8 ] \hdblf f8 [ e8 ] |
- \dblf f2 \dble e4 \grg f8. [ g16 ] | 
+	\dblf f2 \dble e4 \grg f8. [ g16 ] |
 
- \dblA A4. \grg A8 \grg A4. c8 |
+	\dblA A4. \grg A8 \grg A4. c8 |
- \thrwd d4 f4 \dble e4. \gra e8 |
+	\thrwd d4 f4 \dble e4. \gra e8 |
- \grg f4 e4 \dblA A4 c4 |
+	\grg f4 e4 \dblA A4 c4 |
- \dblb b2 \grG a4
+	\dblb b2 \grG a4
 }

4-4_marches/wings/config.ily

@@ -7,10 +7,10 @@ confTempo = {
 	\tempo 4 = 90
 	}
 %% Format
-part = { \partial 4 s4 }
+part = { \partial 4 \grace { s4 } s4 }
 measure = { \grace { s4 } s1 | }
 quartline = { \repeat unfold 2 { \measure } }
-halfline = { \repeat unfold 2 { \measure } }
+halfline = { \repeat unfold 2 { \quartline } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers

4-4_marches/wings/full.ly

@@ -11,20 +11,26 @@
 %\include "./notes.pipes.seconds.ily"
 %\include "./notes.lyrics.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 }
 			<<
 				\new NullVoice = "format" {
-					\part \line \bar "||"
+					\part \halfline
-					\line \bar "|."
+					\halfline \bar "||"
 					\break
-					\part \line \bar "||"
+					\part \halfline
-					\line \bar "|."
+					\halfline \bar "|."
 				}%Format
 
 				\new Voice = "pipes" {
@@ -53,10 +59,11 @@
 %
 %
 %		}
-		\new PipeBandDrumStaff = "side" {
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup \column {\instrumentSide}
+			shortInstrumentName = \markup{\shortInstrumentSide}
+		} {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 				r8 \snareAA	\snareABA
 					\snareAAI \snareABB s4

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

@@ -8,7 +8,7 @@ pipeglobal = {
 }
 % Music
 pipesAA = {
-	a8 e8 |
+	a8) e8 |
 	\grg a4 \taor a8 [ b8 ] \grip c4~ c8 [ e8 ] |
 	\grg f8. [ e16 ] \grg f8 [ A8 ] e4 \dblc c8 [ e8 ] |
 	\grg f8. [ g16 ] A8 [ f8 ] \dble e16 [ c8. ] \grg b8 [ a8 ] |
@@ -18,11 +18,11 @@ pipesAB = {
 	\grg a4 \taor a8 [ b8 ] \grip c4~ c8 [ e8 ] |
 	\grg f8. [ e16 ] \grg f8 [ A8 ] e4 \dblc c8 [ e8 ] |
 	\grg f8. [ g16 ] A8 [ f8 ] \dble e16 [ c8. ] \grg b8. [ c16 ] |
-	\grg a2 \wbirl a4~
+	\grg a2 \wbirl a4(
 }
 
 pipesBA = {
-	a8 [ e8 ] |
+	a8) [ e8 ] |
 	A4 \grg A4 \grip A8 [ g8 ] \hdblf f8 [ e8 ] |
 	\grg f8. [ e16 ] \grg f8 [ A8 ] \hdblf f8 [ e8 ] \dblc c8 [ e8 ] |
 	\grg f8. [ g16 ] A8 [ f8 ] \dble e16 [ c8. ] \grg b8 [ a8 ] |

4-4_marches/wings/pipes.ly

@@ -34,6 +34,7 @@
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
+		\partial 4 
 		\pipesAA \pipesAB
 
 		\pipesBA \pipesAB

4-4_marches/wings/side.ly

@@ -29,7 +29,7 @@ markTextEol = #(define-music-function (parser location text) (string?) #{
 				\break
 
 				\partial 8 s8
-				\line 
+				\halfline 
 				\markTextEol "D.C. al Fine"
 				\bar "||"
 			}%Format

6-8_marches/10th_hli_crossing_the_rhine/pipes.ly

@@ -9,54 +9,38 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\part
+					\partial 8
-				  	\line
+					\pipesAA
+					\pipesAB s8
 				}
 				\break
+
 				\repeat volta 2 {
-				  	\part
+					\partial 8
-					\halfline
+					\pipesBA
-				}\alternative{
+				} \alternative {
-				  	\halfline
+					{ \pipesBB s8 }
-					\halfline
+					{ \pipesAB s8 }
+				}
+				\bar ".|:-||"
+				\break
+
+				\repeat volta 2 {
+					\partial 8
+					\pipesCA
+					\pipesCB s8
+				}
+				\break
+
+				\repeat volta 2 {
+					\partial 8
+					\pipesDA
+				} \alternative {
+					{ \pipesDB s8 }
+					{ \pipesCB s8 }
 				}
 				\bar "|."
-				\break
-				\repeat volta 2 {
-				  	\part
-				  	\line
-				}
-				\break
-				\repeat volta 2 {
-				  	\part
-					\halfline
-				}\alternative{
-				  	\halfline
-					\halfline
-				}
-				\bar "|."
-
-			}%Format
-			
-			\new Voice = "pipes" {
-				\pipesAA
-				\pipesAB s8
-
-				\pipesBA
-				\pipesBB s8
-				\pipesAB s8
-
-				\pipesCA
-				\pipesCB s8
-
-				\pipesDA
-				\pipesDB s8
-				\pipesCB s8
-			}
-		>>
 	}
 	\header {
 		title = \title

6-8_marches/72nd_highlanders/pipes.ly

@@ -9,38 +9,26 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\part
+					\partial 4
-				  	\line
+					\pipesA s4
 				}
 				\break
+
 				\repeat volta 2 {
-				  	\part
+					\partial 4
-					\halfline
+					\pipesBA
-				}\alternative{
+				} \alternative {
-				  	\halfline
+					{ \pipesBBA s4 }
-					\halfline
+					{ \pipesBBB s4 }
 				}
-				\bar "|."
+				\bar ".|:-||"
 				\break
+
 				\repeat volta 2 {
-				  	\part
+					\partial 4
-				  	\line
+					\pipesC s4
 				}
-			}%Format
-			
-			\new Voice = "pipes" {
-				\pipesA s4
-
-				\pipesBA
-				\pipesBBA s4
-				\pipesBBB s4
-
-				\pipesC s4
-			}
-		>>
 	}
 	\header {
 		title = \title
@@ -53,6 +41,7 @@
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
+		\partial 4
 
 		\pipesA
 		\pipesA

6-8_marches/cock_o_the_north/config.ily

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

6-8_marches/cock_o_the_north/pipes.ly

@@ -9,38 +9,37 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
+			\repeat volta 2 {
-			{
+				\partial 8
-			\repeat volta 2 {\part \line}
+				\pipesA s8
-			\break
-
-			\part \line
-			\break
-			\part \line
-			\break
-			\repeat volta 2 {\part \line}
-			\break
-			\part \line
-			\break
-			\part \line
-			\bar "|."
-			}%Format
-			{ 
-			\pipesA s8
-
-			\pipesBA
-			\pipesBBA s8
-			\pipesBA
-			\pipesBBB s8
-
-			\pipesC s8
-
-			\pipesDA
-			\pipesDBA s8
-			\pipesDA
-			\pipesBBB s8
 			}
-		>>
+			\break
+			
+			\repeat volta 2 {
+				\partial 8
+				\pipesBA
+			} \alternative {
+				{ \pipesBBA s8 }
+				{ \pipesBBB s8 }
+			}
+			\bar ".|:-||"
+			\break
+			
+			\repeat volta 2 {
+				\partial 8
+				\pipesC s8
+
+			}
+			\break
+			
+			\repeat volta 2 {
+				\partial 8
+				\pipesDA
+			} \alternative {
+				{ \pipesDBA s8 }
+				{ \pipesBBB s8 }
+			}
+			\bar "|."
 	}
 	\header {
 		title = \title

6-8_marches/glendaruel_highlanders/config.ily

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

6-8_marches/piobaireachd_of_donald_dubh/pipes.ly

@@ -9,29 +9,25 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
+			\repeat volta 2 {
-			{
+				\pipesA 
-			\repeat volta 2 {\line}
-			\break
-			\repeat volta 2 {\line}
-			\break
-			\repeat volta 2 {\line}
-			\break
-			\repeat volta 2 {\halfline}
-			\alternative{ {\halfline}{\halfline}}
-			}%Format
-			{ 
-			\pipesA
-
-			\pipesB
-
-			\pipesC
-
-			\pipesDA
-			\pipesDBA
-			\pipesDBB
 			}
-		>>
+			\break
+			\repeat volta 2 {
+				\pipesB 
+			}
+			\break
+			\repeat volta 2 {
+				\pipesC
+			}
+			\break
+			\repeat volta 2 {
+				\pipesDA
+			} \alternative {
+				{ \pipesDBA }
+				{ \pipesDBB }
+			}
+			\bar "|."
 	}
 	\header {
 		title = \title

9-8_marches/battle_of_the_somme/notes.pipes.ily

@@ -7,27 +7,27 @@ pipeglobal = {
 	}
 % Music
 pipesA = {
-a8 |
+	a8 |
- \grg f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] |
+	\grg f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] |
- \grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. |
+	\grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. |
- \grg b16 [ \grd G8. \grd b8 ] \grG a4. \thrwd d4. |
+	\grg b16 [ \grd G8. \grd b8 ] \grG a4. \thrwd d4. |
- \grg f16 [ A8. f8 ] \dble e4. \gra e4 a8 | 
+	\grg f16 [ A8. f8 ] \dble e4. \gra e4 a8 | 
 
- \grg f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] |
+	\grg f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] |
- \grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. |
+	\grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. |
- \grg b16 [ \grd G8. \grd b8 ] \grG a4. \grip f4. |
+	\grg b16 [ \grd G8. \grd b8 ] \grG a4. \grip f4. |
- \grg e8. [ f16 \grg e8 ] \thrwd d4. \dbld d4
+	\grg e8. [ f16 \grg e8 ] \thrwd d4. \dbld d4
 }
 
 pipesB = {
- d8
+	d8
- \dbld d8. [ c16 d8 ] \dble e4. \wbirl a4. |
+	\dbld d8. [ c16 d8 ] \dble e4. \wbirl a4. |
- \grg e8. [ f16 g8 ] \grA f16 [ A8. A8 ] \thrwd d4. |
+	\grg e8. [ f16 g8 ] \grA f16 [ A8. A8 ] \thrwd d4. |
- \dblf f8. [ e16 f8 ] \dblg g4. \wbirl a4. |
+	\dblf f8. [ e16 f8 ] \dblg g4. \wbirl a4. |
- \grg f16 [ A8. f8 ] \dble e4. \gra e4 A8 | 
+	\grg f16 [ A8. f8 ] \dble e4. \gra e4 A8 | 
 
- f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] |
+	\grg f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] |
- \grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. |
+	\grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. |
- \grg b16 [ \grd G8. \grd b8 ] \grG a4. \grip f4. |
+	\grg b16 [ \grd G8. \grd b8 ] \grG a4. \grip f4. |
- \grg e8. [ f16 \grg e8 ] \thrwd d4. \dbld d4
+	\grg e8. [ f16 \grg e8 ] \thrwd d4. \dbld d4
 }

9-8_marches/going_to_vancouver_hills/pipes.ly

@@ -9,26 +9,14 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			\new NullVoice = "format" {
-				\repeat unfold 4 {
-			  		\repeat volta 2 {
-						\line
-					}
-					\break
-				}
-			}%Format
 
-			\new Voice = "pipes" {
+		\repeat volta 2 { \pipesA }
-				\pipesA
+		\break
-				
+	 	\repeat volta 2 { \pipesB }
-				\pipesB
+		\break
-
+	 	\repeat volta 2 { \pipesC }
-				\pipesC
+		\break
-
+	 	\repeat volta 2 { \pipesD }
-				\pipesD
-			}
-		>>
 	}
 	\header {
 		title = \title

airs/abide_with_me/notes.side.ily

@@ -15,3 +15,17 @@ snareAB = \drummode {
 	d4:32( \>	d4:32)(	d4:32)(	d4:32)( |
 	d4:32)( \<	d4:32)(	d4:32)(	d4:32)\laissezVibrer \!
 }
+
+snareRollsAA = \drummode {
+	d1:32)( \! \p |
+	d1:32)( |
+	d1:32)( |
+	d4:32)( \<	d4:32)(	d4:32)(	d4:32)( \!\mf \> |
+}
+
+snareRollsAB = \drummode {
+	d1:32)( \!\p |
+	d1:32)( |
+	d4:32( \f \>	d4:32)(	d4:32)(	d4:32)(\p |
+	d4:32)( \<	d4:32)(	d4:32)(	d4:32)\laissezVibrer \!
+}

airs/abide_with_me/side.full.ly

@@ -0,0 +1,40 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff {
+		    \global
+		    <<
+				\new NullVoice = "format" {
+					\repeat volta 2 {\line \break}
+						\alternative {
+							{ \line \break }
+							{ \line \bar "|."}
+						}
+	
+				} % End of Format
+				\new DrumVoice = "side" {
+					\snareAA
+					\snareAA
+					\snareAB
+				}
+			>>
+		}
+		\new PipeBandDrumStaff {
+			\snareRollsAA
+			\snareRollsAA
+			\snareRollsAB
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+	}
+}

airs/la_baum/config.ily

@@ -14,4 +14,4 @@ line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "La Baum"
-meter = "March"
+meter = "Air"

hornpipes/cabar_feidh/pipes.ly

@@ -9,27 +9,13 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
+		\repeat volta 2 { \partial 16 \pipesA }
-			\new NullVoice = "format" {
+		\break
-				\repeat unfold 4 {
+	 	\repeat volta 2 { \partial 16 \pipesB }
-				  \repeat volta 2 {
+		\break
-				  	\part
+	 	\repeat volta 2 { \partial 16 \pipesC }
-					\line
+		\break
-				  }
+	 	\repeat volta 2 { \partial 16 \pipesD }
-				  \break
-				}
-			}%Format
-			
-			\new Voice = "pipes" {
-				\pipesA s16
-
-				\pipesB s16
-
-				\pipesC s16
-
-				\pipesD s16
-			}
-		>>
 	}
 	\header {
 		title = \title

hornpipes/the_jolly_beggarman/pipes.ly

@@ -9,33 +9,20 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\part
+					\partial 8
-					\line
+					\pipesA
 				}
 				\break
 				\repeat volta 2 {
-					\part
+					\partial 8
-					\repeat unfold 3 \measure
+					\pipesBA
-					\grace{s1} s4 s8
 				} \alternative {
-					{\part \halfline}
+					{\partial 8 \pipesBBA }
-					{\part \halfline}
+					{\partial 8 \pipesBBB }
 				}
 				\bar "|."
-			}%Format
+			}%Forma	}
-			
-			\new Voice = "pipes" {
-				\pipesA s8
-
-				\pipesBA 
-				\pipesBBA s8
-				\pipesBBB s8
-			}
-		>>
-	}
 	\header {
 		title = \title
 		meter = \meter

hornpipes/the_walrus/notes.pipes.ily

@@ -1,4 +1,4 @@
-% <<TimeSig>> <<Title>>
+% 2/4 The Walrus
 % Pipes
 \version "2.18.2"
 composerPipes = "R. Mathieson"

jigs/the_panda/config.ily

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

reels/cabar_feidh/notes.pipes.ily

@@ -9,12 +9,12 @@ pipeglobal = {
 pipesA = {
 	f16 |
 	\dblg g4 A8. [ e16 ] \dblg g4 \grA d8. [ e16 ] |
-	\dblg g4 \grA d8. [ c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] |
+	\dblg g4 \grA d8. [ c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] |
 	\grg a8. [ b16 \grg c16 \grd a8. ] \dblA A4 e8. [ f16 ] |
 	\dblA A4 e8. [ d16 ] \grg c4 \grip e8. [ f16 ] | 
 
 	\dblg g4 A8. [ e16 ] \dblg g4 \grA d8. [ e16 ] |
-	\dblg g4 \grA d8. [ c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] |
+	\dblg g4 \grA d8. [ c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] |
 	\grg a8. [ b16 ] \grip c8. [ d16 ] \grg e8. [ f16 ] \grA g8. [ e16 ] |
 	\dblA A4 e8. [ d16 ] \grg c4 \taor a8. 
 }
@@ -22,12 +22,12 @@ pipesA = {
 pipesB = {
 	g16 |
 	\grA G16 [ \grd G8. ] \dbld d8. [ G16 ] \grg b16 [ \grd G8. ] \dbld d8. [ b16 ] |
-	\grg G16 [ g8. d8. ] c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] |
+	\grg G16 [ g8. d8. ] c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] |
 	\grg a16 [ \grd a8. ] \dble e8. [ a16 ] \grg c16 [ \grd a8. ] \dble e8. [ a16 ] |
-	\grg a16 [ A8. ] e8. [ d16 ] \grg c8. [ \grd a16 a8. ] g16 ] | 
+	\grg a16 [ A8. ] e8. [ d16 ] \grg c8. [ \grd a16 a8. g16 ] | 
 
 	\grA G16 [ \grd G8. ] \dbld d8. [ G16 ] \grg b16 [ \grd G8. ] \dbld d8. [ b16 ] |
-	\grg G16 [ g8. d8. ] c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] |
+	\grg G16 [ g8. d8. c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] |
 	\grg a8. [ b16 ] \grip c8. [ d16 ] \grg e8. [ f16 ] \grA g8. [ e16 ] |
 	\dblA A4 e8. [ d16 ] \grg c4 \taor a8. 
 }
@@ -47,13 +47,13 @@ pipesC = {
 
 pipesD = {
 	g16 |
-	\grA G8. [ \grd G16 G8. ] \grd b16 ] \grg G8. [ \grd G16 G8. ] \grd b16 ] |
+	\grA G8. [ \grd G16 G8. \grd b16 ] \grg G8. [ \grd G16 G8. \grd b16 ] |
-	\grg G16 [ g8. d8. ] c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] |
+	\grg G16 [ g8. d8. c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] |
-	\grg a8. [ \grd a16 a8. ] \grd c16 ] \grg a8. [ \grd a16 a8. ] \grd c16 ] |
+	\grg a8. [ \grd a16 a8. \grd c16 ] \grg a8. [ \grd a16 a8. \grd c16 ] |
-	\grg a16 [ A8. ] e8. [ d16 ] \grg c8. [ \grd a16 a8. ] g16 ] | 
+	\grg a16 [ A8. ] e8. [ d16 ] \grg c8. [ \grd a16 a8. g16 ] | 
 
-	\grA G8. [ \grd G16 G8. ] \grd b16 ] \grg G8. [ \grd G16 G8. ] \grd b16 ] |
+	\grA G8. [ \grd G16 G8. \grd b16 ] \grg G8. [ \grd G16 G8. \grd b16 ] |
-	\grg G16 [ g8. d8. ] c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] |
+	\grg G16 [ g8. d8. c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] |
 	\grg a8. [ b16 ] \grip c8. [ d16 ] \grg e8. [ f16 ] \grA g8. [ e16 ] |
 	\dblA A4 e8. [ d16 ] \grg c4 \taor a8.
 }

reels/cabar_feidh/pipes.ly

@@ -42,7 +42,7 @@
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
-		\partial 8
+		\partial 16
 		\pipesA
 		\pipesB
 		\pipesC

reels/the_mackenzies_reel/pipes.ly

@@ -11,10 +11,10 @@
 		\pipeglobal
 		<<
 			{
-				\repeat volta 2 { \part \line } \break
+				\repeat volta 2 { \part \halfline } \break
 			
-				\part \line \break
+				\part \halfline \break
-				\line \bar "|."
+				\halfline \bar "|."
 			}
 			{
 				\pipesA s8
@@ -30,7 +30,4 @@
 		instrument = \instrumentPipes
 		composer = \composerPipes
 	}
-	\midi {
-		\tempo 2 = 70
-	}
 }

sinterklaas/00_sets/set_1.ly

@@ -0,0 +1,9 @@
+\version "2.18.2"
+
+\paper {#(define page-breaking ly:minimal-breaking)}
+
+
+%Scores
+\include "./dag_sinterklaasje/pipes.ly"
+\include "./bonne_bonne_bonne/pipes.ly"
+\include "./sinterklaas_goedheiligman/pipes.ly"

sinterklaas/00_sets/set_2.ly

@@ -0,0 +1,8 @@
+\version "2.18.2"
+
+\paper {#(define page-breaking ly:minimal-breaking)}
+
+
+%Scores
+\include "./zachtjes_gaan_de_paarden_voetjes/pipes.ly"
+\include "./zie_ginds_komt_de_stoomboot/pipes.ly"

sinterklaas/00_sets/set_3.ly

@@ -0,0 +1,8 @@
+\version "2.18.2"
+
+\paper {#(define page-breaking ly:minimal-breaking)}
+
+
+%Scores
+\include "./sinterklaasje_kom_maar_binnen_met_je_knecht/pipes.ly"
+\include "./de_zak_van_sinterklaas/pipes.ly"

sinterklaas/00_sets/set_4.ly

@@ -0,0 +1,8 @@
+\version "2.18.2"
+
+\paper {#(define page-breaking ly:minimal-breaking)}
+
+
+%Scores
+\include "./sinterklaas_is_jarig/pipes.ly"
+\include "./o_kom_er_eens_kijken/pipes.ly"

sinterklaas/set_1.ly

@@ -1,9 +0,0 @@
-\version "2.18.2"
-
-\paper {#(define page-breaking ly:minimal-breaking)}
-
-
-%Scores
-\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/dag_sinterklaasje/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/bonne_bonne_bonne/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/sinterklaas_goedheiligman/pipes.ly"

sinterklaas/set_2.ly

@@ -1,8 +0,0 @@
-\version "2.18.2"
-
-\paper {#(define page-breaking ly:minimal-breaking)}
-
-
-%Scores
-\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/zachtjes_gaan_de_paardenvoetjes/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/zie_ginds_komt_de_stoomboot/pipes.ly"

sinterklaas/set_3.ly

@@ -1,8 +0,0 @@
-\version "2.18.2"
-
-\paper {#(define page-breaking ly:minimal-breaking)}
-
-
-%Scores
-\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/de_zak_van_sinterklaas/pipes.ly"

sinterklaas/set_4.ly

@@ -1,8 +0,0 @@
-\version "2.18.2"
-
-\paper {#(define page-breaking ly:minimal-breaking)}
-
-
-%Scores
-\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/sinterklaas_is_jarig/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/o_kom_er_eens_kijken/pipes.ly"

sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/pipes.ly

@@ -12,7 +12,8 @@
 		<<
 			\new NullVoice = "format" {
 				\line \bar "|." \break
-				\halfline
+
+				\halfline \break
 				\repeat volta 2 {
 					\partial 4 \grace{s4} s4
 					\halfline

sinterklaas/zie_de_maan_schijnt_door_de_bomen/notes.pipes.ily

@@ -10,7 +10,7 @@ pipeglobal = {
 pipesA = {
 	\grg a8 \grG a |
 	\thrwd d4 \grc d4 \grg d8[ e] |
-	\grg f4 \thrwd d4 | % Note this is 2/4
+	\grg f4 \thrwd d4 |% Note this is 2/4
 	\grg e8[ \gra e8] \grg e8[  \gra e] \grg f[ e] |
 	\thrwd d2
 }

strathspeys/keel_row/notes.pipes.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
-	}
+}
 % Music
 pipesA = {
 	\dblf f4 \thrwd d8. [ f16 ] \dblg g4 \hdble e8. [ g16 ] |

strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily

@@ -1,7 +1,10 @@
 % 4/4 Lady MacKenzie of Fairburn
 % Pipes
 \version "2.18.2"
-composerPipes = "J. Wark, arr. R. Stanley"
+composerPipes = ""
+pipeglobal = {
+	\key a \major
+}
 pipesA = {
 	d16 |
 	\dblc c8. e16