# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1553683703 0
# Node ID b2c0a05edf11c833b7d2b04baa4c766eae12966d
# Parent  2823cf9cab68a47220abfebe61915d05fe0db25c# Parent  94c7a0a3158cbfc7ae05bb07d9b1640569d9f2c1
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 2823cf9cab68 -r b2c0a05edf11 Morris/image.jpg
Binary file Morris/image.jpg has changed
diff -r 2823cf9cab68 -r b2c0a05edf11 makeAll.sh
--- a/makeAll.sh	Wed Mar 27 00:08:20 2019 +0000
+++ b/makeAll.sh	Wed Mar 27 10:48:23 2019 +0000
@@ -69,20 +69,55 @@
 makeABumperBooke()
 {
     # This can only be used once all the other Bookes have been built.
-    ./makeBookeTunePages.sh "$1"
+    for booke in "$@"
+    do
+        ./makeBookeTunePages.sh "${booke}"
+    done
     ./makeBooke.sh A4 "$@"
-    ./makeBookeTunePages.sh --use-compact "$1"
+    for booke in "$@"
+    do
+        ./makeBookeTunePages.sh --use-compact "${booke}"
+    done
     ./makeBooke.sh A5 "$@"
     ./makeBooklet.sh "Bumper"
 }
 
 makeBumperBookes()
 {
-    makeABumperBooke $1
+    makeABumperBooke "$@"
+    for f in Bumper*.pdf
+    do
+        mv $f ./web
+    done
+
+    local cellobumper
+    local hornbumber
+    local recorderbumper
 
-    #makeABumperBooke $1-Cello
-    #makeABumperBooke $1-HornInF
-    #makeABumperBooke $1-AltoRecorderCFingering
+    for booke in "$@"
+    do
+        cellobumper+=("${booke}-Cello")
+        hornbumper+=("${booke}-HornInF")
+        recorderbumper+=("${booke}-AltoRecorderCFingering")
+    done
+    makeABumperBooke "${cellobumper[@]}"
+    for f in Bumper*.pdf
+    do
+        t=$(echo $f | sed -e "s/.pdf/-Cello.pdf/")
+        mv $f ./web/$t
+    done
+    makeABumperBooke "${hornbumper[@]}"
+    for f in Bumper*.pdf
+    do
+        t=$(echo $f | sed -e "s/.pdf/-HornInF.pdf/")
+        mv $f ./web/$t
+    done
+    makeABumperBooke "${recorderbumper[@]}"
+    for f in Bumper*.pdf
+    do
+        t=$(echo $f | sed -e "s/.pdf/-AltoRecorderCFingering.pdf/")
+        mv $f ./web/$t
+    done
 }
 
 declare buildBookes
@@ -104,5 +139,4 @@
 done
 if [[ ${#bumperBookes[@]} -gt 1 ]]; then
     makeBumperBookes "${bumperBookes[@]}"
-    cp Bumper*.pdf ./web
 fi