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

Library/intro.txt

@@ -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.

Morris/intro.txt

@@ -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.

Session/intro.txt

@@ -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.

dottes.html

@@ -21,6 +21,7 @@
 
     <div class="grid_12 dottes-body">
       <h1>@SUBTITLE@</h1>
+      <!--#include file="intro.html" -->
       <p>@INTRO@
       <p>You can download a PDF with a booklet of these tunes. There is an
         <a href="@BOOK@-A5.pdf">A5 landscape book</a> with one
@@ -40,3 +41,9 @@
     <div class="grid_12 dottes-body">
       <h1>The tunes</h1>
       <div class="dottes-tune-list">
+        <!--#include file="tunelist.html" -->
+      </div>
+    </div>
+  </div>
+</body>
+</html>

dottes.html.footer

@@ -1,4 +0,0 @@
-</div>
-</div>
-</body>
-</html>

dottes.tex

@@ -181,7 +181,7 @@ Havoc musicians come in all shades of experience and ability.
 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 @@ in any way \emph{correct}. This is just how we go about them.
 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.

makeBooke.sh

@@ -25,7 +25,7 @@ mkdir -p $builddir
 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 @@ do
         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

makeWeb.sh

@@ -24,6 +24,7 @@ bookedir=$dir/$1
 webdir=$dir/web/$1
 graphicsdir=$dir/graphics/$1
 output=index.html
+tunelist=tunelist.html
 booke=$1
 masterbooke=$2
 title=$booke
@@ -37,9 +38,6 @@ intro=
 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 @@ fi
 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 @@ find $bookedir -name "*.abc" | sort |
             -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