From d8ef790ade2b230a555b31cdc7cd63bc468caf52 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Tue, 15 Mar 2016 16:33:09 +0100
Subject: [PATCH] Added quite a few sets Small update to make_set script

---
 2-4_marches/mackenzie_highlanders/tenor.ly | 12 ++---
 init-sets                                  | 57 ++++++++++++++++++++--
 make-set                                   | 10 ++--
 3 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/2-4_marches/mackenzie_highlanders/tenor.ly b/2-4_marches/mackenzie_highlanders/tenor.ly
index e6f2ba6..abb1e08 100644
--- a/2-4_marches/mackenzie_highlanders/tenor.ly
+++ b/2-4_marches/mackenzie_highlanders/tenor.ly
@@ -10,20 +10,18 @@
 	<<
 			{
 				\repeat volta 2 {
-					\line
+					\part \line
 				}
-
-				\part \line 
-				\bar "||"
 				\break
 
-				\part \line \bar "|."
+				\part \line \bar "||" \break
+				\line \bar "|."
 			}%Format
 			{
-				\tenorA
+				r8 \tenorA s8
 
 				\tenorBA
-				\tenorBB
+				\tenorBB s8
 			}
 	>>
 	}
diff --git a/init-sets b/init-sets
index 4b2a1c0..40551bf 100644
--- a/init-sets
+++ b/init-sets
@@ -6,7 +6,12 @@ trap "echo Aborted!; exit;" SIGINT SIGTERM
 
 for f in full drums side pipes tenor bass; do
 
-$COM $D/mackenzie_set.$f.ly \
+$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 \
 reels/the_mackenzies_reel/$f.ly \
@@ -23,6 +28,12 @@ $COM $D/set_2.$f.ly \
 2-4_marches/mairis_wedding/$f.ly \
 ;
 
+$COM $D/set_4.$f.ly \
+3-4_marches/collins_cattle/$f.ly \
+3-4_marches/my_land/$f.ly \
+3-4_marches/shoals_of_herring/$f.ly \
+;
+
 $COM $D/set_5.$f.ly \
 4-4_marches/scotland_the_brave/$f.ly \
 4-4_marches/wings/$f.ly \
@@ -30,10 +41,25 @@ $COM $D/set_5.$f.ly \
 4-4_marches/scotland_the_brave/$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_pikemans_march/$f.ly \
+$COM $D/set_6.$f.ly \
+4-4_marches/bonnie_lass_o_fyvie/$f.ly \
+4-4_marches/cockney_jocks/$f.ly \
+;
+
+$COM $D/set_7.$f.ly \
+4-4_marches/51st_highlanders/$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 \
+airs/the_mist_covered_mountains/$f.ly \
+airs/my_home/$f.ly \
 ;
 
 $COM $D/set_10.$f.ly \
@@ -42,6 +68,27 @@ airs/morag_of_dunvegan/$f.ly \
 4-4_marches/were_no_awa_tae_bide_awa/$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_pikemans_march/$f.ly \
+;
+
+$COM $D/set_12.$f.ly \
+4-4_marches/the_leaving_of_liverpool/$f.ly \
+4-4_marches/the_old_rustic_bridge/$f.ly \
+;
+
+$COM $D/set_14.$f.ly \
+4-4_marches/minstrel_boy/$f.ly \
+2-4_marches/pipers_cave/$f.ly \
+;
+
+$COM $D/set_15.$f.ly \
+3-4_marches/on_the_road_to_passchendaele/$f.ly \
+4-4_marches/hills_of_argyll/$f.ly \
+;
+
 $COM $D/alexander_mackenzie_cullen_bay.$f.ly \
 airs/alexander_mackenzie/$f.ly \
 5-4_marches/cullen_bay/$f.ly \
diff --git a/make-set b/make-set
index 431d406..a846468 100644
--- a/make-set
+++ b/make-set
@@ -1,8 +1,7 @@
 #!/bin/python3
-
 ## Script to easily generate a set (concatenated scores)
 
-import codecs, os
+import codecs, os, sys
 from argparse import ArgumentParser
 
 parser = ArgumentParser(__file__)
@@ -12,6 +11,10 @@ parser.add_argument('scores',nargs='+')
 
 args = parser.parse_args()
 
+if os.path.isdir(args.setfile):
+	print("First argument cannot be a directory ")
+	sys.exit()
+
 os.makedirs(os.path.dirname(args.setfile), exist_ok=True)
 fpoint = codecs.open(args.setfile, 'w+', 'utf8')
 fpoint.write(u'\ufeff')
@@ -40,6 +43,3 @@ for f in args.scores:
 		fpoint.write('\\include \"' + os.path.join( os.path.abspath( os.curdir ) ,f) + '\"\n')
 
 fpoint.close()
-
-
-