Updated Cabar Feidh, added extra 2/4 parts

4-4_marches/cabar_feidh/full.ly

@@ -0,0 +1,133 @@
+\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 "../../standards/24_44_standards.side.ily"
+\include "./notes.pipes.ily"
+%\include "./notes.pipes.seconds.ily"
+%\include "./notes.lyrics.ily"
+
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
+#(set-global-staff-size 17)
+\score {
+	\new StaffGroup <<
+		\new Staff \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\global
+			\pipeglobal
+			<<
+				\new NullVoice = "format" {
+					\repeat unfold 4 {
+						\part
+						\line
+						\bar "||"
+					 	\break
+					}
+				}%Format
+
+				\new Voice = "pipes" {
+					\pipesA s8
+
+					\pipesB s8
+
+					\pipesC s8
+
+					\pipesD s8
+				}%Pipes
+			>>
+		}
+%{		\new Staff = "song" {
+  			\lyricsglobal
+			\new Voice = "lyrics" {
+
+			}
+		}
+}%
+%{		\new Lyrics = "verse1" {
+		  \lyricsglobal
+		  \lyricsto "lyrics" {
+			\verseA
+		  }
+		}
+%}
+%{		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
+		} {
+			\pipessecndglobal
+
+		}
+%}
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
+			\sideglobal
+
+			\simpleSnarepone \midone \simpleSnarepone \simpleSnareEndingI r8
+			\tutti { \simpleSnarepone \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
+
+			\simpleSnareptwo \midone \simpleSnareptwo \simpleSnareEndingI r8
+			\tutti { \simpleSnareptwo \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
+
+			\simpleSnarepthree \midone \simpleSnarepthree \simpleSnareEndingI r8
+			\tutti { \simpleSnarepthree \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
+			
+			\simpleSnarepfour \midone \simpleSnarepfour \simpleSnareEndingI r8
+			\tutti { \simpleSnarepfour \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
+
+
+		}
+%{
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+		}
+%}
+%{
+		\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 }}#} )
+			}
+		}
+	}
+}

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

@@ -1,16 +1,42 @@
 % 4/4 Cabar Feidh
 % Side
 \version "2.18.2"
-composerSide = ""
+composerSide = "Seaforth Highlanders of Canada"
 arrangerSide = ""
+arrangerSideSimple = "E.T. de Boone, 2018"
 sideglobal = {
-	\sixteenthBeaming
+	\eighthBeaming
 }
 % Music
 simpleSnarepone = \drummode {
 	g8 |
-	\flam d16. g32 \triplet { d16 g d }	\flam g8 g	d4:32~ d8
+	\flam d16. g32 \triplet { d16 g d }
+	\flam g8 g
+	d4:32~
+	d8
 }
