Small fixes + new Tune: Castle Dangerous

2-4_marches/drunken_piper/config.ily

@@ -11,7 +11,7 @@ confTempo = {
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s1} s2 | }
 halfline = { \repeat unfold 4 \measure }
-halflineMinEighth = { \repeat unfold 3 { \measure } s4 s8 }
+halflineMinusPart = { \repeat unfold 3 { \measure } s4 s8 }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers

2-4_marches/drunken_piper/pipes.ly

@@ -19,7 +19,7 @@
 				\part
 				\halfline
 				\break
-				\halflineMinEighth
+				\halflineMinusPart
 			}
 		>>
 			\break
@@ -75,7 +75,7 @@
 				\part
 				\halfline
 				\break
-				\halflineMinEighth
+				\halflineMinusPart
 			}
 		>>
 			\break

3-4_marches/castle_dangerous/config.ily

@@ -2,17 +2,17 @@
 %% Globals
 global = {
 	\time 3/4
-	\eighthBeaming
-	}
+	\key d \major
+}
 confTempo = {
 	\tempo 4 = 78
-	}
+}
 %% Format
-part = { \partial 8 s8 }
-measure = { \grace { s4 } s2 | }
-halfline = { \repeat unfold 4 { \measure } }
+part = { \partial 4 \grace{s4.} s4 }
+measure = { \grace {s1} s4 s4 s4| }
+halfline = { \repeat unfold 4 \measure }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Castle Dangerous"
-meter = "March"
+meter = "Retreat"

3-4_marches/castle_dangerous/full.ly

@@ -0,0 +1,125 @@
+\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"
+
+\layout {
+	indent = 8.0
+	short-indent = 2.0
+}
+
+\score {
+	\new StaffGroup <<
+		\new Staff \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\global
+			\pipeglobal
+			<<
+				\new NullVoice = "format" {
+					\repeat volta 2 {
+						\halfline
+						\break
+						\halfline
+					}
+					\break
+					\repeat volta 2 {
+						\halfline
+						\break
+						\halfline
+					}
+				}%Format
+
+				\new Voice = "pipes" {
+					\pipesA
+					\pipesB
+				}
+			>>
+		}
+%{		\new Staff = "song" {
+  			\lyricsglobal
+			\new Voice = "lyrics" {
+
+			}
+		}
+}%
+%{		\new Lyrics = "verse1" {
+		  \lyricsglobal
+		  \lyricsto "lyrics" {
+			\verseA
+		  }
+		}
+%}
+		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
+			\pipessecndglobal
+
+			\pipessecndA
+
+			\pipessecndB
+		}
+%{		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
+			\sideglobal
+
+		}
+%}
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+			\tenorA
+			\tenorA
+
+			\tenorA
+			\tenorA
+
+		}
+%{
+		\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 }}#} )
+			}
+		}
+	}
+}

3-4_marches/castle_dangerous/full.upbeat.ly

@@ -0,0 +1,125 @@
+\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"
+
+\layout {
+	indent = 8.0
+	short-indent = 2.0
+}
+
+\score {
+	\new StaffGroup <<
+		\new Staff \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\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 s4
+					\pipesB s4
+				}
+			>>
+		}
+%{		\new Staff = "song" {
+  			\lyricsglobal
+			\new Voice = "lyrics" {
+
+			}
+		}
+}%
+%{		\new Lyrics = "verse1" {
+		  \lyricsglobal
+		  \lyricsto "lyrics" {
+			\verseA
+		  }
+		}
+%}
+		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
+			\pipessecndglobal
+
+			\pipessecndA s4
+
+			\pipessecndB s4
+		}
+%{		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
+			\sideglobal
+
+		}
+%}
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+			\tenorA
+			\tenorA s4
+
+			\tenorA
+			\tenorA s4
+
+		}
+%{
+		\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 }}#} )
+			}
+		}
+	}
+}

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

