# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1479765504 0
# Node ID 4ca0ff535c7d65f4659e1b3ff4f08a079c84e11a
# Parent  4e92928fcfc2a5e3f0e31ee4d7979476ddd14a61# Parent  a21702b3728c80c0dba4187cbc73c10554e4e151
Merge with upstream.

diff -r a21702b3728c -r 4ca0ff535c7d makeWeb.sh
--- a/makeWeb.sh	Fri Nov 18 21:58:03 2016 +0000
+++ b/makeWeb.sh	Mon Nov 21 21:58:24 2016 +0000
@@ -48,13 +48,18 @@
 for item in intro
 do
     rm -f $webdir/$item.html
-    if [ -r $booke/$item.md ]; then
-        pandoc --from=markdown --to=html --output=$webdir/$item.html $booke/$item.md
+    if [ -r $bookedir/$item.md ]; then
+        pandoc --from=markdown --to=html --output=$webdir/$item.html $bookedir/$item.md
     else
         touch $webdir/$item.html
     fi
 done
 
+# Copy in any htaccess.
+if [ -r $masterbookedir/htaccess ]; then
+    cp $masterbookedir/htaccess $webdir/.htaccess
+fi
+
 # Copy in the book PDFs. Like the graphics, Midi etc. these are assumed
 # to be already generated.
 cp $1-*.pdf $webdir
diff -r a21702b3728c -r 4ca0ff535c7d singletune.fmt
--- a/singletune.fmt	Fri Nov 18 21:58:03 2016 +0000
+++ b/singletune.fmt	Mon Nov 21 21:58:24 2016 +0000
@@ -18,6 +18,3 @@
 infoname Z
 infoname H
 infoname N
-infoline false
-writehistory true
-continueall false
diff -r a21702b3728c -r 4ca0ff535c7d singletuneweb.fmt
--- a/singletuneweb.fmt	Fri Nov 18 21:58:03 2016 +0000
+++ b/singletuneweb.fmt	Mon Nov 21 21:58:24 2016 +0000
@@ -1,11 +1,8 @@
-% Format for a web graphic with a single tune with tune title
-botmargin 0
-leftmargin 0
-rightmarin 0
-topmargin 0
+% Format for a downloadable PDF with a single tune with tune title
+partsbox true
+measurenb false
 scale 0.9
 titleformat T0 C1
-topspace 0
 % I don't want any info fields in the graphics. To turn off the
 % fields, give a blank infoname for that letter.
 infoname S
@@ -15,6 +12,3 @@
 infoname Z
 infoname H
 infoname N
-infoline true
-writehistory true
-continueall false