Mercurial > dottes

changeset 771:8ac7e695c005

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 Mon, 23 Apr 2018 21:09:20 +0100
parents 4502ab9bd4d8 (diff) 98b25a59be09 (current diff)
children 43b1c2c8dbdb
files
diffstat 4 files changed, 46 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Apr 23 21:09:10 2018 +0100
+++ b/.hgtags	Mon Apr 23 21:09:20 2018 +0100
@@ -123,3 +123,5 @@
 7d975b619963ec3d2e394cf11b393aadaed40518 build-default-288
 37a436edfedd640b37362a4c9aeb59e101aeb90b build-default-289
 33b4d07c59071d318f19f9d7993719ac0c4ca9e5 build-default-290
+d6f1f2b3bd017d58eca8d47366ed1542bd735c3f build-default-292
+01e938b89e7c693c1f4d03f0622b73fa8da4f5d4 build-default-293
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Session/AlbertFarmersBonfireTune.abc	Mon Apr 23 21:09:20 2018 +0100
@@ -0,0 +1,12 @@
+X: 1
+T: Albert Farmer's Bonfire Tune
+M: 4/4
+L: 1/8
+K: D
+Q: 160
+de | \
+"D" f3d  A2F2 | "A" G2GF G4  | edcA B2c2 | "D" dffd A2de |
+"D" f3d  A2F2 | "Em" G2GF G4  | "A" edcA B2c2 | "D" d6  :|
+de | \
+"D" f2fd f2f2 | "A" gf "D" ed "A" c4 | gfed cABc | "D" dffd A2de |
+"D" f3d  A2F2 | "Em" G2GF G4  | "A" edcA B2c2 | "D" d6  :|
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Session/TipTopPolka.abc	Mon Apr 23 21:09:20 2018 +0100
@@ -0,0 +1,13 @@
+X:1
+T:Tip Top Polka
+M:4/4
+L:1/8
+Q:160
+K:G
+Bc |: \
+"G" d2d2 dedc | B2B2 B2GA | B2B2Bcd2 | "D" A6 AB | "C" c2c2 cdcB |
+[1 "D" A2A2 A2AB | cde2 d2c2 | "G" B6 c2 :| \
+[2 "D" A2A2 A2G2 | FGAB e2f2 | "G" g6 ||
+|: ef |\
+"C" g2e2 e2ef | "G" g2d2 d4 | B4 A2 G2 | "D" d6 ef | \
+"C" g2e2 e2ef | "G "g2d2 d4 | "D" Bcd2 B2A2 | "G" G6 :|
--- a/makeAll.sh	Mon Apr 23 21:09:10 2018 +0100
+++ b/makeAll.sh	Mon Apr 23 21:09:20 2018 +0100
@@ -1,8 +1,11 @@
 #!/bin/bash
 #
 # Build all forms of the Booke.
+#
+# Arguments are the names of the bookes to build. If a name is
+# prefixed '-', then do not include that section  in the Bumper Booke.
 
-if [ $# -lt 1 ]; then
+if [[ $# -lt 1 ]]; then
     echo "Usage: makeAll.sh <booke dir name> [<booke dir name> ...]"
     exit 1
 fi
@@ -70,11 +73,24 @@
     ./makeBooklet.sh "Bumper"
 }
 
+declare buildBookes
+declare bumperBookes
+
 for booke in "$@"
 do
+    if [[ ${booke:0:1} = "-" ]]; then
+        booke=${booke/#-/}
+    else
+        bumperBookes+=("$booke")
+    fi
+    buildBookes+=("$booke")
+done
+
+for booke in "${buildBookes[@]}"
+do
     makeASingleBooke $booke
 done
-if [ $# -gt 1 ]; then
-    makeBumperBooke "$@"
+if [[ ${#bumperBookes[@]} -gt 1 ]]; then
+    makeBumperBooke "${bumperBookes[@]}"
     cp Bumper*.pdf ./web
 fi