Automated merge with ssh://hg.cryhavoc.org.uk/dottes

Morris/image.md

@@ -1 +1 @@
-Barbara Payne, _Havoc Musicians_
+Barbara Payne, _Constant Billy_

Session/image.md

@@ -1 +1 @@
-Barbara Payne, _The Harlequin_
+Barbara Payne, _Mandoharlequin_

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.
+    makeBookePrint "$1"
-    ./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"
 
     # 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

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
 

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
 

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