From 97f027179678d866e00fbf3d52db39f1efe93b59 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Sun, 17 Sep 2017 16:35:20 +0200
Subject: [PATCH] Cleaned up repo from .*.swp Slight changes for tenor
 standards and molly connell

---
 .gitignore                                      |   2 +-
 2-4_marches/black_bear/.tenor.ly.swp            | Bin 12288 -> 0 bytes
 .../the_pikemans_march/.notes.pipes.ily.swp     | Bin 12288 -> 0 bytes
 4-4_marches/the_pikemans_march/.pipes.ly.swp    | Bin 12288 -> 0 bytes
 fix.sh                                          |   9 +++++++++
 makedrum                                        |   2 +-
 sets/set_5.full.ly                              |  12 ------------
 sets/set_5.pipes.ly                             |  12 ------------
 standards/.standards.mid.ly.swp                 | Bin 16384 -> 0 bytes
 standards/standards.tenor.ily                   |   4 ++--
 standards/standards.tenor.ly                    |   5 ++---
 strathspeys/molly_connell/notes.tenor.ily       |   2 +-
 12 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 2-4_marches/black_bear/.tenor.ly.swp
 delete mode 100644 4-4_marches/the_pikemans_march/.notes.pipes.ily.swp
 delete mode 100644 4-4_marches/the_pikemans_march/.pipes.ly.swp
 delete mode 100644 sets/set_5.full.ly
 delete mode 100644 sets/set_5.pipes.ly
 delete mode 100644 standards/.standards.mid.ly.swp

diff --git a/.gitignore b/.gitignore
index c619e73..a8b4a83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 to_process/
 piobaireachd/
-sets/
+sets
 tmp/