+simpleSnareptwo = \drummode {
+	g8 |
+	d8:32( \triplet { g16) d g }
+	d8-> d8:32(
+	\triplet { g16) d g } d16. d32
+	\flam g8
+}
+simpleSnarepthree = \drummode {
+	g8 |
+	\flam d8 g16. d32->
+	\triplet { g16 d g } \flam d16. g32
+	d16. d32-> \triplet { g16 d g }
+	d8->
+}
+simpleSnarepfour = \drummode {
+	d8:32( |
+	g16.) g32-> \triplet { d16 g d }
+	\flam g16. d32-> g16. g32
+	\flam d16. g32-> \triplet { d16 g d }
+	g8
+}
+
 simpleSnareEndingI = \drummode { \tutti {
 	g8 |
 	\flam d4 d4:32~ d4
@@ -20,7 +46,7 @@ simpleSnareEndingII = \drummode {
   \flam d16 g d \flam g
   d16 g \flam d g
   d16 \flam g d g
-  \flam d4:32(
+  d4:32(
   |
   d8) \flam g8
   d32 g d g d16.-> g32

4-4_marches/cabar_feidh/pipes.agira.ly

@@ -12,14 +12,15 @@
 		<<
 			\new NullVoice = "format" {
 				\repeat unfold 4 {
-				  \repeat volta 2 {
 				  	\part
-					\line
+					\halfline
-				  }
+					\break
+					\halfline
+					\bar "||"
 				  \break
 				}
+				\bar "|."
 			}%Format
-			
 			\new Voice = "pipes" {
 				\pipesAgiraA s8
 

4-4_marches/cabar_feidh/pipes.ly

@@ -10,24 +10,23 @@
 		\global
 		\pipeglobal
 		<<
-			\new NullVoice = "format" {
+			%\new NullVoice = "format" {
-				\repeat unfold 4 {
+			%	\repeat unfold 4 {
-				  \repeat volta 2 {
+			%	  	\part
-				  	\part
+			%		\halfline
-					\line
+			%		\break
-				  }
+			%		\halfline
-				  \break
+			%		\bar "||"
-				}
+			%	  \break
-			}%Format
+			%	}
+			%	\bar "|."
+			%}%Format
 			
 			\new Voice = "pipes" {
-				\pipesA s8
+				\partial 8 \pipesA s8 \bar "||" \break
-
+				\partial 8 \pipesB s8 \bar "||" \break
-				\pipesB s8
+				\partial 8 \pipesC s8 \bar "||" \break
-
+				\partial 8 \pipesD s8 \bar "|."
-				\pipesC s8
-
-				\pipesD s8
 			}
 		>>
 	}

4-4_marches/cabar_feidh/side.ly

@@ -6,6 +6,7 @@
 \include "./notes.side.ily"
 \include "../../standards/24_44_standards.side.ily"
 
+#(set-global-staff-size 18)
 \score {
     \new PipeBandDrumStaff {
         \global
@@ -20,24 +21,26 @@
 			%	  { s1*2 }
 			%	}
 			% }
-			%
 			%}%Format
 			
 			\new DrumVoice = "side" {
 				\partial 8 \simpleSnarepone \midone \simpleSnarepone \simpleSnareEndingI r8
 				\tutti { \simpleSnarepone \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-				
 				\bar "||"
+				\break
 
-				\break
+				\partial 8 \simpleSnareptwo \midone \simpleSnareptwo \simpleSnareEndingI r8
-				\repeat unfold 3 {
+				\tutti { \simpleSnareptwo \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-					\partial 8 \pempty \midone \pempty \simpleSnareEndingI r8  s8
-					\break
-					\tutti {
-					\partial 8 \cadenzaOn \pempty \cadenzaOff \removeWithTag #'tutti \midone \simpleSnareEndingII s8
-				  }
 				\bar "||"
-			  }
+				\break
+
+				\partial 8 \simpleSnarepthree \midone \simpleSnarepthree \simpleSnareEndingI r8
+				\tutti { \simpleSnarepthree \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
+				\bar "||"
+				\break
+
+				\partial 8 \simpleSnarepfour \midone \simpleSnarepfour \simpleSnareEndingI r8
+				\tutti { \simpleSnarepfour \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
 				\bar "|."
 			}
 		>>
@@ -47,6 +50,6 @@
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
-		arranger = \arrangerSide
+		arranger = \arrangerSideSimple
 	}
 }

airs/bells_of_dunblane/notes.side.ily

@@ -9,11 +9,11 @@ snarePI = \drummode {
 		\flam g8\! \triplet { d16 g d }
 		\flam g8 \triplet { d16 g d }
 		\flam g8 \triplet { d16 g d }
-		\flam g8 \backstick d
+		\flam g8 \flam \backstick d
 		|
 }
 snarePII = \drummode {
-		\backstick g8\! \triplet { d16 g d }
+		\flam \backstick g8\! \triplet { d16 g d }
 		\flam g8 \triplet { d16 g d }
 		\flam g8 \triplet { d16 g d }
 		\flam \triplet { g16\< d g } 	\flam \triplet { d16 g d \! }
@@ -23,18 +23,18 @@ snarePIII = \drummode {
 		\flam d8\! \triplet { d16 g d }
 		\flam g8 \triplet { d16 g d }
 		\flam g8 \triplet { d16 g d }
-		\flam g8 \backstick d
+		\flam g8 \flam \backstick d
 		|
 }
 snarePIV = \drummode {
-				\backstick g8\! \triplet { d16 g d }
+				\flam \backstick g8\! \triplet { d16 g d }
 				\flam g8 \triplet { d16 g d }
 				\flam g8 \triplet { d16 g d }
-				\flam g8 \backstick d
+				\flam g8 \flam \backstick d
 				|
 }
 snarePV = \drummode {
-				\backstick g1
+				\flamg \backstick g1
 }
 
 snareA = \drummode {

airs/the_day_thou_gavest/notes.pipes.ily

@@ -8,6 +8,7 @@ pipeglobal = {
 }
 % Music
 pipesA = {
+  a4
  \grg f4 g4 \grA f4 |
  \dblA A4 f4 e4 |
  \thrwd d4 e4 b4 |
@@ -16,10 +17,11 @@ pipesA = {
  \grg a2 \wbirl a4 |
  \thrwd d4 e4 f4 |
  \dble e2 d4 |
- \dblc c2 a4
+ \dblc c2
 }
 
 pipesB = {
+  a4
  \grg f4 g4 \grA f4 |
  \dblA A4 f4 e4 |
  \thrwd d4 e4 b4 |

standards/24_44_standards.side.ily

@@ -32,6 +32,15 @@ midfour = \drummode {
 		\drag d16. [  \drag g32  d32 g d g ]	d8
 	}
 }
+midfive = \drummode {
+	\tutti {
+		d8:32( |
+		\tuplet 3/2 { g16) d g } \flam d8
+		g16. d32-> g16. g32
+		\flam d8 d8:32(
+		g)
+	}
+}
 % Endings
 endone = \drummode {
 	\tutti {
@@ -108,7 +117,7 @@ pseven = \drummode {
 }
 peight = \drummode {
 	\tag #'upbeat { d16. g32 } |
-	\flam d8 d16. g32 	\flam d8 d16 g16
+	\flam d8 d16. g32 	\flam d8 d16. g32
 	r16. d32 g16. g32 	\flam d8
 }
 pnine = \drummode {
@@ -121,8 +130,34 @@ pnine = \drummode {
 pten = \drummode {
 	\tag #'upbeat { d16. g32 } |
 	d8:32(-> g8:32)(->
-	\triplet { d16) g d } \flam g16. g32 |
+	\triplet { d16) g d } \flam g16. g32
 	d8:32([-> g:32)(]->	d8)
 }
+peleven = \drummode {
+	\tag #'upbeat { d16. g32 } |
+	\flam d16. g32 d16. g32:64(
+	g16.:64 d32) g16.-> d32:64(
+	g16.:64 g32) d16. d32
+	\flam g8
+}
+ptwelve = \drummode {
+	\tag #'upbeat { d16. g32 } |
+	\flam d16. g32 d16. g32
+	r16. d32 g16.-> d32
+	r16. g32 d16. d32
+	\flam g8
+}
+pthirteen = \drummode {
+	\tag #'upbeat { d16. g32 } |
+	d16.:64~ d32 g16. d32:128~
+	d16. g32 d16.:64~ d32
+	g16. d32:128~ d16. g32
+	\flam d8
+}
+pfourteen = \drummode {
+	s8 |
+	s2..
+}
+
 %% Standard thingies
 midstd = \drummode { \midone }

standards/24_44_standards_extra.side.ly

@@ -9,11 +9,49 @@
 		\time 4/4
 
 		\drummode{
-		\repeat volta 2 { \partial 8 \pseven \midtwo \peight \endone }
+			\partial 8
+				\pseven
+				\bar "||"
+				\midtwo
+				\bar "||"
+				\peight
+				\bar "||"
+				\endone
+				\bar "||"
 			\break
-		\repeat volta 2 { \partial 8 \peight \midthree \pnine \endthree }
+
+			\partial 8
+				\pnine
+				\bar "||"
+				\midthree
+				\bar "||"
+				\pten
+				\bar "||"
+				\endthree
+				\bar "||"
 			\break
-		\repeat volta 2 { \partial 8 \pempty \midfour \pempty \time 2/4 \endfour }
+
+			\partial 8
+				\peleven
+				\bar "||"
+				\midfour
+				\bar "||"
+				\ptwelve
+				\bar "||"
+				\partial 8 \time 2/4 \endfour
+				\bar "||"
+			\break
+
+			\partial 8 \time 4/4
+				\pthirteen
+				\bar "||"
+				\midfive
+				\bar "||"
+				\pfourteen
+				\bar "||"
+				\endfive
+
+
 		}% End of drums %
 	}
 	\header {

standards/98_standards.side.cmpd.ly

@@ -0,0 +1,26 @@
+\version "2.18.2"
+
+\include "./98_standards.side.ily"
+
+\score {
+	\new PipeBandDrumStaff {
+		\time 9/8
+		\drummode {
+			\repeat volta 2 { \partial 8 \pone \midone \pone \endone } \break
+			\repeat volta 2 { \partial 8 \ptwo \midone \ptwo \endone } \break
+			\repeat volta 2 { \partial 8 \pfour \midone \pfour \endone } \break
+			\repeat volta 2 { \partial 8 \peight \midone \peight \endone } \break
+			\repeat volta 2 { \partial 8 \pthree \midone \pthree \endone } \break
+			\repeat volta 2 { \partial 8 \pfive \midone \pfive \endone } \break
+			\repeat volta 2 { \partial 8 \psix \midone \psix \endone } \break
+			\repeat volta 2 { \partial 8 \pnine \midone \pnine \endone } \break
+		}% End of drums %
+	}
+	\header {
+		title = "9/8 Standards"
+		band = "Canadian Memorial Pipes and Drums"
+		meter = "Quick March"
+		composer = ""
+		instrument = "Side"
+	}
+}