# HG changeset patch # User Jim Hague # Date 1377077579 -3600 # Node ID 2655390868362de9ba89734351973a52cd49a69f # Parent 9aa6a0f09b195b81696567eea475429bf671bf79# Parent 01ded8741361ffdb1eb850a4e84cff7cf7cbf488 Automated merge with ssh://hg.cryhavoc.org.uk/dottes diff -r 9aa6a0f09b19 -r 265539086836 Library/intro.txt --- a/Library/intro.txt Mon Aug 19 10:31:23 2013 +0100 +++ b/Library/intro.txt Wed Aug 21 10:32:59 2013 +0100 @@ -1,1 +1,8 @@ -This book is for tunes that may not be part of the regular Havoc session or dance repertoire, but which I want to try over. +This is a txt2tags input file. +The first 3 lines are headers, and are ignored. + +This book is for tunes that are not part of the regular +Havoc session or dance repertoire. + +Typically these tunes have either fallen out of popularity at sessions, +or are simply tunes that I like. diff -r 9aa6a0f09b19 -r 265539086836 Morris/intro.txt --- a/Morris/intro.txt Mon Aug 19 10:31:23 2013 +0100 +++ b/Morris/intro.txt Wed Aug 21 10:32:59 2013 +0100 @@ -1,1 +1,7 @@ -This book provides the dots for all dance tunes commonly performed by Cry Havoc. +This is a txt2tags input file. +The first 3 lines are headers, and are ignored. + +This book provides the dots for the music to all the dances +performed by Cry Havoc. The name of the dance is given as the tune title. +If the name of the tune differs from the name of the dance, the tune +name is given in the subtitle. diff -r 9aa6a0f09b19 -r 265539086836 Session/intro.txt --- a/Session/intro.txt Mon Aug 19 10:31:23 2013 +0100 +++ b/Session/intro.txt Wed Aug 21 10:32:59 2013 +0100 @@ -1,1 +1,13 @@ -This book provides the dots for all tunes commonly played at Cry Havoc music sessions. +This is a txt2tags input file. +The first 3 lines are headers, and are ignored. + +This book provides the dots for the tunes commonly played at Cry Havoc +music sessions. + +The set of tunes played at sessions does tend to vary over time. Some +tunes are perennial favourites and so are included here automatically. +Others are less regular, and so their inclusion is to some extent a +personal choice. I aim to only include tunes that I remember hearing at +a session in the not too distant past, but nobody keeps a detailed log +of what gets played, so the choice is imprecise. And may well be influenced +by personal preference. diff -r 9aa6a0f09b19 -r 265539086836 dottes.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dottes.html Wed Aug 21 10:32:59 2013 +0100 @@ -0,0 +1,49 @@ + + + + + Cry Havoc tunes - @TITLE@ + + + + + + + + +
+ + + + +
+

@SUBTITLE@

+ +

@INTRO@ +

You can download a PDF with a booklet of these tunes. There is an + A5 landscape book with one + tune per page, a 4x5in portrait book + suitable for use with an eReader like a Kindle, Nook, Kobo etc., + and an A4 book with two or + more tunes per page. +

If you have a printer that can do duplex (i.e. print on both sides + of the paper), you might like the + A5 booklet. + Print this onto A4 paper using both sides of the paper, and fold in half + to make an A5 booklet. +

When changes to this site are made, the issue number is incremented. + This is issue @BUILD@. +

+ +
+

The tunes

+
+ +
+
+
+ + diff -r 9aa6a0f09b19 -r 265539086836 dottes.html.footer --- a/dottes.html.footer Mon Aug 19 10:31:23 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - - - diff -r 9aa6a0f09b19 -r 265539086836 dottes.html.header --- a/dottes.html.header Mon Aug 19 10:31:23 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ - - - - - Cry Havoc tunes - @TITLE@ - - - - - - - - -
- - - - -
-

@SUBTITLE@

-

@INTRO@ -

You can download a PDF with a booklet of these tunes. There is an - A5 landscape book with one - tune per page, a 4x5in portrait book - suitable for use with an eReader like a Kindle, Nook, Kobo etc., - and an A4 book with two or - more tunes per page. -

If you have a printer that can do duplex (i.e. print on both sides - of the paper), you might like the - A5 booklet. - Print this onto A4 paper using both sides of the paper, and fold in half - to make an A5 booklet. -

