# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1565267495 -3600
# Node ID 4a4ad92d96594dfd60325d12619cbbc05d622928
# Parent  40b43075a4212e12e94b485e4b1e7cbb047e2b52# Parent  82eaf4ee7f127d7865bb236946eaa03eb5edf3cb
Merge with upstream.

diff -r 82eaf4ee7f12 -r 4a4ad92d9659 dottes.html
--- a/dottes.html	Thu Aug 08 12:34:40 2019 +0100
+++ b/dottes.html	Thu Aug 08 13:31:35 2019 +0100
@@ -46,7 +46,7 @@
 
     <div class="dottes-body">
       <a id="printing"><h1>Printing</h1></a>
-      <p>You can download a PDF with a booklet of these tunes. There is an
+      <p>You can download a PDF of a booklet of these tunes. There is an
         <a href="@BOOK@-A5.pdf">A5 landscape book</a> with one
         tune per page, a <a href="@BOOK@-Nook.pdf">4x5in portrait book</a>
         suitable for use with an eReader like a Kindle, Nook, Kobo etc.,
@@ -57,6 +57,14 @@
         <a href="@BOOK@-A5bookletA4.pdf">A5 booklet</a>.
         Print this onto A4 paper using both sides of the paper, and fold in half
         to make an A5 booklet.
+      <p>You can also now download a PDF of the Bumper Booke. The Bumper
+        Booke contains all the Session tunes and all the Morris tunes in
+        a single book. There is an
+        <a href="../@BOOK@-A5@INSTRUMENT@.pdf">A5 landscape book</a> with one
+        tune per page, an <a href="../@BOOK@-A4@INSTRUMENT@.pdf">A4 book</a>
+        with two or more tunes per page, and an
+        <a href="../@BOOK@-A5bookletA4@INSTRUMENT@.pdf">A5 booklet</a>
+        for printing on A4 paper and folding in half.
     </div>
   </div>
 </body>
diff -r 82eaf4ee7f12 -r 4a4ad92d9659 makeWeb.sh
--- a/makeWeb.sh	Thu Aug 08 12:34:40 2019 +0100
+++ b/makeWeb.sh	Thu Aug 08 13:31:35 2019 +0100
@@ -31,7 +31,10 @@
 
 instrumentSuffix="${1##*-}"
 if [ "$1" != "$instrumentSuffix" ]; then
-    basetunedir="${basetunedir}-${instrumentSuffix}"
+    instrumentSuffix="-${instrumentSuffix}"
+    basetunedir="${basetunedir}${instrumentSuffix}"
+else
+    instrumentSuffix=""
 fi
 
 buildno=`cat buildno.txt`
@@ -51,7 +54,8 @@
 mkdir -p $bookewebdir
 
 sed -e "s/@BUILD@/$buildno/" -e "s/@SUBTITLE@/$subtitle/" \
-    -e "s/@TITLE@/$title/" -e "s/@BOOK@/$booke/" dottes.html > $bookewebdir/$output
+    -e "s/@TITLE@/$title/" -e "s/@BOOK@/$booke/" \
+    -e "s/@INSTRUMENT@/$instrumentSuffix/" dottes.html > $bookewebdir/$output
 
 for item in intro
 do