Mercurial > dottes
changeset 971:4a4ad92d9659 build-default-352
Merge with upstream.
| author | Jim Hague <jim.hague@acm.org> |
|---|---|
| date | Thu, 08 Aug 2019 13:31:35 +0100 |
| parents | 40b43075a421 (diff) 82eaf4ee7f12 (current diff) |
| children | 19ac83d62471 |
| files | |
| diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/dottes.html Thu Aug 08 12:34:40 2019 +0100 +++ b/dottes.html Thu Aug 08 13:31:35 2019 +0100 @@ -46,7 +46,7 @@ <div class="dottes-body"> <a id="printing"><h1>Printing</h1></a> - <p>You can download a PDF with a booklet of these tunes. There is an + <p>You can download a PDF of a booklet of these tunes. There is an <a href="@BOOK@-A5.pdf">A5 landscape book</a> with one tune per page, a <a href="@BOOK@-Nook.pdf">4x5in portrait book</a> suitable for use with an eReader like a Kindle, Nook, Kobo etc., @@ -57,6 +57,14 @@ <a href="@BOOK@-A5bookletA4.pdf">A5 booklet</a>. Print this onto A4 paper using both sides of the paper, and fold in half to make an A5 booklet. + <p>You can also now download a PDF of the Bumper Booke. The Bumper + Booke contains all the Session tunes and all the Morris tunes in + a single book. There is an + <a href="../@BOOK@-A5@INSTRUMENT@.pdf">A5 landscape book</a> with one + tune per page, an <a href="../@BOOK@-A4@INSTRUMENT@.pdf">A4 book</a> + with two or more tunes per page, and an + <a href="../@BOOK@-A5bookletA4@INSTRUMENT@.pdf">A5 booklet</a> + for printing on A4 paper and folding in half. </div> </div> </body>
--- a/makeWeb.sh Thu Aug 08 12:34:40 2019 +0100 +++ b/makeWeb.sh Thu Aug 08 13:31:35 2019 +0100 @@ -31,7 +31,10 @@ instrumentSuffix="${1##*-}" if [ "$1" != "$instrumentSuffix" ]; then - basetunedir="${basetunedir}-${instrumentSuffix}" + instrumentSuffix="-${instrumentSuffix}" + basetunedir="${basetunedir}${instrumentSuffix}" +else + instrumentSuffix="" fi buildno=`cat buildno.txt` @@ -51,7 +54,8 @@ mkdir -p $bookewebdir sed -e "s/@BUILD@/$buildno/" -e "s/@SUBTITLE@/$subtitle/" \ - -e "s/@TITLE@/$title/" -e "s/@BOOK@/$booke/" dottes.html > $bookewebdir/$output + -e "s/@TITLE@/$title/" -e "s/@BOOK@/$booke/" \ + -e "s/@INSTRUMENT@/$instrumentSuffix/" dottes.html > $bookewebdir/$output for item in intro do