@@ -0,0 +1,31 @@
+% 3/4 Castle Dangerous
+% Pipes
+\version "2.18.2"
+composerPipes = "J. Haugh"
+arrangerPipes = ""
+pipeglobal = {
+	\key d \major
+}
+% Music
+pipesA = {
+	\thrwd d8. [ e16 ] \grg f4 \dblA A4 |
+	\hdblf f8 [ d8 ] \grg G4 \grd b4 |
+	\dbld d4 \bgrip a4 \thrwd d4 |
+	\grg f8 [ A8 ] \hdble e4 ~ e4 |
+
+	\thrwd d8. [ e16 ] \grg f4 \dblA A4 |
+	\hdblf f8 [ d8 ] \grg G4 \grd b4 |
+	\dbld d4 \bgrip a4 \dblf f4 |
+	\dblg g8 [ \grA c8 ] \thrwd d4 \slurd d4
+}
+pipesB = {
+	\grg f8. [ g16 ] \dblA A4 f8 [ A8 ] |
+	\hdblf f8 [ d8 ] \grg G4 \grd b4 |
+	\dbld d4 \bgrip a4 \thrwd d4 |
+	\grg f8 [ A8 ] \hdble e4 ~ e4 |
+
+	\grg f8. [ g16 ] \dblA A4 f8 [ A8 ] |
+	\hdblf f8 [ d8 ] \grg G4 \grd b4 |
+	\dbld d4 \bgrip a4 \dblf f4 |
+	\dblg g8 [ \grA c8 ] \thrwd d4 \slurd d4
+}

3-4_marches/castle_dangerous/notes.pipes.seconds.ily

@@ -0,0 +1,31 @@
+% 3/4 Castle Dangerous
+% Pipes (Seconds)
+\version "2.18.2"
+composerPipesSecnd = ""
+arrangerPipesSecnd = ""
+pipessecndglobal = {
+	\bagpipeKey
+}
+% Music
+pipessecndA = {
+	\grg a4 \thrwd d4 \dblf f4 |
+	\dblA A8 [ f8 ] \dblg g4 \grA d4 |
+	\grg f8. [ e16 ] \thrwd d4 \dblf d4 |
+	A8 [ f8 ] \dblA A2 |
+
+	\grg a4 \thrwd d4 \dblf f4 |
+	\dblA A8 [ f8 ] \dblg g4 \grA d4 |
+	\grg f8. [ e16 ] \thrwd d4 \slurd d4 |
+	\dble e4 \dblf f2
+}
+pipessecndB = {
+	\grg a4 \thrwd d4 \gre a4 |
+	\grg d8 [ \gre a8 ] \grip b4 \gre G4 |
+	\grg f8. [ e16 ] \thrwd d4 \dblf d4 |
+	A8 [ f8 ] \dblA A2 |
+
+	\grg a4 \thrwd d4 \gre a4 |
+	\grg d8 [ \gre a8 ] \grip b4 \gre G4 |
+	\grg f8. [ e16 ] \thrwd d4 \slurd d4 |
+	\dble e4 \dblf f2
+}

3-4_marches/castle_dangerous/notes.tenor.ily

@@ -3,6 +3,8 @@
 \version "2.18.2"
 composerTenor = ""
 
+tenorglobal = {
+}
 %%music
 tenorA = \drummode {
 	r8. d16

3-4_marches/castle_dangerous/pipes.full.ly

@@ -0,0 +1,128 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+\include "./notes.pipes.seconds.ily"
+%\include "./notes.pipes.thirds.ily"
+
+\layout {
+	indent = 8.0
+	short-indent = 2.0
+}
+
+\score {
+	\new StaffGroup <<
+		\new Staff = "pipes" \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\global
+			\pipeglobal
+			<<
+				\new NullVoice = "format" {
+					\repeat volta 2 {
+						\halfline
+						\break
+						\halfline
+					}
+					\break
+					\repeat volta 2 {
+						\halfline
+						\break
+						\halfline
+					}
+				}%Format
+
+				\new Voice = "pipes" {
+					\pipesA
+					\pipesB
+				}
+			>>
+		}
+		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
+			\pipessecndglobal
+			\pipessecndA
+
+			\pipessecndB
+
+		}
+%{		\new Staff = "thirds" \with {
+			instrumentName = \markup{ \instrumentPipesThrd }
+			shortInstrumentName = \markup{ \shortInstrumentPipeTthrd }
+		} {
+			\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 }}#} )
+			}
+		}
+	}
+}
+\score {
+	\new StaffGroup <<
+		\global
+		\new Staff = "pipes" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\pipeglobal
+			%%Tune
+			\pipesA
+			\pipesA
+
+			\pipesB
+			\pipesB
+
+		}
+		\new Staff = "seconds" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
+			\pipessecndglobal
+			%% Seconds
+			\pipesA
+			\pipessecndA
+
+			\pipesB
+			\pipessecndB
+
+		}
+%{		\new Staff = "thirds" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipesThrd }
+			shortInstrumentName = \markup{ \shortInstrumentPipeThrd }
+		} {
+			\pipesthrdglobal
+			%% Thirds
+		}
+%}
+	>>
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}

