Various fixes for piping scores for CMPD

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

@@ -16,7 +16,7 @@ pipesAA = {
 pipesAB = {
 	\dble e8. [ c16 ] \grg a4 \taor a8. [ b16 ] |
 	\grip c8 [ e8 ] \dblf f4 \grg e4 |
-	\grg \tuplet 3/2 { f8 [ g8 A8 ] } \hdble e4 \gra e16. [ f32 ] \grg a16. [ b32 ] |
+	\grg \tuplet 3/2 { f8 [ g8 A8 ] } \hdble e4 \gra e16. [ f32 \grg a16. b32 ] |
 	\grip c8. [ b16 ] \grG a4 \wbirl a4 |
 }
 
@@ -29,6 +29,6 @@ pipesBA = {
 pipesBBA = {
 	\grg f8. [ g16 ] \dblA A4 \grg A8 [ e8 ] |
 	\grg f8 [ A8 ] \hdble e4 \dblc c4 |
-	\grg \tuplet 3/2 { f8 [ g8 A8 ] } \hdble e4 \gra e16. [ f32 ] \grg a16. [ b32 ] |
+	\grg \tuplet 3/2 { f8 [ g8 A8 ] } \hdble e4 \gra e16. [ f32 \grg a16. b32 ] |
 	\grip c8. [ b16 ] \grG a4 \wbirl a4 |
 }

4-4_marches/auld_lang_syne/side.cmpd.ly

@@ -24,6 +24,7 @@
 	\header {
 		title = \title
 		meter = \meter
+		band = "Canadian Memorial Pipes and Drums"
 		instrument = \instrumentSide
 		composer = \composerSide
 		arranger = \arrangerSide

4-4_marches/cockney_jocks/pipes.ly

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

4-4_marches/hills_of_argyll/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/hills_of_argyll/notes.pipes.ily

@@ -1,46 +1,48 @@
 % 4/4 Hills of Argyll
 % Pipes
 \version "2.18.2"
-composerPipes = "G. McIntyre, arr. S. Cassells"
+composerPipes = "G. McIntyre"
+arrangerPipes = "S. Cassells"
 pipeglobal = {
 	\bagpipeKey
 	}
 % Music
 pipesAA = {
  \grg a8. [ b16 ] |
- \grip c4 \dblc c4 \grip a4 a8 [ \grg a16  b16 ] |
+ \grip c4	\dblc c4	\grip a4~	a8 [ \grg a16  b16 ] |
- \dblc c8 [ \gre a8 ] \dblA A8. [ g16 ] \grA f4 \dblA A8 [ f8 ] |
+ \dblc c8 [ \gre a8 ]	\dblA A8. [ g16 ]	\grA f4	\dblA A8 [ f8 ] |
- \dble e4 \grg a4 \dbld d8 [ \gre c8 ] c8 [ \gre a8 ] |
+ \dble e4	\grg a4	\dbld d8 [ \gre c8~ ]	c8 [ \gre a8 ] |
- \grip b4 \grg e4 \dblf f8 [ e8 ] \grg a8. [ b16 ] | 
+ \grip b4	\grg e4	\dblf f8 [ e8 ]
 }
 
 pipesAB = {
- \grip c4 \dblc c4 \grip a4 a8 [ \grg a16 b16 ] |
+ \grg a8. [ b16 ] | 
- \dblc c8 [ \gre a8 ] \dblA A8. [ \grf g16 ] \grA f4 \dblA A8 [ f8 ] |
+ \grip c4	\dblc c4	\grip a4~	a8 [ \grg a16 b16 ] |
- \dble e4 \grg a4 \dbld d8 [ \gre c8 ] c8 [ \gre b8 ] |
+ \dblc c8 [ \gre a8 ]	\dblA A8. [ \grf g16 ]	\grA f4 \dblA A8 [ f8 ] |
- \gra a2 \wbirl a4 
+ \dble e4	\grg a4	\dbld d8 [ \gre c8~ ]	c8 [ \gre b8 ] |
+ \gra a2	\wbirl a4 
 }
 
 pipesBA = {
  \dblc c8 [ e8 ] |
- \grg f8 [ \thrwd d8 ] d8 [ f8 ] \dblA A4 \grf g8 [ f8 ] |
+ \grg f8 [ \thrwd d8~ ]	d8 [ f8 ]	\dblA A4	\grf g8 [ f8 ] |
- \grg e8 [ a8 ] a8 [ \grd c8 ] \dble e4 \grg f8 [ e8 ] |
+ \grg e8 [ a8~ ]	a8 [ \grd c8 ]	\dble e4	\grg f8 [ e8 ] |
- \thrwd d8 [ \gre b8 ] b8 [ \grd c8 ] \thrwd d4 \dble e8 [ d8 ] |
+ \thrwd d8 [ \gre b8~ ]	b8 [ \grd c8 ]	\thrwd d4	\dble e8 [ d8 ] |
- \dblc c8 [ \gre a8 ] a8 [ \dblc c8 ] \gre b4  
+ \dblc c8 [ \gre a8~ ]	a8 [ \dblc c8 ]	\gre b4  
 }
 
 pipesBBA = {
  \dblc c8 [ e8 ] |
- \grg f8 [ \thrwd d8 ] d8 [ f8 ] \dblA A4 \grf g8 [ f8 ] |
+ \grg f8 [ \thrwd d8~ ]	d8 [ f8 ]	\dblA A4	\grf g8 [ f8 ] |
- \grg e8 [ a8 ] a8 [ \grd c8 ] \dble e4 \gra e8 [ d8 ] |
+ \grg e8 [ a8~ ]	a8 [ \grd c8 ]	\dble e4	\gra e8 [ d8 ] |
- \dblc c4 \grd a4 \thrwd d8 [ \gre c8 ] c8 [ \gre b8 ] |
+ \dblc c4	\grd a4	\thrwd d8 [ \gre c8~ ]	c8 [ \gre b8 ] |
- \gra a2 \wbirl a8 [ b8 ]
+ \gra a2	\wbirl a8 [ b8 ]
 }
 
 pipesBBB = {
  \grg a8. [ b16 ] |
- \grip c4 \dblc c4 \grip a4 a8 [ \grg a16 b16 ] |
+ \grip c4	\dblc c4	\grip a4~	a8 [ \grg a16 b16 ] |
- \dblc c8 [ \gre a8 ] \dblA A8. [ g16 ] \grA f4 \dblA A8 [ f8 ] |
+ \dblc c8 [ \gre a8 ]	\dblA A8. [ g16 ]	\grA f4	\dblA A8 [ f8 ] |
- \dble e4 \grg a4 \dbld d8 [ \gre c8 ] c8 [ \gre b8 ] |
+ \dble e4	\grg a4	\dbld d8 [ \gre c8~ ]	c8 [ \gre b8 ] |
- \gra a2 \wbirl a4 
+ \gra a2	\wbirl a4 
 }

4-4_marches/hills_of_argyll/pipes.ly

@@ -30,7 +30,7 @@
 					\part \halfline \break
 					}
 				}
-			
+				\bar "|."
 			}%Format
 			{ 
 				\pipesAA
@@ -47,6 +47,7 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
 \score {

4-4_marches/scotland_the_brave/high-side.cmpd.ly

@@ -0,0 +1,36 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+	\sideglobal
+        <<
+			{
+				\repeat volta 2 {\part \line \markTextEol "Fine" \break }
+				\part \line \markTextEol "D.C. al Fine" \bar "||"
+			}
+			{
+				\removeWithTag #'tutti { \snareA s8 }
+
+				\removeWithTag #'tutti { \snareBAhigh }
+			}
+		>>
+	}
+	\header {
+		title = #(string-append title " (high)" )
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+	}
+}

