From 3a567e06373ce1f5766fb23dddaafd3b74738629 Mon Sep 17 00:00:00 2001
From: Jim Hague <jim.hague@laicatc.com>
Date: Wed, 20 Feb 2013 13:45:58 +0000
Subject: [PATCH] Fix up problems in Horn in F transposition.

1. Ensure makeWeb.sh gets its second parameter quoted, to allow for spaces in it.
2. Don't forget to copy the component text items into the horn dir.
3. Fix removing transposition tag from page title.
---
 makeAll.sh     | 10 +++++-----
 makeHornInF.sh |  3 +++
 makeWeb.sh     |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/makeAll.sh b/makeAll.sh
index 6161121..223c4b7 100755
--- a/makeAll.sh
+++ b/makeAll.sh
@@ -9,11 +9,11 @@ fi
 
 makeABooke()
 {
-    ./makeGraphics.sh $1
-    ./makeBookeA5.sh $1
-    ./makeBookeA4.sh $1
-    ./makeWebItems.sh $1
-    ./makeWeb.sh $1 $2
+    ./makeGraphics.sh "$1"
+    ./makeBookeA5.sh "$1"
+    ./makeBookeA4.sh "$1"
+    ./makeWebItems.sh "$1"
+    ./makeWeb.sh "$1" "$2"
 }
 
 makeABooke $1
diff --git a/makeHornInF.sh b/makeHornInF.sh
index e563351..2bf4d8b 100755
--- a/makeHornInF.sh
+++ b/makeHornInF.sh
@@ -14,6 +14,9 @@ outdir=$dir/$1-HornInF
 
 mkdir -p $outdir
 
+# Copy book component items.
+cp $booke/*.txt $outdir
+
 find $booke -name "*.abc" | sort |
     while read filename
     do
diff --git a/makeWeb.sh b/makeWeb.sh
index af6e038..813d849 100755
--- a/makeWeb.sh
+++ b/makeWeb.sh
@@ -29,7 +29,8 @@ if [ -r $bookedir/intro.txt ]; then
 fi
 
 if [ -n "$2" ]; then
-    title="${title/-.*$//} ($2)"
+    # Remove any transposition tag from title.
+    title="${title/-*/} ($2)"
     subtitle="${subtitle} ($2)"
 fi