From a598483dad265f9682df367f813ddb499642c966 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Fri, 14 Oct 2016 21:12:28 +0200
Subject: [PATCH] Added Tenor score for Alexander MacKenzie

---
 airs/alexander_mackenzie/drums.ly        | 69 ++++++++++++++++++++++++
 airs/alexander_mackenzie/notes.bass.ily  | 16 ++++++
 airs/alexander_mackenzie/notes.side.ily  | 25 ++++-----
 airs/alexander_mackenzie/notes.tenor.ily | 36 +++++++++++++
 init-sets                                |  4 +-
 5 files changed, 136 insertions(+), 14 deletions(-)
 create mode 100644 airs/alexander_mackenzie/drums.ly
 create mode 100644 airs/alexander_mackenzie/notes.bass.ily
 create mode 100644 airs/alexander_mackenzie/notes.tenor.ily

diff --git a/airs/alexander_mackenzie/drums.ly b/airs/alexander_mackenzie/drums.ly
new file mode 100644
index 0000000..b2b4c43
--- /dev/null
+++ b/airs/alexander_mackenzie/drums.ly
@@ -0,0 +1,69 @@
+\version "2.19.0"
+
+\include "config.ily"
+%\include "notes.bass.ily"
+\include "notes.tenor.ily"
+\include "notes.side.ily"
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "side" {
+			\global
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			<<
+				{
+					\repeat volta 2 { \part \halfline \break \halfline } \break
+					\repeat volta 2 { \part \halfline \break }
+						\alternative{ {\part \halfline \break}{\part \halfline \break} }
+					\bar "|."
+				}%Format
+				{ 
+					\snareAA \snareAB s8
+
+					\snareBA s8
+					\snareBB s8
+					\snareAB s8
+				}%Music
+			>>
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			\tenorAA \tenorAB s8
+			\tenorBA s8
+			\tenorBB s8
+			\tenorAB s8
+		}
+%		\new PipeBandDrumStaff = "bass" {
+%			\bassglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+%
+%			\bassAA \bassAB s8
+%			\bassBA s8
+%			\bassBB s8
+%			\bassAB s8
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(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=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/alexander_mackenzie/notes.bass.ily b/airs/alexander_mackenzie/notes.bass.ily
new file mode 100644
index 0000000..bc42201
--- /dev/null
+++ b/airs/alexander_mackenzie/notes.bass.ily
@@ -0,0 +1,16 @@
+% 6/8 Alexander MacKenzie
+% Bass
+\version "2.18.2"
+composerBass  = "v0, E.T. de Boone, 2016"
+bassglobal = {}
+% Music
+bassAA = \drummode {
+}
+bassAB = \drummode {
+}
+
+
+bassBA = \drummode {
+}
+bassBB = \drummode {
+}
diff --git a/airs/alexander_mackenzie/notes.side.ily b/airs/alexander_mackenzie/notes.side.ily
index 0df83a0..3c53108 100644
--- a/airs/alexander_mackenzie/notes.side.ily
+++ b/airs/alexander_mackenzie/notes.side.ily
@@ -1,36 +1,37 @@
 % 6/8 Alexander MacKenzie
 % Side
 \version "2.18.2"
-composerSide = ""
+composerSide = "version 1.1, E.T. de Boone, 2016"
+sideglobal = {}
 snareAA = \drummode {
 	d16. g32 |
 	d8:32( d8.)-> g16 d4:32( d8) |
-	\dragd d16. d32-> g16. g32 \flamd d8 d4.:32( |
+	\dragddr d16. d32-> g16. g32 \flamd d8 d4.:32( \< |
 
-	d4) d16. g32 d8:32( d8) g8 |
-	\flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4
+	d4) \! \fr d16. g32 d8:32( d8) g8 |
+	\flamddr d16.\< g32 d16. \flamg g32 d16. g32 \flamd d4 \! \fr
 }
 snareAB = \drummode {
 	d16. g32 |
 	d8:32( d8.)-> g16 d4:32( d8) |
-	\dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 |
+	\dragd d16. d32-> g16. g32 \flamd d8 d4:32( \< \dr d16.) \! g32 |
 
-	d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 |
+	d8:32( g16.) \fr d32-> g16. g32 d8:32( \dr g16.) \fr d32-> g16. g32 |
 	d4.:32( d4)
 }
 snareBA = \drummode {
 	d8:32( |
-	g4) \flamd d16. g32 d8:32( d8) \flamd d8 |
+	g4) \flamddr d16. g32 d8:32( d8) \flamd d8 \fr |
 	d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32		d4-> d8:32(
 
-	g4) \flamd d16. g32 d8:32( d8.) g16 |
-	d4.:32( d4)
+	g4) \flamddr d16. g32 d8:32( d8.) g16 |
+	d8:32(\< d4:32 \> d4)\! \fr
 }
 snareBB = \drummode {
 	d8:32( |
-	g4) \flamd d16. g32 d8:32( d8) \flamd d8 |
+	g4) \flamddr d16. g32 d8:32( d8) \flamd d8 |
 	d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 |
 
-	d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 |
-	d4.:32( d4)
+	d8:32( g16.) \fr d32-> g16. g32 d8:32( \dr g16.) \fr d32-> g16. g32 |
+	d4.:32( \dr d4) \fr
 }
diff --git a/airs/alexander_mackenzie/notes.tenor.ily b/airs/alexander_mackenzie/notes.tenor.ily
new file mode 100644
index 0000000..8da16c9
--- /dev/null
+++ b/airs/alexander_mackenzie/notes.tenor.ily
@@ -0,0 +1,36 @@
+% 6/8 Alexander MacKenzie
+% Tenor
+\version "2.18.2"
+composerTenor = "v0.9, E.T. de Boone, 2016"
+tenorglobal = {}
+% Music
+tenorAA = \drummode {
+  s8 |
+  d8 g4 	d4. |
+  d8 g16 d g8	d4 d16 \< g16 |
+  d4.-> \!	d8 g d |
+  g8 d16\< g d g	d4\!
+}
+tenorAB = \drummode {
+  s8 |
+  d8 g4		d4. |
+  d8 g16 d g8	d4. |
+  d8 d8.-> g16	d8 d8.-> g16 |
+  d4 g8	d4
+}
+
+tenorBA = \drummode {
+  d8 |
+  g4-> d16 g	d8 g d |
+  d16-> g d g d-> g		d4 d8 |
+  g4-> d8	g8 d4 |
+
+  g8 d4		d4
+}
+tenorBB = \drummode {
+  d8 |
+  g4-> d16 g	d8 g d |
+  d16-> g d g d-> g		d4 d8 |
+  d8 d8.-> g16	d8 d8.-> g16 |
+  d4 g8	d4
+}
diff --git a/init-sets b/init-sets
index de6102c..a6c1e89 100644
--- a/init-sets
+++ b/init-sets
@@ -1,5 +1,5 @@
 #!/bin/bash
-COM='./make-set -c'
+COM='./make-set '
 D='./sets'
 
 trap "echo Aborted!; exit;" SIGINT SIGTERM
@@ -63,7 +63,7 @@ airs/morag_of_dunvegan/$f.ly \
 
 $COM $D/set_11.$f.ly \
 4-4_marches/flett_from_flotta/$f.ly \
-4-4_marches/crusaders_march/$f.ly \
+4-4_marches/the_crusaders_march/$f.ly \
 4-4_marches/the_pikemans_march/$f.ly \
 ;