Merge branch 'master' of ssh://deboone.nl://home/ericteunis/public/git/pipeband-music

2-4_marches/mackenzie_highlanders/full.alt.ly

@@ -0,0 +1,89 @@
+\version "2.19.0"
+
+\include "config.ily"
+\include "notes.bass.ily"
+\include "notes.tenor.alt.ily"
+\include "notes.side.alt.ily"
+\include "notes.pipes.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\bagpipeKey
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				{
+				\repeat volta 2 {
+					\part \line
+				}\break
+
+				\part \line \bar "||" \break
+				\line \bar "|."
+				}%Format
+				{
+				\pipesA s8
+
+				\pipesB
+				\pipesBA
+		
+				\pipesB
+				\pipesBB
+				}%Pipes
+			>>
+		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			\snareA s8
+		
+			\snareBA
+		
+			\snareBB
+
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+			
+			\tenorA s8
+
+			\tenorBA
+		
+			\tenorBB s8
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+			s8 \bassA
+			
+			s8 \bassBA 
+		
+			\bassBB
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(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=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}

2-4_marches/mackenzie_highlanders/full.ly

@@ -50,7 +50,7 @@
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 			
-			r8 \tenorA s8
+			\tenorA s8
 
 			\tenorBA
 		

2-4_marches/mackenzie_highlanders/notes.tenor.alt.ily

@@ -0,0 +1,85 @@
+% 2/4 MacKenzie Highlanders
+% Tenor
+\version "2.18.2"
+composerTenor = "E.T. de Boone, v0.0.1, 2016"
+tenorglobal = {
+	\eighthBeaming
+}
+% Music
+
+tenorA = \drummode {
+	g8 |
+	d16.\< g32 d16. g32\!
+	r16. g32\< \triplet { d16 g d }
+	|
+	g16.->\< d32 g16. g32 \!
+	r16. d32\< \triplet { g16 d g }
+	|
+	d16. \< g32 d16. d32 \!
+	r16 g16\< r16 d16
+	|
+	r16 g16 r16 d16
+	g8\! g8
+	|
+
+	d16.\< g32 d16. g32 \!
+	r16. g32\< \triplet { d16 g d }
+	|
+	g16.->\< d32 g16. g32 \!
+	r16. g32\< d16. g32
+	|
+	d32 g16.\! d16. g32
+	r16. g32 d16. g32
+	|
+	d8.. g32
+	r8
+
+}
+tenorBA = \drummode {
+	g8 |
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	d4
+	r8 g8
+	|
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	r4
+	d8 g8
+	|
+	
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	d4 r8 g8
+	|
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	r4 r8
+}
+tenorBB = \drummode {
+	g8 |
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	d4
+	r8 g8
+	|
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	r4
+	d8 g8
+	|
+	
+	\repeat unfold 3
+	{
+		r8 d32 g16.
+		r8 d32 g16.
+		|
+	}
+	d4 r8
+}

2-4_marches/mackenzie_highlanders/tenor.alt.ly

@@ -0,0 +1,34 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.tenor.alt.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			{
+				\repeat volta 2 {
+					\part \line
+				}
+				\break
+
+				\part \line \bar "||" \break
+				\line \bar "|."
+			}%Format
+			{
+				\tenorA s8
+
+				\tenorBA
+				\tenorBB s8
+			}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+	}
+}

init-sets

@@ -6,11 +6,6 @@ trap "echo Aborted!; exit;" SIGINT SIGTERM
 
 for f in full drums side pipes tenor bass; do
 
-$COM $D/mackenzie_bear.$f.ly \
-2-4_marches/mackenzie_highlanders/$f.ly \
-2-4_marches/black_bear/$f.ly \
-;
-
 $COM $D/mackenzie_msr.$f.ly \
 2-4_marches/mackenzie_highlanders/$f.ly \
 strathspeys/lady_mackenzie_of_fairburn/$f.ly \
@@ -47,14 +42,12 @@ $COM $D/set_6.$f.ly \
 ;
 
 $COM $D/set_7.$f.ly \
-4-4_marches/51st_highlanders/$f.ly \
+4-4_marches/51st_highland_division/$f.ly \
 4-4_marches/scotland_the_brave/$f.ly \
 ;
 
 $COM $D/set_8.$f.ly \
 6-8_marches/10th_hli_crossing_the_rhine/$f.ly \
-6-8_marches/farewell_to_the_creeks/$f.ly \
-6-8_marches/cock_o_the_north/$f.ly \
 ;
 
 $COM $D/set_9.$f.ly \
@@ -79,6 +72,12 @@ $COM $D/set_12.$f.ly \
 4-4_marches/the_old_rustic_bridge/$f.ly \
 ;
 
+$COM $D/set_13.$f.ly \
+3-4_marches/castle_dangerous/$f.ly \
+3-4_marches/pm_jk_cairns/$f.ly \
+3-4_marches/lochanside/$f.ly \
+;
+
 $COM $D/set_14.$f.ly \
 4-4_marches/minstrel_boy/$f.ly \
 2-4_marches/pipers_cave/$f.ly \
@@ -89,6 +88,21 @@ $COM $D/set_15.$f.ly \
 4-4_marches/hills_of_argyll/$f.ly \
 ;
 
+$COM $D/set_16.$f.ly \
+6-8_marches/farewell_to_the_creeks/$f.ly \
+6-8_marches/cock_o_the_north/$f.ly \
+;
+
+$COM $D/set_17.$f.ly \
+2-4_marches/teribus/$f.ly \
+2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/$f.ly \
+;
+
+$COM $D/set_18.$f.ly \
+2-4_marches/mackenzie_highlanders/$f.ly \
+2-4_marches/black_bear/$f.ly \
+;
+
 $COM $D/alexander_mackenzie_cullen_bay.$f.ly \
 airs/alexander_mackenzie/$f.ly \
 5-4_marches/cullen_bay/$f.ly \

strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily

@@ -45,9 +45,9 @@ tenorBB = \drummode {
 	r4
 	|
 	d16 g8.
-	\flourish d4
-	g8. d16
 	\flourish g4
+	g8. d16
+	\flourish d4
 	|
 	\triplet { d8 g d }
 	g4