# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1408023147 -3600
# Node ID 75c8cca67abd58f2cbf71205b48fb7058eccc02a
# Parent  28ba8e9d631e0333e3e68ab5f84e4c994bd10301# Parent  b44fbcaeba38f3bdef318430fd27b00a3d91d1de
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 28ba8e9d631e -r 75c8cca67abd Library/NightPoorLarry.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Library/NightPoorLarry.abc	Thu Aug 14 14:32:27 2014 +0100
@@ -0,0 +1,9 @@
+X: 1
+T: Night Poor Larry Was Stretched, The
+R: slip jig
+M: 9/8
+L: 1/8
+K: Emin
+"Em" GFE EB,(E E2) G | "D" FED DA,D FGA | "Em" GFE EB,(E E2) G |\
+"D" FGA ABG FED :|
+"G" GAB BcB d2 B | GAB Bc"D"d cAF | "G" GAB BcB B2 (c | "D" c)BA ABG FED :|
diff -r 28ba8e9d631e -r 75c8cca67abd Library/TheNightPoorLarry.abc
--- a/Library/TheNightPoorLarry.abc	Mon Aug 04 23:19:17 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-X: 1
-T: The Night Poor Larry Was Stretched
-R: slip jig
-M: 9/8
-L: 1/8
-K: Emin
-"Em" GFE EB,(E E2) G | "D" FED DA,D FGA | "Em" GFE EB,(E E2) G |\
-"D" FGA ABG FED :|
-"G" GAB BcB d2 B | GAB Bc"D"d cAF | "G" GAB BcB B2 (c | "D" c)BA ABG FED :|
diff -r 28ba8e9d631e -r 75c8cca67abd Session/BrightonCamp.abc
--- a/Session/BrightonCamp.abc	Mon Aug 04 23:19:17 2014 +0100
+++ b/Session/BrightonCamp.abc	Thu Aug 14 14:32:27 2014 +0100
@@ -1,6 +1,6 @@
 X:1
 T:Brighton Camp
-T:The girl I left behind me
+T:Girl I Left Behind Me, The
 O:England
 R:March
 Z:Transcribed by Bryan Creer
diff -r 28ba8e9d631e -r 75c8cca67abd Session/SoldiersJoy.abc
--- a/Session/SoldiersJoy.abc	Mon Aug 04 23:19:17 2014 +0100
+++ b/Session/SoldiersJoy.abc	Thu Aug 14 14:32:27 2014 +0100
@@ -1,6 +1,6 @@
 X: 1
 T: Soldier's Joy
-T: The Forester
+T: Forester, The
 M: 4/4
 L: 1/8
 Q: 140
diff -r 28ba8e9d631e -r 75c8cca67abd makeBookeTunePages.sh
--- a/makeBookeTunePages.sh	Mon Aug 04 23:19:17 2014 +0100
+++ b/makeBookeTunePages.sh	Thu Aug 14 14:32:27 2014 +0100
@@ -42,6 +42,8 @@
         fixtitle "$title"
         title=$retval
         subtitle=`$dir/abcfield.py --index 2 --field T --latex $filename`
+        fixtitle "$subtitle"
+        subtitle=$retval
         composer=`$dir/abcfield.py --field C --latex $filename`
 
         changefile=`$dir/abcfield.py --field N --contains "Change:" $filename | sed -e "s/Change: *//"`