From 0421abd3107601c5cd36bb3bd4bd2d19140ee068 Mon Sep 17 00:00:00 2001
From: Jim Hague <jim.hague@acm.org>
Date: Tue, 26 Mar 2019 17:54:07 +0000
Subject: [PATCH] Fix building transposed bookes.

---
 makeAll.sh                    | 42 ++++++++++++++++++++++-------------
 makeAltoRecorderCFingering.sh |  2 +-
 makeCello.sh                  |  2 +-
 makeHornInF.sh                |  2 +-
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/makeAll.sh b/makeAll.sh
index 2e8aa88..d1180ce 100755
--- a/makeAll.sh
+++ b/makeAll.sh
@@ -10,7 +10,9 @@ if [[ $# -lt 1 ]]; then
     exit 1
 fi
 
-makeABooke()
+# Make the print version of a booke.
+# Params: <booke dir>
+makeBookePrint()
 {
     # Print graphics.
     ./makeGraphics.sh "$1"
@@ -24,6 +26,13 @@ makeABooke()
     ./makeBookeTunePages.sh --use-compact "$1"
     ./makeBooke.sh A5 "$1"
     ./makeBooklet.sh "$1"
+}
+
+# Make a single booke.
+# Params: <booke dir> [<instrument name>]
+makeABooke()
+{
+    makeBookePrint "$1"
 
     # Web output.
     ./makeWebGraphics.sh "$1"
@@ -31,20 +40,12 @@ makeABooke()
     ./makeWeb.sh "$1" "$1" "$2"
 }
 
+# Make a single transposed booke. We use web audio from the
+# master booke.
+# Params: <booke dir> <master booke dir> [<instrument name>]
 makeATransposedBooke()
 {
-    # Print graphics.
-    ./makeGraphics.sh "$1"
-
-    # Normal graphics printed output.
-    ./makeBookeTunePages.sh "$1"
-    ./makeBooke.sh A4 "$1"
-    ./makeBooke.sh Nook "$1"
-
-    # Compact graphics printed output.
-    ./makeBookeTunePages.sh --use-compact "$1"
-    ./makeBooke.sh A5 "$1"
-    ./makeBooklet.sh "$1"
+    makeBookePrint "$1"
 
     # Web output. Uses audio from main booke.
     ./makeWebGraphics.sh "$1"
@@ -65,14 +66,25 @@ makeASingleBooke()
     makeATransposedBooke $1-AltoRecorderCFingering $1 "alto recorder, C fingering"
 }
 
-makeBumperBooke()
+makeABumperBooke()
 {
     # This can only be used once all the other Bookes have been built.
+    ./makeBookeTunePages.sh "$1"
     ./makeBooke.sh A4 "$@"
+    ./makeBookeTunePages.sh --use-compact "$1"
     ./makeBooke.sh A5 "$@"
     ./makeBooklet.sh "Bumper"
 }
 
+makeBumperBookes()
+{
+    makeABumperBooke $1
+
+    #makeABumperBooke $1-Cello
+    #makeABumperBooke $1-HornInF
+    #makeABumperBooke $1-AltoRecorderCFingering
+}
+
 declare buildBookes
 declare bumperBookes
 
@@ -91,6 +103,6 @@ do
     makeASingleBooke $booke
 done
 if [[ ${#bumperBookes[@]} -gt 1 ]]; then
-    makeBumperBooke "${bumperBookes[@]}"
+    makeBumperBookes "${bumperBookes[@]}"
     cp Bumper*.pdf ./web
 fi
diff --git a/makeAltoRecorderCFingering.sh b/makeAltoRecorderCFingering.sh
index 9513d32..ddd3673 100755
--- a/makeAltoRecorderCFingering.sh
+++ b/makeAltoRecorderCFingering.sh
@@ -21,7 +21,7 @@ outdir=$dir/$1-AltoRecorderCFingering
 mkdir -p $outdir/Compact
 
 # Copy book component items.
-cp $booke/*.txt $outdir
+cp $booke/*.txt $booke/*.md $booke/image.jpg $outdir
 
 echo "Alto Recorder (C Fingering)" > $outdir/instrument.txt
 
diff --git a/makeCello.sh b/makeCello.sh
index c4a789c..e73d370 100755
--- a/makeCello.sh
+++ b/makeCello.sh
@@ -49,7 +49,7 @@ outdir=$dir/$1-Cello
 mkdir -p $outdir/Compact
 
 # Copy book component items.
-cp $booke/*.txt $outdir
+cp $booke/*.txt $booke/*.md $booke/image.jpg $outdir
 
 echo "Cello" > $outdir/instrument.txt
 
diff --git a/makeHornInF.sh b/makeHornInF.sh
index 00a30b1..1993b6d 100755
--- a/makeHornInF.sh
+++ b/makeHornInF.sh
@@ -21,7 +21,7 @@ outdir=$dir/$1-HornInF
 mkdir -p $outdir/Compact
 
 # Copy book component items.
-cp $booke/*.txt $outdir
+cp $booke/*.txt $booke/*.md $booke/image.jpg $outdir
 
 echo "Horn in F" > $outdir/instrument.txt