diff --git a/dottes.html.footer b/dottes.html.footer index 81d8c88..b2a9c1d 100644 --- a/dottes.html.footer +++ b/dottes.html.footer @@ -1,3 +1,4 @@ + diff --git a/dottes.html.header b/dottes.html.header index bb03175..123bd42 100644 --- a/dottes.html.header +++ b/dottes.html.header @@ -1,23 +1,44 @@ - + + -Cry Havoc tunes - @BOOK@ + + 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, or 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. -

-Issue @BUILD@ -

- +
+ + + + +
+ +
+

@SUBTITLE@

+

@INTRO@ +

You can download a PDF with a booklet of these tunes. There is an + A5 landscape book with one + tune per page, or 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 --git a/dottes.html.tune b/dottes.html.tune new file mode 100644 index 0000000..1933426 --- /dev/null +++ b/dottes.html.tune @@ -0,0 +1,41 @@ + + + + + Cry Havoc tunes - @TITLE@ + + + + + + + + +
+ + + + +
+ +
+

@TITLE@

+ @TITLE@ dots + +
+ +
+ + diff --git a/dottes.html.tuneindex b/dottes.html.tuneindex new file mode 100644 index 0000000..cb72fbc --- /dev/null +++ b/dottes.html.tuneindex @@ -0,0 +1,4 @@ + + + + diff --git a/makeAll.sh b/makeAll.sh index 62aabea..00dc7ab 100755 --- a/makeAll.sh +++ b/makeAll.sh @@ -13,9 +13,10 @@ makeABooke() ./makeBookeA5.sh $1 ./makeBookeA4.sh $1 ./makeWebItems.sh $1 - ./makeWeb.sh $1 + ./makeWeb.sh $1 $2 } makeABooke $1 + ./makeCello.sh $1 -makeABooke $1-Cello +makeABooke $1-Cello cello diff --git a/makeCello.sh b/makeCello.sh index 5969d07..8a301c4 100755 --- a/makeCello.sh +++ b/makeCello.sh @@ -19,6 +19,9 @@ outdir=$dir/$1-Cello mkdir -p $outdir +# Copy book component items. +cp $booke/*.txt $outdir + find $booke -name "*.abc" | sort | while read filename do diff --git a/makeWeb.sh b/makeWeb.sh index 067b70d..43edc17 100755 --- a/makeWeb.sh +++ b/makeWeb.sh @@ -4,37 +4,47 @@ # to be already built. # -if [ $# != 1 ]; then - echo "Usage: makeWeb.sh " +if [ $# -lt 1 -o $# -gt 2 ]; then + echo "Usage: makeWeb.sh []" exit 1 fi dir=`pwd` -booke=$dir/$1 +bookedir=$dir/$1 webdir=$dir/web/$1 graphicsdir=$dir/graphics/$1 output=index.html +title=$1 +booke=$1 buildno=`cat buildno.txt` subtitle= intro= -if [ -r $booke/subtitle.txt ]; then - subtitle=`cat $booke/subtitle.txt` +if [ -r $bookedir/subtitle.txt ]; then + subtitle=`cat $bookedir/subtitle.txt` fi -if [ -r $booke/intro.txt ]; then - intro=`cat $booke/intro.txt` +if [ -r $bookedir/intro.txt ]; then + intro=`cat $bookedir/intro.txt` +fi + +if [ -n "$2" ]; then + title="${title/-.*$//} ($2)" + subtitle="${subtitle} ($2)" fi mkdir -p $webdir sed -e "s/@BUILD@/$buildno/" -e "s/@SUBTITLE@/$subtitle/" \ - -e "s/@INTRO@/$intro/" -e "s/@BOOK@/$1/" dottes.html.header > $webdir/$output + -e "s/@TITLE@/$title/" -e "s/@INTRO@/$intro/" \ + -e "s/@BOOK@/$booke/" dottes.html.header > $webdir/$output -cp $1-*.pdf $webdir +# Copy in the book PDFs. Like the graphics, Midi etc. these are assumed +# to be already generated. +cp $-*.pdf $webdir # Now, for each tune, make the tune graphic and sound. -find $booke -name "*.abc" | sort | +find $bookedir -name "*.abc" | sort | while read filename do title=`$dir/abcfield.py --field T --html $filename` @@ -46,14 +56,14 @@ find $booke -name "*.abc" | sort | # And copy the ABC. cp $filename $webdir - echo "" >> $webdir/$output - echo "" >> $webdir/$output - echo "" >> $webdir/$output - echo "" >> $webdir/$output - echo "" >> $webdir/$output - echo "" >> $webdir/$output - echo "" >> $webdir/$output - echo "" >> $webdir/$output + # Generate the tune web page. + tunepage=${name}.html + + sed -e "s/@TITLE@/${title}/" \ + -e "s/@TUNE@/${name}/" dottes.html.tune > $webdir/$tunepage + + sed -e "s/@TITLE@/${title}/" \ + -e "s/@TUNE@/${name}/" dottes.html.tuneindex >> $webdir/$output done cat dottes.html.footer >> $webdir/$output diff --git a/makeWebItems.sh b/makeWebItems.sh index 67a4336..42bd6b5 100755 --- a/makeWebItems.sh +++ b/makeWebItems.sh @@ -25,12 +25,14 @@ find $booke -name "*.abc" | sort | name=`basename $filename .abc` tmpname=${name}.tmp convert -density 96 $graphicsdir/${name}.eps $builddir/${tmpname}.png + convert -density 96 $graphicsdir/firstline-${name}.eps $builddir/firstline-${tmpname}.png abc2midi $filename -o $builddir/${tmpname}.mid timidity -Ow -o $builddir/${tmpname}.wav $builddir/${tmpname}.mid lame --quiet $builddir/${tmpname}.wav $builddir/${tmpname}.mp3 mv $builddir/${tmpname}.png $builddir/${name}.png + mv $builddir/firstline-${tmpname}.png $builddir/firstline-${name}.png mv $builddir/${tmpname}.mid $builddir/${name}.mid mv $builddir/${tmpname}.mp3 $builddir/${name}.mp3 rm $builddir/${tmpname}.wav diff --git a/web/css/dottes.css b/web/css/dottes.css index 65b589b..5448a9c 100644 --- a/web/css/dottes.css +++ b/web/css/dottes.css @@ -90,6 +90,17 @@ div.dottes-transpose-tunes { } +table.dottes-tune-table +{ + padding: 10px; + margin: 10px; +} + +table.dottes-tune-table td +{ + vertical-align: middle; +} + ul.tune-type-list { list-style-type: none; @@ -100,3 +111,14 @@ ul.tune-type-list li { display: inline; } + +ul.tune-data-list +{ + list-style-type: none; + margin: 20px; +} + +ul.tune-data-list li +{ + display: inline; +}
@TITLE@@TITLE@ first line
${title}PNGPDFMIDIMP3ABC