3-4_marches/castle_dangerous/pipes.full.upbeat.ly

@@ -0,0 +1,79 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+\include "./notes.pipes.seconds.ily"
+%\include "./notes.pipes.thirds.ily"
+
+\layout {
+	indent = 8.0
+	short-indent = 2.0
+}
+
+\score {
+	\new StaffGroup <<
+		\new Staff = "pipes" \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+				\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 s4
+					\pipesB s4
+				}
+			>>
+		}
+		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
+			\pipessecndglobal
+			\pipessecndA s4
+
+			\pipessecndB s4
+
+		}
+%{		\new Staff = "thirds" \with {
+			instrumentName = \markup{ \instrumentPipesThrd }
+			shortInstrumentName = \markup{ \shortInstrumentPipeTthrd }
+		} {
+			\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 }}#} )
+			}
+		}
+	}
+}

3-4_marches/castle_dangerous/pipes.ly

@@ -0,0 +1,51 @@
+\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 {
+					\line
+				}
+				\break
+				\repeat volta 2 {
+					\line
+				}
+			}%Format
+
+			\new Voice = "pipes" {
+				\pipesA
+				\pipesB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}

3-4_marches/castle_dangerous/pipes.seconds.ly

@@ -0,0 +1,62 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+\include "./notes.pipes.seconds.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipessecndglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat unfold 2 {
+					\line
+				}
+				\bar "||"
+				\break
+				\repeat unfold 2 {
+					\line
+				}
+				\bar "|."
+			}%Format
+
+			\new Voice = "pipes" {
+				\pipesA
+				\pipessecndA
+
+				\pipesB
+				\pipessecndB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSecnd
+		composer = \composerPipesSecnd
+		arranger = \arrangerPipesSecnd
+	}
+}
+\score {
+	\new Staff { \global \pipessecndglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\pipesA
+		\pipessecndA
+
+		\pipesB
+		\pipessecndB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSecnd
+		composer = \composerPipesSecnd
+		arranger = \arrangerPipesSecnd
+	}
+
+}

3-4_marches/castle_dangerous/tenor.ly

@@ -10,10 +10,13 @@
         \global
         <<
 			{
-				\repeat volta 2 { \line }
+				\repeat volta 2 { \halfline }
+				\break
+				\repeat volta 2 { \halfline }
 			}
 			{
 			 \tenorA
+			 \tenorA
 			}
 		>>
 	}

3-4_marches/heroes_of_oosterbeek/Heroes of Oosterbeek.ly

@@ -0,0 +1,59 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 3/4
+		\bar "|:" \grg a8. [ b16 ] \thrwd d4 \dbld d8. [ f16 ] \bar "|"
+ \grg e8. [ f16 ] \thrwd d4~ d4 \bar "|"
+ \grg d8. [ f16 ] \dblg g4 \hdblf f8. [ e16 ] \bar "|"
+ \grg d8 [ e8 ] \gra e2 \bar "|" \break
+
+ \grg f8. [ g16 ] \dblA A4 \hdblf f8. [ e16 ] \bar "|"
+ \thrwd d8 [ \gre b8 ] \grG a4 \wbirl a4 \bar "|"
+ \thrwd d8. [ e16 ] \grg f4~ f8 [ g8 ] \bar "|"
+ \grA e8. [ f16 ] \thrwd d2 \bar ":|:" \break
+
+ \grg f8. [ g16 ] \dblA A4 \hdblf f8. [ e16 ] \bar "|"
+ \thrwd d8 [ e8 ] \gra e4 %{^te%} e4 \bar "|"
+ \grg e8. [ f16 ] \dblg g4 \grf g8. [ e16 ] \bar "|"
+ A8. [ g16 ] \grA f2 \bar "|" \break
+
+ \set Score.repeatCommands = #'((volta "1"))  \grg f8. [ g16 ] \dblA A4 \hdblf f8. [ e16 ] \bar "|"
+ \grg d8 [ \gre b8 ] \grG a4 \wbirl a4 \bar "|"
+ \thrwd d8. [ e16 ] \grg f4~ f8 [ g8 ] \bar "|"
+ \grA e8. [ f16 ] \thrwd d2 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar ":|" \break
+ \set Score.repeatCommands = #'((volta "2"))  \grg f8. [ g16 ] \hdblf f4 \grg f8. [ e16 ] \bar "|"
+ \grg d8 [ \gre b8 ] \grG a4 \wbirl a4 \bar "|"
+ \thrwd d8. [ e16 ] \grg f4~ f8 [ g8 ] \bar "|"
+ \grA e8. [ f16 ] \thrwd d2 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar ".|" \break 
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "Heroes of Oosterbeek"
+	meter = "Retreat "
+	arranger = "Angus Lawrie, arr. PM F.J. de Boone"
+	}
+	
+}
+

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