4-4_marches/scotland_the_brave/side.cmpd.ly

@@ -0,0 +1,36 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+	\sideglobal
+        <<
+			{
+				\repeat volta 2 {\part \line \markTextEol "Fine" \break }
+				\part \line \markTextEol "D.C. al Fine" \bar "||"
+			}
+			{
+				\removeWithTag #'tutti { \snareA s8 }
+
+				\removeWithTag #'tutti { \snareBA }
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+	}
+}

6-8_marches/the_steamboat/pipes.48th.ly

@@ -28,6 +28,7 @@
 	\header {
 		title = \title
 		meter = \meter
+		band = "48th HIGHRS"
 		instrument = \instrumentPipes
 		composer = \composerPipes
 	}

airs/abide_with_me/full.ly

@@ -10,13 +10,19 @@
 \include "./notes.pipes.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 Voice = "format" { \line \line
 			  		\break
@@ -34,10 +40,11 @@
 			  	\verseA
 			}
 		}
-		\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}
 
 			\repeat unfold 3 { \snareAA }
 			\snareAB

airs/rose_of_kelvingrove/full.ly

@@ -43,7 +43,7 @@
 						\quartline
 					} \alternative {
 						\quartline
-						{ \halfline \quartline }
+						{\quartline \measure}
 					}
 					\bar "|."
 				}%Format