diff --git a/2-4_marches/black_bear/.tenor.ly.swp b/2-4_marches/black_bear/.tenor.ly.swp
deleted file mode 100644
index 1365de37aee691abb9c6f08e9c60bc0c6d6ef697..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2&yNg26vvALCae`M;#7LA*f2eINbG@)T}$FXB$kkLY^rB!wk!I_q`GD&o3&ho
zxDpbHAQFFogCjS8fQ0=695``sbn>n0o}Kk$BjSWtna^}py;rYaeP7LKD%^km<SBm0
zKgiIwFgEb!^o7A4-nva27?WBxjO?T;x5m|5OPE~h*6I$W<!V1*t=$P@)u?s5-CA3<
zWhl~SwW&KvqSDz~(#c_~R}ao4LN_9r*TPsdF3*Hg=$esfru}&Sm#-rSQh*fbDbO*k
z>ev7~P#@iIr-r<peB0J@Ju5v)0aAbzAO%PPQh*d71xNu>;6G5nwAZj}*yq}EuSd)0
zn(v<FkRGG}DL@L40;B*bKnjooqyQ;E3XlS%04eYnDj=GSMH?Brz6r_W|No=q9zG2+
z_7N<Bx8MbM3?6}dU>>wV2rhw(;25ZbePA!(U=V!S%-DPI4lIG!;3aqgo`EOeA-E6j
zg4^IGm;(|V2P0rN*ae2bdhl)lalmu%0NeorTmmP+5l{!izysUCMz8^V#(qD5CGZM7
z1-HNrV6~V5Q{Wh&MhcJuqyQ;E3XlS%04YEU{0j;!vI;(xMwYZQT;SzLc+l&g!JXV3
zHkIZEw{m4_thGOaeR=ibaxeLz*Pr<Q6^kp{ALZflOr$9`;5ta$C=*MYv+J-*5J}O5
z%L2NIYAU{9H=DMmB{t8?Gy`|Hc!KLOL?{N6=;5Qs5XoLVo>;a_aCC=<r#q=+6-1kj
zvrxpPTQMm1Wv?}#QKk`1i_qmXv`54$H`Vb-<WbeQS)0?eeZdG4>?#wvOjFtAwiJ`N
z9zBIHXN_pJI1BPdrX@U<SNXAQnQ8<#w`Ut@O14BNHY<FznvH(tgylA<eVNM{>ax{~
zs9nm?p?@;IJtsZ;@6-pc8y`nZcQ~#1y;@B0+!m%coMdj$FAXp4s4*4~pU89~jO`bT
zVwFlBghF%gitiP3#psHMc`e1|VzMo?;em56y`0VUk(_No-=}cVvMq(-b6IQzuiN5P
zD)>5l80B;ar*|UCbHX@U@bmgE^b5@Jn`^|KrsSSqOEV*L-$nCPJnwyDw1-*E7V|3%
bF&ymy#D#f}v0zT>TxBWu>i+1MU-#HoV9Ab;

diff --git a/4-4_marches/the_pikemans_march/.notes.pipes.ily.swp b/4-4_marches/the_pikemans_march/.notes.pipes.ily.swp
deleted file mode 100644
index 04d9dd87954f0b95d1baaa45e5b6c25d18f7d8de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2O=}ZT6oya5MQg2!F5O%sMNyh*<Dl6nv@W8Qf(S|>31ud8Ga1YmGZRBGtvj{2
zaMz6=V8w04A5dJn72LTLap6C3=X>r<+FDvFT@-3h;LY6Jk8{s??l}Xc*B!rqdq!Q$
z+Jw(3B0V@e`}*mPqnXQShe0LQon{d6;Le|_6Gu9%?mQtKS==yawL5M-s94=@*J=lC
z?K(|w%nLh>M$q)FMkm6UJ!a1}oUl^UkrmhUTswH68%{GyI<00a)=`!hN7<l0zw7QY
zK?odT0-d-zmLH)jxruS6a6WTRojHB)5Cf6Wg@6zc0zyCt2mv7=1cbohBM`R-=rO`R
zl7@aMeGY7Sra$E&1cZPP5CTF#2nYcoAOwVf5D)@FKnNT_0**)Ydx&W57@Wud|NDRc
z|2j$Z9r^;TL95VP=nb?CJ%^q^x1d4j^9iCQ=ovH(4MSf?Fdupay@XysOVC~DEcD|z
z(R=6}v;r+dbI?WT+c42b=mWG0tw0YT8~O=fKS9Rl1IS!l76L**2nYcoAOwVf5ZEJu
z1yUtHEGWlTCC{z9%FU}HcWG6~t1`EI<>Zu^hE_hC413C*xSEV>^!7V9t-)|nY0QTa
zSoW01vtYigda#BrU-`z|q_O1lur_;cnQnY2*t~2q-O1-xIr)i&*rJ9-n%5V3qjIvF
zG1nt=!*%MWx~?7(ZH}0O<2Z_{f^V~q9fO^m>irKfPi@4!3ve8Ut@tF0%Ez~c%BF?m
z0*SqW-``{A)9)Yl<VN5oga18m?d*EEQN0sZk)%vw$Lur(Q{XviT5}e1m3RiBNnVqd
zRg<UejroZIhg<y`Gx?pA8)|X8%-m+Fv1IbLM@dm}o$>DL<>_-Fo03M&n(g9R*u^wE
zsgcC>ezK#?lD*S4cr&cKm{bazhtJHW@>i9a!``>x7vaR_=+REkJ~{ePHN#inX=s6l
zO0MJcJ78MRn|Fa<Z@Et0WJsmeXt!|n{tjP)M^7e0rH49<f>u*ya@mP|HkYAMWrp#z
REgNlfiT*;QX83A7{Q)B)!Nvdp

diff --git a/4-4_marches/the_pikemans_march/.pipes.ly.swp b/4-4_marches/the_pikemans_march/.pipes.ly.swp
deleted file mode 100644
index d68221301251fe29923bcb5179e78428d434f605..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2y-yTD7>5U>kOc6nvl^FB>FvRZfdVc$tSCqff?8}OyL)rT$bMyKmJ=_i(ZXn9
zrHQRt*hy<87B>C^n%G$z{Tuwv?ZO?W#KwmBZtl7HdUxiXXSccBc$3!_m-vi5&2XJ$
z?Dg~c8@of*A?rM2B9*=tStOMiJp5|7T8XrActA07w>x1u$-F@N<yNazPGllHH>#KF
zX%>buYL>%HVQjiIy%xHuzb;f+uZy)rZivv0RNmRSP1(WLUzeo-GC&40-6+kDu3oH6
zO&S^F);WIW^eTBF17v^<kO4A42FL&zAOmFJKQf?`0d^1j9W3^IsVE2f%A!dH86X2>
zfDDiUGC&5%02v?yWPl8i0Wxp|4Y+m2yb;EhN0B`K|KI!l|MLW6Kfo988GHb{;0<^J
z9)tTJ1_E3M%U}u2fD7O(I1UEE_c6x4f=}Qhcn@~KTksM*1CPK1unq2j7~BL)paf2V
zF)#v-fp5t99oPY{zzgscJOsBv2yTHDVD@K9y2t<-AOmE843GgbKnBPF86X4y&cHSs
zc0yT~yv-dyjv6Z>Ok$2+e1;u!*jX)H?p7DN)!KfwzviY|x&fa>z{JE#76}ungyvVZ
z+i2Kkxy49noSznv=JR~q^4z9b%0e=cXytJxqh=6$n5mOTUT2Q-<5ciAD{}N>B#Z;y
zm<Jok>sL(LSXB0|;&fYk<Dt;`jhzZ^&{7A&%+#qMn|0yV5z@|mRI7;Tm^t8PzhUg`
zH)^b>RpZL&7;f{P83Gvz?s%ziH}cTmIufYlPJg#~G-jRt{y+7Y8S=?fkqB4w%{b65
zub3?%9emBr;j7m$T7_$ltM`F)<ulmygRCyNWtXE^3uSlS6<Y>d)`3CuQpslC-!o7=
Zah!;^*rDB<B2_YuxK**IX6=f_egT$r8Eyao

diff --git a/fix.sh b/fix.sh
index 8665cb1..a156227 100644
--- a/fix.sh
+++ b/fix.sh
@@ -2,3 +2,12 @@
 COMMAND=''
 
 sed "s/\"\(.*.ily\)\"/\".\/\1\"/g"  -i **/**/*.ly **/*.ly
+
+
+
+
+
+
+
+## dr|fr to tutti
+#:%s/\([^\s ]*\)\s*\\dr\(.\{-}\)\\fr/\\tutti { \1 \2 }
diff --git a/makedrum b/makedrum
index 833ff04..ce6075b 100644
--- a/makedrum
+++ b/makedrum
@@ -13,7 +13,7 @@ class MakeDrum:
 	VERSION  = '0.9.7'
 	MASTER_DIR = os.path.dirname(os.path.abspath(__file__))
 	RUN_DIR = os.path.abspath(os.curdir)
-	TMP_DIR  = '.'
+	TMP_DIR  = 'tmp'
 	TMP_PREFIX = 'tmp_'
 	OUT_DIR = '.'
 
diff --git a/sets/set_5.full.ly b/sets/set_5.full.ly
deleted file mode 100644
index 5531692..0000000
--- a/sets/set_5.full.ly
+++ /dev/null
@@ -1,12 +0,0 @@
-\version "2.18.2"
-
-\header {title = "Set 5: Scotland the Brave / Wings / Rowan Tree / Scotland the brave (high)"}
-\paper {#(define page-breaking ly:minimal-breaking)}
-#(ly:set-option 'relative-includes #t)
-
-
-%Scores
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/full.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/wings/full.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/rowan_tree/full.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/high-full.ly"
diff --git a/sets/set_5.pipes.ly b/sets/set_5.pipes.ly
deleted file mode 100644
index 1c2768e..0000000
--- a/sets/set_5.pipes.ly
+++ /dev/null
@@ -1,12 +0,0 @@
-\version "2.18.2"
-
-\header {title = "Set 5: Scotland the Brave / Wings / Rowan Tree / Scotland the brave (high)"}
-\paper {#(define page-breaking ly:minimal-breaking)}
-#(ly:set-option 'relative-includes #t)
-
-
-%Scores
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/wings/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/rowan_tree/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/high-pipes.ly"
diff --git a/standards/.standards.mid.ly.swp b/standards/.standards.mid.ly.swp
deleted file mode 100644
index d3dde9c60d67239a93822152cd73bbf2eb563409..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
zcmeI&e~1)i7{KvYD|1af^XP>BuyIUJu-nr+x${@2cSR!RkMNQc26FFq_HJ}{cA1&=
z^0y%s1sPe2C}k8BXegw06oI6F7<JYkWd<2&ToFN$Wkpud_nq5yXYX!x>HK3^-o+1l
z`@ZA5`#k%wJI}k*K5Na=<yvESj^H*yh(FeBZ=29IY2<TNLYR)#;hAaMa^+;<TP)(a
zrV}fCKxSrpZo%4Ax;<`n)OL4w*QTtL*&eZ@HBl#>NLY4fZ6fV5=XwlAoT!`oE1a;R
z;rON-K9f2?Wk6*hF9T^WRx@{;sIQwnOO8*~r)ZTEAI&>NJy01?8BiHe8BiHe8BiHe
z8BiHe87S`zc&U+M2O*BkgxQ$6A2HzmmdxYFGWYWb%x4~|JCy;I0hIxj0hIxj0hIxj
z0hIxj0hIxj0hIxjffCF>Br1eHMu@xb;KlL#f42Ysxk8Aa@FmXS9lV4W@eG==2u+xV
zD*QWMh%2~=FK`T9n1m{fz>njE_#B_&W4wWNxDylb&sZUTKp!sR96rE%=)t>q8M~22
z9Bp_Q)woC;&to?>VI7vB1x=7~-h~i$688>RSdEofhQ+AHy^y(?g3<UZ#QHdo)9Aq-
zEW_2&%%cyzIDun0f~V1pUvC%UGA`f@PU9p_;2`#6ANFD^5@^LTG-4)3;p8YGY$VWz
z#h8JqxCejV#`}dBOsv8JG@>3eP=T=+gAjhXRftRY2q$p_hp-v-_?8WzOX$UM9Kc?@
zfCQ@X6`M%s@ga`jO}vi%*nzFsjQ-m;5#nFSv%I*e-LL8MYUgUJGnahmB4l)#k*Mit
zTSTa-iR0w4A)`Iwx+^T(G_B4q&s}Mo1xEd0*YvbiTwKz^btDgRZ3(N#Vqv!{>3B<R
z*JH%Ay%mv!e0n1haW<q=TQp<9d<)Om|J*|_XBA#4HzgO*<SK@3b`O3{GJF}CE~D*_
z)PKs5;hA>Q$qTqehBnkhvmdi#rp$<^ZA`|!h*rmX{^-yzeL$o)%0#PtEq)XsW9S8Q
z0S{U$H<eqaa5DU``?Fzq7H<&6K}pEu`ETM9Cz(!Z3l|E*?MON%VNTO(hP*M6Eh>MJ
zg2xFmE|Y$(9vh0S$JN&3gUc~*@aDY-B~XpQ$b!Wf953ryq%ekGi*k|TYjIBPoNHx#
z-Ot8{l4&P~ypP7b!Lq8wU}V8s433v|Em9c6uSK~?@wHfAY%R8SIi@+N81qL<ryAvV
zs{E!QJYE!EHUIO=IxoIpP3BFMby4~$9PXF3T%`D-tSh=GyOV=UGB8#;1?iui4)4UV
zH5XW3CFX|9x(+Fd;eR;FMXpzenwC9d%(M`i(Lq~bIyD{1csgNgTQog;2FeM(;U*&S
zIDL)ozqQjf|8!X2CUX6bFf6+xo{pND9u8dk?w=Eft@tLrzyY#@=${W95a&P0>*~2`
zUKhgHXgaQyv^BjhJbPYvmM&!ff0q8wq_33yfA;tN_vz<1U_DwP`~3N6z)Va;1;$}4
zextYV!zVa}qj(M5(17pg?fdW<dT<B_un!LI!#DKr7jOn|<0uZ}5T3#=Jb|6)gzWnl
zp#eIoaGAdTFxH|C4`3!LF&<;^J-z&^cm%7k0Mj9R{mH1rReJhA@jI^IYxLqc4r3pl
zg^9^HOMfr>{vN!7C$SS-(T0hT{r)Mu1=;8C!EWrrdUQg*4{Na;%}_U$0hIxj0hNIg
z%|LM5sF=UiR;SwP%<e_YT2Nb^rMvMS+|mp-P{HxC?x56GXaA2xC9v%t+|mrzVsN~y
PYf)`=W`DB0nbr6oE8p2-

diff --git a/standards/standards.tenor.ily b/standards/standards.tenor.ily
index 73a493a..fc236dd 100644
--- a/standards/standards.tenor.ily
+++ b/standards/standards.tenor.ily
@@ -73,14 +73,14 @@ tenorFourfoursOneB = \drummode {
 % 6/8s
 % --------------------------
 tenorSixeightsOneA = \drummode {
-				d4.\up g\up |
+				\flourish d4. \flourish g  |
 				d^\splitTheFeather r |
 				d g |
 				\scoop { d8 r8 g8 d4. } |
 				\flourish d4. \flourish g |
 				d^\splitTheFeather r |
 				d g |
-				\scoop { d8r8 g8 d4. } |
+				\scoop { d8 r8 g8 d4. } |
 }
 
 tenorSixeightsOneB = \drummode {
diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly
index 43b30bb..8e6c9c1 100644
--- a/standards/standards.tenor.ly
+++ b/standards/standards.tenor.ly
@@ -89,10 +89,9 @@
 
 		\drummode {
 			\repeat volta 2 {
+			  \repeat volta 2 {
 				\tenorNineeightsOneA
-				\bar "||"
-				\break
-				\tenorNineeightsOneB
+			  }
 			}
 		}
 	}
diff --git a/strathspeys/molly_connell/notes.tenor.ily b/strathspeys/molly_connell/notes.tenor.ily
index 4343725..e95f9f6 100644
--- a/strathspeys/molly_connell/notes.tenor.ily
+++ b/strathspeys/molly_connell/notes.tenor.ily
@@ -19,5 +19,5 @@ tenorBB = \drummode {
 	d4^\up g4^\up \flourish { d4 g4 } |
 	d4 \parenthesize d8. g16 r8. g16 d4 |
 	d4 g4 d8. g16 d4 |
-	d4^\up g4^\up \flourish d4 \flourish g4 |
+	\flourish d4 \flourish g4 d4^\up g4^\up |
 }