Mercurial > dottes

changeset 877:7c5dc6eb6db8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author Jim Hague <jim.hague@acm.org>
date Tue, 26 Mar 2019 22:29:15 +0000
parents b2945b7dafd5 (current diff) 1a838d8dca2a (diff)
children 2330ccd90dad
files
diffstat 6 files changed, 32 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/Morris/image.md	Tue Mar 26 15:26:18 2019 +0000
+++ b/Morris/image.md	Tue Mar 26 22:29:15 2019 +0000
@@ -1,1 +1,1 @@
-Barbara Payne, _Havoc Musicians_
+Barbara Payne, _Constant Billy_
--- a/Session/image.md	Tue Mar 26 15:26:18 2019 +0000
+++ b/Session/image.md	Tue Mar 26 22:29:15 2019 +0000
@@ -1,1 +1,1 @@
-Barbara Payne, _The Harlequin_
+Barbara Payne, _Mandoharlequin_
--- a/makeAll.sh	Tue Mar 26 15:26:18 2019 +0000
+++ b/makeAll.sh	Tue Mar 26 22:29:15 2019 +0000
@@ -10,7 +10,9 @@
     exit 1
 fi
 
-makeABooke()
+# Make the print version of a booke.
+# Params: <booke dir>
+makeBookePrint()
 {
     # Print graphics.
     ./makeGraphics.sh "$1"
@@ -24,6 +26,13 @@
     ./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 @@
     ./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 @@
     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 @@
     makeASingleBooke $booke
 done
 if [[ ${#bumperBookes[@]} -gt 1 ]]; then
-    makeBumperBooke "${bumperBookes[@]}"
+    makeBumperBookes "${bumperBookes[@]}"
     cp Bumper*.pdf ./web
 fi
--- a/makeAltoRecorderCFingering.sh	Tue Mar 26 15:26:18 2019 +0000
+++ b/makeAltoRecorderCFingering.sh	Tue Mar 26 22:29:15 2019 +0000
@@ -21,7 +21,7 @@
 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
 
--- a/makeCello.sh	Tue Mar 26 15:26:18 2019 +0000
+++ b/makeCello.sh	Tue Mar 26 22:29:15 2019 +0000
@@ -49,7 +49,7 @@
 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
 
--- a/makeHornInF.sh	Tue Mar 26 15:26:18 2019 +0000
+++ b/makeHornInF.sh	Tue Mar 26 22:29:15 2019 +0000
@@ -21,7 +21,7 @@
 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