airs/rose_of_kelvingrove/notes.pipes.ily

@@ -47,8 +47,5 @@ pipesBA = {
 pipesBEnding = {
 	\grA f2~ f4 \birl a4 |
 	\grg f4 e4 \grg d4 c4 |
-	\thrwd d1~ |
+	\thrwd d1\fermata |
-	d1~  |
-	d1~  |
-	d1~ 
 }

airs/rose_of_kelvingrove/pipes.ly

@@ -6,7 +6,7 @@
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
-\pbreak = \break
+pbreak = \break
 \score {
     \new Staff {
 		\global
@@ -29,7 +29,7 @@
 					\quartline
 				} \alternative {
 					{\quartline \pbreak}
-					{ \halfline \quartline }
+					{ \quartline \measure }
 				}
 				\bar "|."
 			}%Format

airs/sands_of_kuwait/notes.pipes.ily

@@ -7,12 +7,13 @@ pipeglobal = {
 	\bagpipeKey
 }
 % Music
-pipesA = {
+pipesAA = {
 	a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ]~  f4 \grg e8 [ d8 ] |
 	\grg G4~ G8 [ \grd G8 ] ~ G8 [ d8 ] \grG a4 ~ a4 \grg \tuplet 3/2 { f8. [ e16 d8 ] } |
 	\grg a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ] ~ f4 \grg e8 [ d8 ] |
 	\slurd d4~ d8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4 ~ e8 [ f8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } |
-
+}
+pipesAB = {
 	\grg a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ]~ f4 \grg e8 [ d8 ] |
 	\grg G4~ G8 [ \grd G8 ]~ G8 [ d8 ] \grG a4~ a4 \grg \tuplet 3/2 { a8. [ b16 c8 ] } |
 	\thrwd d4~ d8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4~ e8 [ a8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } |
@@ -32,8 +33,8 @@ pipesBBA = {
 	\thrwd d4~ d8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4~ e8 [ a8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } |
 	\grg d4~ d4~ d4 \slurd d4~ d4 \grg \tuplet 3/2 { f8. [ e16 d8 ] }
 }
-pipesBBB = {
+pipesBBB = { % pipesAB
-	a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ]~ f4 \grg e8 [ d8 ] |
+	\grg a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ]~ f4 \grg e8 [ d8 ] |
 	\grg G4~ G8 [ \grd G8 ]~ G8 [ d8 ] \grG a4~ a4 \grg \tuplet 3/2 { a8. [ b16 c8 ] } |
 	\thrwd d4~ d8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4~ e8 [ a8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } |
 	\grg d4~ d4~ d4 \slurd d4~ d4~ d4

airs/sands_of_kuwait/pipes.ly

@@ -11,7 +11,8 @@
 		\pipeglobal
 
 		\repeat volta 2 {
-			\pipesA
+			\pipesAA
+			\pipesAB
 		}
 		\break
 		\repeat volta 2 {
@@ -38,7 +39,8 @@
 		%%Tune
 		\unfoldRepeats {
 			\repeat volta 2 {
-				\pipesA
+				\pipesAA
+				\pipesAB
 			}
 			\break
 			\repeat volta 2 {

standards/98_standards.side.ly

@@ -19,7 +19,6 @@
 	}
 	\header {
 		title = "9/8 Standards"
-		band = "Canadian Memorial Pipes and Drums"
 		meter = "Quick March"
 		composer = ""
 		instrument = "Side"