--- a/makeWebGraphics.sh	Mon Aug 05 23:22:04 2019 +0100
+++ b/makeWebGraphics.sh	Mon Aug 05 23:25:28 2019 +0100
@@ -1,21 +1,25 @@
 #!/bin/bash
 #
 # Make graphics required for the website but not for the book.
-# They go into web/<book>.
+# They go into web/tunes/<tunename>, or web/tunes-<instrument>/<tunename>.
 #
 
-if [ $# != 1 ]; then
-    echo "Usage: makeWebGraphics.sh <book dir name>"
+if [[ $# -lt 1 ]]; then
+    echo "Usage: makeWebGraphics.sh <book dir name> [<instrument name>]"
     exit 1
 fi
 
 dir=`pwd`
 
 booke=$dir/$1
-builddir=$dir/web/$1
+basewebdir=$dir/web
+basetunedir=$basewebdir/tunes
 graphicsdir=$dir/graphics/$1
+instrument=$2
 
-mkdir -p $builddir
+if [ -n "$instrument" ]; then
+    basetunedir="${basetunedir}-${instrument}"
+fi
 
 # Now, for each tune, make the main tune and tune first line bitmaps.
 # Do this to temp files and rename into place to make updates as
@@ -24,16 +28,19 @@
     while read filename
     do
         name=`basename $filename .abc`
+        tunedir=$basetunedir/$name
+        mkdir -p $tunedir
+
         tmpname=${name}.tmp
-        convert -colors 256 -quality 90 -density 200 $graphicsdir/${name}.pdf $builddir/${tmpname}.png
-        convert -colors 256 -quality 90 -density 200 $graphicsdir/firstline-${name}.pdf $builddir/firstline-${tmpname}.png
+        convert -colors 256 -quality 90 -density 200 $graphicsdir/${name}.pdf $tunedir/${tmpname}.png
+        convert -colors 256 -quality 90 -density 200 $graphicsdir/firstline-${name}.pdf $tunedir/firstline-${tmpname}.png
 
-        mv $builddir/${tmpname}.png $builddir/${name}.png
-        mv $builddir/firstline-${tmpname}.png $builddir/firstline-${name}.png
+        mv $tunedir/${tmpname}.png $tunedir/${name}.png
+        mv $tunedir/firstline-${tmpname}.png $tunedir/firstline-${name}.png
 
         # Make the web downloadable PDF with the tune title.
-        abcm2ps -E -F singletuneweb -O $builddir/$name.eps $filename
+        abcm2ps -E -F singletuneweb -O $tunedir/$name.eps $filename
         # And make the corresponding PDF.
-        epstopdf --outfile=$builddir/$name.pdf $builddir/${name}001.eps
-        rm $builddir/${name}001.eps
+        epstopdf --outfile=$tunedir/$name.pdf $tunedir/${name}001.eps
+        rm $tunedir/${name}001.eps
     done