When changes to this site are made, the issue number is incremented. - This is issue @BUILD@. -

- -
-

The tunes

-
diff -r 9aa6a0f09b19 -r 265539086836 dottes.tex --- a/dottes.tex Mon Aug 19 10:31:23 2013 +0100 +++ b/dottes.tex Wed Aug 21 10:32:59 2013 +0100 @@ -181,7 +181,7 @@ This collection is intended to help those like me who are inexpert with instrument and folk music generally, but have a little musical background. -\input{intro.txt} +\input{intro.tex} Being folk tunes, many of the tunes herein have many variations. The music presented here is my attempt at reflecting what the musicians @@ -191,7 +191,7 @@ The majority of tunes in this book have no identifiable author, and are unquestionably in the public domain. Rather than litter the pages with \emph{Trad.} or \emph{Anon.}, I have left them unattributed. -Some, however, have an identifiable author or arranger and copyright +Some, however, may have an identifiable author or arranger and copyright unquestionably remains with that person. I believe these tunes to enjoy widespread currency on the folk music scene, and therefore there is at least tacit approval by the authors for their dissemination. diff -r 9aa6a0f09b19 -r 265539086836 makeBooke.sh --- a/makeBooke.sh Mon Aug 19 10:31:23 2013 +0100 +++ b/makeBooke.sh Wed Aug 21 10:32:59 2013 +0100 @@ -25,7 +25,7 @@ cp dottes.tex $builddir cp buildno.txt $builddir cp buzzard.pdf $builddir -for item in title subtitle intro instrument +for item in title subtitle instrument do rm -f $builddir/$item.txt if [ -r $booke/$item.txt ]; then @@ -34,6 +34,15 @@ touch $builddir/$item.txt fi done +for item in intro +do + rm -f $builddir/$item.tex + if [ -r $booke/$item.txt ]; then + txt2tags --no-headers --target=tex --outfile=$builddir/$item.tex $booke/$item.txt + else + touch $builddir/$item.tex + fi +done for filename in $dir/*.${papersize}.tex do diff -r 9aa6a0f09b19 -r 265539086836 makeWeb.sh --- a/makeWeb.sh Mon Aug 19 10:31:23 2013 +0100 +++ b/makeWeb.sh Wed Aug 21 10:32:59 2013 +0100 @@ -24,6 +24,7 @@ webdir=$dir/web/$1 graphicsdir=$dir/graphics/$1 output=index.html +tunelist=tunelist.html booke=$1 masterbooke=$2 title=$booke @@ -37,9 +38,6 @@ if [ -r $bookedir/subtitle.txt ]; then subtitle=`cat $bookedir/subtitle.txt` fi -if [ -r $bookedir/intro.txt ]; then - intro=`cat $bookedir/intro.txt` -fi if [ -n "$instrument" ]; then title="${title} ($instrument)" @@ -49,8 +47,20 @@ mkdir -p $webdir sed -e "s/@BUILD@/$buildno/" -e "s/@SUBTITLE@/$subtitle/" \ - -e "s/@TITLE@/$title/" -e "s/@INTRO@/$intro/" \ - -e "s/@BOOK@/$booke/" dottes.html.header > $webdir/$output + -e "s/@TITLE@/$title/" -e "s/@BOOK@/$booke/" dottes.html > $webdir/$output + +# Mark output as executable so it is scanned for server-side includes. +chmod +x $webdir/$output + +for item in intro +do + rm -f $webdir/$item.html + if [ -r $booke/$item.txt ]; then + txt2tags --no-headers --target=html --outfile=$webdir/$item.html $booke/$item.txt + else + touch $webdir/$item.html + fi +done # Copy in the book PDFs. Like the graphics, Midi etc. these are assumed # to be already generated. @@ -105,7 +115,5 @@ -e "s/@TUNE@/${name}/" dottes.html.tune > $webdir/$tunepage sed -e "s/@TITLE@/${title//&/\&}/" \ - -e "s/@TUNE@/${name}/" dottes.html.tuneindex >> $webdir/$output + -e "s/@TUNE@/${name}/" dottes.html.tuneindex >> $webdir/$tunelist done - -cat dottes.html.footer >> $webdir/$output