@@ -4,7 +4,7 @@
 composerPipes = "Angus Lawrie"
 arrangerPipes = "PM F.J. de Boone"
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {

3-4_marches/heroes_of_oosterbeek/pipes.upbeat.ly

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

airs/road_to_the_isles/notes.side.ily

@@ -11,12 +11,12 @@ sideglobal = { \eighthBeaming }
 sideMid = \drummode { \tutti {
   d16. g32 |
   d16.-> g32 d16. g32->  d16. g32-> d16. g32 |
-  d8-> d8:32( d8)
+  d8-> d8:32( g8)
 } }
 sideMidII = \drummode { \tutti {
   d16. g32 |
   d16.:64([ d32) \tuplet 3/2 { g16 d g] }	\flam d16.[ \drag g32 \tuplet 5/2 { d16 g d g d] } |
-  g8 d8:32( d8)
+  g8 d8:32( g8)
 } }
 
 sideEnd = \drummode { \tutti {
@@ -27,7 +27,7 @@ sideEnd = \drummode { \tutti {
 sideEndII = \drummode { \tutti {
   d16. g32 |
   \dragd \tuplet 3/2 { d16[ d g } \drag d16. g32] 	\flam d16.[ \drag g32 \tuplet 5/2 { d16 g d g d] } |
-  g8 d8:32( d8)
+  g8 d8:32( g8)
 } }
 
 % parts

airs/road_to_the_isles/side.full.ly

@@ -5,6 +5,11 @@
 \include "./config.ily"
 \include "./notes.side.ily"
 
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" \with {
@@ -22,39 +27,61 @@
 				\break
 				\repeat volta 2 {
 					\part
-					\line
+					\halfline
+					\bar ""
+				} \alternative {
+					{ \part \halfline }
+					{ \part \halfline }
 				}
-				
+
 				}%End of Format
 				\new DrumVoice = "side" {
 					\sidePI
 					<<
 						\sideMid
-						\context PipeBandDrumStaff = "side2" {
+						\context PipeBandDrumStaff = "sideLD" {
 							\sideMidII
 						}
 					>>
 					\sidePI
 					<<
 						\sideEnd
-						\context PipeBandDrumStaff = "side2" {
+						\context PipeBandDrumStaff = "sideLD" {
 							\sideEndII
 						}
 					>> s8
 
 					\sidePII
-					\sideMid
+					<<
+						\sideMid
+						\context PipeBandDrumStaff = "sideLD" {
+							\sideMidII
+						}
+					>> s8
 					\sidePII
-					\sideEnd s8
+					<<
+						\sideEnd
+						\context PipeBandDrumStaff = "sideLD" {
+							\sideEndII
+						}
+					>> s8
+					\sidePI
+					<<
+						\sideEnd
+						\context PipeBandDrumStaff = "sideLD" {
+							\sideEndII
+						}
+					>> s8
 				}%End of side
 			>>
 		}
-		\new PipeBandDrumStaff = "side2" \with {
-			instrumentName = \markup{ \instrumentSide LD }
-			shortInstrumentName = \markup{ \shortInstrumentSide LD }
+		\new PipeBandDrumStaff = "sideLD" \with {
+			instrumentName = \markup \center-column { LD \instrumentSide }
+			shortInstrumentName = \markup{ L.D. }
 			\RemoveAllEmptyStaves
 		} {
 			s8 | s1*4
+			s8 | s1*4
 		}
 	>>
 	\header {

jigs/seaforth_sticks/side.ly

@@ -36,5 +36,6 @@
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
+		arranger = \arrangerSide
 	}
 }

other/wilhelmus/config.ily

@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 2/4
-	}
-confTempo = { 
-	\tempo 4 = 80 
-	}
+	\key d \major
+}
+confTempo = {
+	\tempo 4 = 80
+}
 %% Format
 part = { \partial 4 \grace {s1} s4 }
 measure = { \grace {s1} s2 | }
@@ -13,5 +14,5 @@ halfline = { \repeat unfold 4 \measure }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
-title = "Wilhelmus"
+title = "Wilhelmus van Nassouwe"
 meter = "Dutch National Anthem"

other/wilhelmus/lyrics.ly

@@ -7,11 +7,20 @@
 \include "./notes.pipes.seconds.ily"
 \include "./notes.lyrics.ily"
 
+\layout {
+	indent = 8.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
-	    \new Staff {
+		\new Staff = "pipes" \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\global
 			\lyricsglobal
+			\pipeglobal
 			<<
 			  	\new NullVoice = "format" {
 					\part
@@ -22,7 +31,7 @@
 					\repeat unfold 7 \measure
 					\bar "|."
 					\break
-	
+
 					\part
 					\line
 					\break
@@ -30,33 +39,29 @@
 					\bar "|."
 				}%Format
 				\new Voice = "tune" {
-				  \bagpipeKey
 				  \pipesA s4
 				  \pipesA s4
-	
+
 				  \pipesB
-					
+
 				}
 			>>
-		}
-		\new Staff {
-			
 		}
 		\new Lyrics = "lyrics1" {
-			\lyricsto "tune" { 
+			\lyricsto "tune" {
 				\lyricsA
 			}
 		}
 		\new Lyrics = "lyrics2" {
-			\lyricsto "tune" { 
+			\lyricsto "tune" {
 				\lyricsF
 			}
 		}
-		\new Staff = "seconds" {
+		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
 			\pipessecndglobal
-			\set Staff.instrumentName = \markup{ \instrumentSecnd }
-			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd}
-			
 			\pipessecndAA s4
 			\pipessecndAB s4
 

other/wilhelmus/notes.pipes.seconds.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipessecnd = "PM Michael J. Evans"
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 pipessecndAA = {
 	\grg a4 |
 	\thrwd d4 a4 |
@@ -13,10 +13,10 @@ pipessecndAA = {
 	b4 c4 |
 	a8 [ b8 ] \grg c4 |
 	\dblf f2 |
-	g4  
+	g4
 }
 pipessecndAB = {
-  	A4 |
+	A4 |
 	f2 |
 	\grg c8 [ d8 ] \grg e8 [ c8 ] |
 	d4 \grg c8 [ a8 ] |
@@ -34,8 +34,7 @@ pipessecndB = {
 	e4 d4 |
 	\grg c4 b4 |
 	c8 [ b8 ] a4 |
-	b4 c4 | 
-
+	b4 c4 |
 
 	\thrwd d8 [ c8 ] \grg d8 [ e8 ] |
 	\grg d4 \grg c4 |

reels/lady_seaforth/config.ily

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

reels/lady_seaforth/notes.pipes.ily

@@ -8,7 +8,7 @@ pipeglobal = {
 }
 % Music
 pipesA = {
-	A8 |
+	A16 |
 	c16 \grd a8. \grg e8 a8	\grg c16 \grd a8. \dblg g4 |
 	b16 \grd a8. \dbld d8 a8	\grg b8. \grd b16 \gre b8 A8 |
 	c16 \grd a8. \grg e8 a8	\grg c16 \grd a8. \dblg g4 |
@@ -16,7 +16,7 @@ pipesA = {
 }
 
 pipesBA = {
-	e8 |
+	e16 |
 	\dblA A4 e8. A16	g16 A8. \hdble e8. g16 |
 	\dblg g4 \grA d8. g16	\grA b16 g8. d8. e16 |
 }

reels/lady_seaforth/pipes.ly

@@ -11,16 +11,16 @@
 		\pipeglobal
 
 		\repeat volta 2 {
-			\partial 8
-			\pipesA s8
+			\partial 16
+			\pipesA s16
 		}
 		\break
 		\repeat volta 2 {
-			\partial 8
+			\partial 16
 			\pipesBA
 		} \alternative {
 			{ \pipesBBA }
-			{ \pipesBBB s8 }
+			{ \pipesBBB s16 }
 		}
 		\bar "|."
 	}
@@ -36,7 +36,7 @@
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
-		\partial 8
+		\partial 16
 		\pipesA
 		\pipesA