# HG changeset patch # User Jim Hague # Date 1364759462 -3600 # Node ID 50dccc8f1ac0c20e3f863cbbc3a9b79ce9b61aa2 # Parent 92500a8068ce5e971e7c8d21d5060a32549f4f55# Parent 6e96742a67a35081a708a7e1c920647455664655 Automated merge with ssh://hg.cryhavoc.org.uk/dottes diff -r 6e96742a67a3 -r 50dccc8f1ac0 Morris/LadsABunchum.abc --- a/Morris/LadsABunchum.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Morris/LadsABunchum.abc Sun Mar 31 20:51:02 2013 +0100 @@ -10,11 +10,11 @@ I:speed 400 P:A " " |: A2 | "G" B2 B2 Bcde | "C" c2 A2 "D7" A2 Bc | -w: * Oh dear moth-er, what a fool I've been, +w: * Oh dear moth-er, what a fool I be, w: * Five were blind_ and the other couldn't see, "G" d2 d2 "D7" dcBA | "G" B2 G2 G2 :| w: Six young mai-dens come a court-in' me. -w: oh dear moth-er, what a fool I've been! +w: oh dear moth-er, what a fool I be! P:B "" |: gf | "C" e2 d2 "G" d2 GA | "G" B2 B2 B2 gf | e2 d2 c2 B2 |\ "D7" A2 G2 "G" G2 :| diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/ALaModeDeFrance.abc --- a/Session/ALaModeDeFrance.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/ALaModeDeFrance.abc Sun Mar 31 20:51:02 2013 +0100 @@ -1,7 +1,7 @@ X: 1 T: A La Mode de France T: Nonesuch -N: Change: Rufty Tufty +N: Change: RuftyTufty.abc M: C L: 1/4 K: Gmaj diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/BonnyKate.abc --- a/Session/BonnyKate.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/BonnyKate.abc Sun Mar 31 20:51:02 2013 +0100 @@ -1,7 +1,7 @@ X: 1 T: Bonny Kate M: C -N: Change: Harper's Frolick +N: Change: HarpersFrolick.abc L: 1/4 K: G d e f | "G" g>f g>f | "G" g d d B | "C" c/d/ e d>c |\ diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/CaptainRock.abc --- a/Session/CaptainRock.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/CaptainRock.abc Sun Mar 31 20:51:02 2013 +0100 @@ -1,6 +1,6 @@ X: 1 T: Captain Rock's Farewell -N: Change: Orange in Bloom +N: Change: OrangeInBloom.abc M: 3/4 L: 1/4 K: Gmaj diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/ElizabethClare.abc --- a/Session/ElizabethClare.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/ElizabethClare.abc Sun Mar 31 20:51:02 2013 +0100 @@ -1,7 +1,7 @@ X: 1 T: Elizabeth Clare C: Chris Wood -N: Change: Michael Turner's Waltz +N: Change: MichaelTurnersWaltz.abc M: 3/4 L: 1/8 R: waltz @@ -14,4 +14,3 @@ "C" c2 cd c2 | "G" B2 Bc B2 | "Am" A2 G2 E2 | "D" D2>D2 GA | "G" B2 Bc B2 | "D" A2 AB A2 | "C" G2 E2 GE |\ "G" D2>D2 GA | "G" B2 d2 e2 | d2 c2 B2 | "D" A2 G2 F2 | "G" G3 :| - diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/ExplodingPotato.abc --- a/Session/ExplodingPotato.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/ExplodingPotato.abc Sun Mar 31 20:51:02 2013 +0100 @@ -1,11 +1,11 @@ X: 1 T: Exploding Potato, The C: Ed Pritchard -N: Change: The Extension Reel +N: Change: ExtensionReel.abc M: C L: 1/4 K: Gmaj "G" d B/G/ d B/G/ | d e d B | "Am" A>B c A | "D" D B c ^c | "G" d B/G/ d B/G/ | d e d B | "D7" A>B c A | "G" G2 G2 :| -"D" A>F A A | "Em7" B>G D D | "Am" A B c e | "D" d B "G" [gBD] z | +"D" A>F D D | "Em7" B>G D D | "Am" A B c e | "D" d B "G" [gBD] z | "D" A>F D D | "Em7" B>G D D | "D7" A B c F | "G" G2 G2 :| diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/GrandfathersTune.abc --- a/Session/GrandfathersTune.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/GrandfathersTune.abc Sun Mar 31 20:51:02 2013 +0100 @@ -1,7 +1,7 @@ X:1 T:Grandfather's Tune S:Nick Barber -N:Change: The Sloe +N:Change: Sloe.abc R:Reel M:4/4 Q:160 diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/HarpersFrolick.abc --- a/Session/HarpersFrolick.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/HarpersFrolick.abc Sun Mar 31 20:51:02 2013 +0100 @@ -2,7 +2,7 @@ T:Harper's Frolick S:Nick Barber R:Polka -N:Change: Three Around Three +N:Change: ThreeAroundThree.abc M:4/4 L:1/4 Q:160 diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/JustAsTheTideWasFlowing.abc --- a/Session/JustAsTheTideWasFlowing.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/JustAsTheTideWasFlowing.abc Sun Mar 31 20:51:02 2013 +0100 @@ -1,7 +1,7 @@ X:1 T:Just as the tide was flowing S:Nick Barber -N:Change: Rochdale Coconut Dance +N:Change: RochdaleCoconutDance.abc L:1/4 Q:160 M:C @@ -16,4 +16,3 @@ "G" d B B/A/G/A/ | "Em" B/A/G/F/ "C" E "D" D | "G" G G "C" E "D" D | "G" G G "D" A G/A/ |\ "G" B B "D" c/B/A/G/ | "C" E "D" F "G" G :| - diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/KingOfTheFairies.abc --- a/Session/KingOfTheFairies.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/KingOfTheFairies.abc Sun Mar 31 20:51:02 2013 +0100 @@ -3,7 +3,7 @@ M: 4/4 L: 1/8 R: Hornpipe -N: Change: Lanigan's Ball +N: Change: LanigansBall.abc K: Em B,2 |\ |: "Em" (ED)uEvF (GF)vGuA | B2B2 G3 A | B2E2 (EF)GE | "D" (FG)FE D3 B,2 | diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/Laride6.abc --- a/Session/Laride6.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/Laride6.abc Sun Mar 31 20:51:02 2013 +0100 @@ -2,13 +2,13 @@ T:Laride 6 M:2/2 L:1/4 -N: Change: Bear Dance +N: Change: BearDance.abc O:France A:Bretagne K:G P:A "Em" E2B2 | Ac B2 | "D" A> B A F | "Bm" G A B2 | -"Em" E2B2 | Ac B2 | "D" A> B A F | "Em" G F E2 +"Em" E2B2 | Ac B2 | "D" A> B A F | "Em" G F E2 :| P:B "Em" E2 "G" G2 | GE "D" F2 | F A "Bm" A F | G A "Em" B2 | -"Em" E2 "G" G2 | GE "D" F2 | F>G "Bm" A B | G F "Em" E2 || +"Em" E2 "G" G2 | GE "D" F2 | F>G "Bm" A B | G F "Em" E2 :| diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/MazurkaDeLapleau.abc --- a/Session/MazurkaDeLapleau.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/MazurkaDeLapleau.abc Sun Mar 31 20:51:02 2013 +0100 @@ -1,6 +1,6 @@ X: 6 T:Mazurka de Lapleau -N: Change: Mazurka d'Avignon +N: Change: MazurkaAvignon.abc M:3/4 L:1/8 K:G diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/PlaneTree.abc --- a/Session/PlaneTree.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/PlaneTree.abc Sun Mar 31 20:51:02 2013 +0100 @@ -2,7 +2,7 @@ T: Plane Tree, The C: Undine Hornby S: Nick Barber -N: Change: Herbert the Sherbert +N: Change: HerbertTheSherbert.abc M: 6/8 L: 1/8 R: jig diff -r 6e96742a67a3 -r 50dccc8f1ac0 Session/RoguesMarch.abc --- a/Session/RoguesMarch.abc Sun Mar 31 19:51:22 2013 +0100 +++ b/Session/RoguesMarch.abc Sun Mar 31 20:51:02 2013 +0100 @@ -3,10 +3,9 @@ M: 6/8 L: 1/4 K: Gmaj -N: Change: Captain Lanoe's Quick March +N: Change: CaptainLanoesQuickMarch.abc "G" B B/ B/c/d/ | "C" e e + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Cry Havoc + Botley Morris + + Ye Crie Havoc Booke Of Dottes + diff -r 6e96742a67a3 -r 50dccc8f1ac0 dottes.html.footer --- a/dottes.html.footer Sun Mar 31 19:51:22 2013 +0100 +++ b/dottes.html.footer Sun Mar 31 20:51:02 2013 +0100 @@ -1,4 +1,4 @@ - + diff -r 6e96742a67a3 -r 50dccc8f1ac0 dottes.html.header --- a/dottes.html.header Sun Mar 31 19:51:22 2013 +0100 +++ b/dottes.html.header Sun Mar 31 20:51:02 2013 +0100 @@ -37,4 +37,4 @@

The tunes

- +
diff -r 6e96742a67a3 -r 50dccc8f1ac0 dottes.html.tune --- a/dottes.html.tune Sun Mar 31 19:51:22 2013 +0100 +++ b/dottes.html.tune Sun Mar 31 20:51:02 2013 +0100 @@ -20,14 +20,19 @@
+

@TITLE@

@TITLE@ dots +
+ Change: @CHANGETITLE@ +
  • PDF
  • MIDI
    • + href="../@MASTERBOOKE@/@TUNE@.mid">MIDI
  • MP3
    • + href="../@MASTERBOOKE@/@TUNE@.mp3">MP3
  • ABC
diff -r 6e96742a67a3 -r 50dccc8f1ac0 dottes.html.tuneindex --- a/dottes.html.tuneindex Sun Mar 31 19:51:22 2013 +0100 +++ b/dottes.html.tuneindex Sun Mar 31 20:51:02 2013 +0100 @@ -1,4 +1,9 @@ -
- - - +
+
+ @TITLE@ +
+
+ @TITLE@ first line +
+
diff -r 6e96742a67a3 -r 50dccc8f1ac0 dottes.tex.a4header --- a/dottes.tex.a4header Sun Mar 31 19:51:22 2013 +0100 +++ b/dottes.tex.a4header Sun Mar 31 20:51:02 2013 +0100 @@ -3,6 +3,7 @@ \usepackage{graphicx} \usepackage{fancyhdr} \usepackage{longtable} +\usepackage[svgnames]{xcolor} \usepackage{hyperref} \hypersetup{ @@ -45,6 +46,33 @@ % ----- +% Title page +\newcommand*{\rotrt}[1]{\rotatebox{90}{#1}} % Command to rotate right 90 degrees +\newcommand*{\rotlft}[1]{\rotatebox{-90}{#1}} % Command to rotate left 90 degrees + +\newcommand*{\titleBC}{\begingroup % Create the command for including the title page in the document +\centering % Center all text + +\def\CP{\textit{\Huge Ye Crie Havock Booke of Dottes}} % Title + +\settowidth{\unitlength}{\CP} % Set the width of the curly brackets to the width of the title +{\color{LightGoldenrod}\resizebox*{\unitlength}{\baselineskip}{\rotrt{$\}$}}} \\[\baselineskip] % Print top curly bracket +\textcolor{Sienna}{\CP} \\[\baselineskip] % Print title +{\color{RosyBrown}\Large \input{subtitle.txt}} \\ % Tagline or further description +{\color{LightGoldenrod}\resizebox*{\unitlength}{\baselineskip}{\rotlft{$\}$}}} % Print bottom curly bracket + +\vfill % Whitespace between the title and the author name + +{\Large\textbf{Cry Havoc}}\\ % Author name + +\vfill % Whitespace between the author name and the rest + +\today % Date published + +\endgroup} + +% ----- + \begin{document} % ----- Headers and footers @@ -57,13 +85,7 @@ % ----- Title page and contents -\title{Ye Crie Havock Booke of Dottes \\ \input{subtitle.txt}} - -\author{Cry Havoc} - -\date{\today} - -\maketitle +\titleBC \newpage diff -r 6e96742a67a3 -r 50dccc8f1ac0 dottes.tex.a5header --- a/dottes.tex.a5header Sun Mar 31 19:51:22 2013 +0100 +++ b/dottes.tex.a5header Sun Mar 31 20:51:02 2013 +0100 @@ -3,6 +3,7 @@ \usepackage{graphicx} \usepackage{fancyhdr} \usepackage{longtable} +\usepackage[svgnames]{xcolor} \usepackage{hyperref} \hypersetup{ @@ -45,6 +46,33 @@ % ----- +% Title page +\newcommand*{\rotrt}[1]{\rotatebox{90}{#1}} % Command to rotate right 90 degrees +\newcommand*{\rotlft}[1]{\rotatebox{-90}{#1}} % Command to rotate left 90 degrees + +\newcommand*{\titleBC}{\begingroup % Create the command for including the title page in the document +\centering % Center all text + +\def\CP{\textit{\Huge Ye Crie Havock Booke of Dottes}} % Title + +\settowidth{\unitlength}{\CP} % Set the width of the curly brackets to the width of the title +{\color{LightGoldenrod}\resizebox*{\unitlength}{\baselineskip}{\rotrt{$\}$}}} \\[\baselineskip] % Print top curly bracket +\textcolor{Sienna}{\CP} \\[\baselineskip] % Print title +{\color{RosyBrown}\Large \input{subtitle.txt}} \\ % Tagline or further description +{\color{LightGoldenrod}\resizebox*{\unitlength}{\baselineskip}{\rotlft{$\}$}}} % Print bottom curly bracket + +\vfill % Whitespace between the title and the author name + +{\Large\textbf{Cry Havoc}}\\ % Author name + +\vfill % Whitespace between the author name and the rest + +\today % Date published + +\endgroup} + +% ----- + \begin{document} % ----- Headers and footers @@ -57,13 +85,7 @@ % ----- Title page and contents -\title{Ye Crie Havock Booke of Dottes \\ \input{subtitle.txt}} - -\author{Cry Havoc} - -\date{\today} - -\maketitle +\titleBC \newpage diff -r 6e96742a67a3 -r 50dccc8f1ac0 makeAll.sh --- a/makeAll.sh Sun Mar 31 19:51:22 2013 +0100 +++ b/makeAll.sh Sun Mar 31 20:51:02 2013 +0100 @@ -12,14 +12,24 @@ ./makeGraphics.sh "$1" ./makeBookeA5.sh "$1" ./makeBookeA4.sh "$1" - ./makeWebItems.sh "$1" - ./makeWeb.sh "$1" "$2" + ./makeWebGraphics.sh "$1" + ./makeWebAudio.sh "$1" + ./makeWeb.sh "$1" "$1" "$2" +} + +makeATransposedBooke() +{ + ./makeGraphics.sh "$1" + ./makeBookeA5.sh "$1" + ./makeBookeA4.sh "$1" + ./makeWebGraphics.sh "$1" + ./makeWeb.sh "$1" "$2" "$3" } makeABooke $1 ./makeCello.sh $1 -makeABooke $1-Cello cello +makeATransposedBooke $1-Cello $1 cello ./makeHornInF.sh $1 -makeABooke $1-HornInF "horn in F" +makeATransposedBooke $1-HornInF $1 "horn in F" diff -r 6e96742a67a3 -r 50dccc8f1ac0 makeBookeA4.sh --- a/makeBookeA4.sh Sun Mar 31 19:51:22 2013 +0100 +++ b/makeBookeA4.sh Sun Mar 31 20:51:02 2013 +0100 @@ -7,6 +7,13 @@ # makeGraphics.sh to make these. # +# Restore titles like 'Exploding Potato, The' to the +# expected 'The Exploding Potato'. +fixtitle() +{ + retval=`echo "$1" | sed -e "s/\(.*\), *\(.*\)/\2 \1/"` +} + if [ $# != 1 ]; then echo "Usage: makeBookeA4.sh " exit 1 @@ -41,16 +48,25 @@ find $booke -name "*.abc" | sort | while read filename do + name=`basename $filename .abc` title=`$dir/abcfield.py --field T --latex $filename` - name=`basename $filename .abc` + fixtitle "$title" + title=$retval + echo -E "\begin{center}" >> $builddir/$output echo -E "\phantomsection" >> $builddir/$output echo -E "\hypertarget{$name}{\includegraphics[width=\textwidth,keepaspectratio]{$graphicsdir/$name}}" >> $builddir/$output echo -E "\addcontentsline{toc}{subsection}{$title}" >> $builddir/$output echo -E "\end{center}" >> $builddir/$output - text=$booke/$name.tex - if [ -r $text ]; then - cat $text >> $builddir/$output + + changefile=`$dir/abcfield.py --field N $filename | grep "Change:" | sed -e "s/Change: *//"` + changetitle="" + if [ -n "$changefile" ]; then + changetitle=`$dir/abcfield.py --field T --latex $booke/$changefile` + fixtitle "$changetitle" + changetitle=$retval + changename=`basename $changefile .abc` + echo -E "Change: \hyperlink{$changename}{$changetitle}" >> $builddir/$output fi done @@ -59,8 +75,10 @@ find $booke -name "*.abc" | sort | while read filename do + name=`basename $filename .abc` title=`$dir/abcfield.py --field T --latex $filename` - name=`basename $filename .abc` + fixtitle "$title" + title=$retval echo -E "\hyperlink{$name}{$title} & \raisebox{-.25\height}{\includegraphics[width=0.6\textwidth]{$graphicsdir/firstline-$name}} \\\\" >> $builddir/$output done diff -r 6e96742a67a3 -r 50dccc8f1ac0 makeBookeA5.sh --- a/makeBookeA5.sh Sun Mar 31 19:51:22 2013 +0100 +++ b/makeBookeA5.sh Sun Mar 31 20:51:02 2013 +0100 @@ -7,6 +7,13 @@ # makeGraphics.sh to make these. # +# Restore titles like 'Exploding Potato, The' to the +# expected 'The Exploding Potato'. +fixtitle() +{ + retval=`echo "$1" | sed -e "s/\(.*\), *\(.*\)/\2 \1/"` +} + if [ $# != 1 ]; then echo "Usage: makeBookeA5.sh " exit 1 @@ -43,17 +50,26 @@ find $booke -name "*.abc" | sort | while read filename do + name=`basename $filename .abc` title=`$dir/abcfield.py --field T --latex $filename` - name=`basename $filename .abc` + fixtitle "$title" + title=$retval + echo -E "\newpage" >> $builddir/$output echo -E "\begin{center}" >> $builddir/$output echo -E "\phantomsection" >> $builddir/$output - echo -E "\hypertarget{$name}{\includegraphics[width=\textwidth,height=0.9\textheight,keepaspectratio]{$graphicsdir/$name}}" >> $builddir/$output + echo -E "\hypertarget{$name}{\includegraphics[width=\textwidth,height=0.85\textheight,keepaspectratio]{$graphicsdir/$name}}" >> $builddir/$output echo -E "\addcontentsline{toc}{subsection}{$title}" >> $builddir/$output echo -E "\end{center}" >> $builddir/$output - text=$booke/$name.tex - if [ -r $text ]; then - cat $text >> $builddir/$output + + changefile=`$dir/abcfield.py --field N $filename | grep "Change:" | sed -e "s/Change: *//"` + changetitle="" + if [ -n "$changefile" ]; then + changetitle=`$dir/abcfield.py --field T --latex $booke/$changefile` + fixtitle "$changetitle" + changetitle=$retval + changename=`basename $changefile .abc` + echo -E "Change: \hyperlink{$changename}{$changetitle}" >> $builddir/$output fi done @@ -62,8 +78,10 @@ find $booke -name "*.abc" | sort | while read filename do + name=`basename $filename .abc` title=`$dir/abcfield.py --field T --latex $filename` - name=`basename $filename .abc` + fixtitle "$title" + title=$retval echo -E "\hyperlink{$name}{$title} & \raisebox{-.25\height}{\includegraphics[width=0.6\textwidth]{$graphicsdir/firstline-$name}} \\\\" >> $builddir/$output done diff -r 6e96742a67a3 -r 50dccc8f1ac0 makeWeb.sh --- a/makeWeb.sh Sun Mar 31 19:51:22 2013 +0100 +++ b/makeWeb.sh Sun Mar 31 20:51:02 2013 +0100 @@ -4,8 +4,17 @@ # to be already built. # -if [ $# -lt 1 -o $# -gt 2 ]; then - echo "Usage: makeWeb.sh []" +#set -x + +# Restore titles like 'Exploding Potato, The' to the +# expected 'The Exploding Potato'. +fixtitle() +{ + retval=`echo "$1" | sed -e "s/\(.*\), *\(.*\)/\2 \1/"` +} + +if [ $# -lt 2 -o $# -gt 3 ]; then + echo "Usage: makeWeb.sh []" exit 1 fi @@ -15,8 +24,10 @@ webdir=$dir/web/$1 graphicsdir=$dir/graphics/$1 output=index.html -title=$1 booke=$1 +masterbooke=$2 +title=$booke +instrument=$3 buildno=`cat buildno.txt` subtitle= @@ -28,10 +39,9 @@ intro=`cat $bookedir/intro.txt` fi -if [ -n "$2" ]; then - # Remove any transposition tag from title. - title="${title/-*/} ($2)" - subtitle="${subtitle} ($2)" +if [ -n "$instrument" ]; then + title="${title} ($instrument)" + subtitle="${subtitle} ($instrument)" fi mkdir -p $webdir @@ -48,12 +58,21 @@ find $bookedir -name "*.abc" | sort | while read filename do - title=`$dir/abcfield.py --field T --html $filename` name=`basename $filename .abc` - # Restore titles like 'Exploding Potato, The' to the - # expected 'The Exploding Potato'. - title=`echo $title | sed -e "s/\(.*\), *\(.*\)/\2 \1/"` + title=`$dir/abcfield.py --field T --html $filename` + fixtitle "$title" + title=$retval + changefile=`$dir/abcfield.py --field N $filename | grep "Change:" | sed -e "s/Change: *//"` + changetitle="" + changevisibility="no" + if [ -n "$changefile" ]; then + changetitle=`$dir/abcfield.py --field T --html $bookedir/$changefile` + changevisibility="yes" + + fixtitle "$changetitle" + changetitle=$retval + fi # Copy tune PDF from common graphics. cp $graphicsdir/${name}.pdf $webdir @@ -64,7 +83,13 @@ # Generate the tune web page. tunepage=${name}.html + # If the title contains HTML character entities, escape + # initial '&' in the title - it means things to sed. sed -e "s/@TITLE@/${title//&/\&}/" \ + -e "s/@MASTERBOOKE@/${masterbooke}/" \ + -e "s/@CHANGETITLE@/${changetitle//&/\&}/" \ + -e "s/@CHANGETUNE@/${changefile/.abc/.html}/" \ + -e "s/@CHANGEVISIBILITY@/${changevisibility}/" \ -e "s/@TUNE@/${name}/" dottes.html.tune > $webdir/$tunepage sed -e "s/@TITLE@/${title//&/\&}/" \ diff -r 6e96742a67a3 -r 50dccc8f1ac0 makeWebAudio.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/makeWebAudio.sh Sun Mar 31 20:51:02 2013 +0100 @@ -0,0 +1,34 @@ +#!/bin/bash +# +# Make audio required for the website but not for the book. +# They go into web/. +# + +if [ $# != 1 ]; then + echo "Usage: makeWebAudio.sh " + exit 1 +fi + +dir=`pwd` + +booke=$dir/$1 +builddir=$dir/web/$1 + +mkdir -p $builddir + +# Now, for each tune, make the tune bitmap and sound. Do this to temp +# files and rename into place to make updates as atomic as possible. +find $booke -name "*.abc" | sort | + while read filename + do + name=`basename $filename .abc` + tmpname=${name}.tmp + + 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}.mid $builddir/${name}.mid + mv $builddir/${tmpname}.mp3 $builddir/${name}.mp3 + rm $builddir/${tmpname}.wav + done diff -r 6e96742a67a3 -r 50dccc8f1ac0 makeWebGraphics.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/makeWebGraphics.sh Sun Mar 31 20:51:02 2013 +0100 @@ -0,0 +1,33 @@ +#!/bin/bash +# +# Make graphics required for the website but not for the book. +# They go into web/. +# + +if [ $# != 1 ]; then + echo "Usage: makeWebGraphics.sh " + exit 1 +fi + +dir=`pwd` + +booke=$dir/$1 +builddir=$dir/web/$1 +graphicsdir=$dir/graphics/$1 + +mkdir -p $builddir + +# Now, for each tune, make the main tune and tune first line bitmaps. +# Do this to temp files and rename into place to make updates as +# atomic as possible. +find $booke -name "*.abc" | sort | + while read filename + do + 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 + + mv $builddir/${tmpname}.png $builddir/${name}.png + mv $builddir/firstline-${tmpname}.png $builddir/firstline-${name}.png + done diff -r 6e96742a67a3 -r 50dccc8f1ac0 makeWebItems.sh --- a/makeWebItems.sh Sun Mar 31 19:51:22 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -#!/bin/bash -# -# Make items required for the website but not for the book. -# They go into web/. -# - -if [ $# != 1 ]; then - echo "Usage: makeWebItems.sh " - exit 1 -fi - -dir=`pwd` - -booke=$dir/$1 -builddir=$dir/web/$1 -graphicsdir=$dir/graphics/$1 - -mkdir -p $builddir - -# Now, for each tune, make the tune JPG and sound. Do this to temp -# files and rename into place to make updates as atomic as possible. -find $booke -name "*.abc" | sort | - while read filename - do - 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 - done diff -r 6e96742a67a3 -r 50dccc8f1ac0 singletune.fmt --- a/singletune.fmt Sun Mar 31 19:51:22 2013 +0100 +++ b/singletune.fmt Sun Mar 31 20:51:02 2013 +0100 @@ -8,13 +8,14 @@ titleformat T0 C1 titlespace 0 topspace 0 -% I only want to include Notes in the tune graphics. To turn off the -% other fields, give a blank infoname for that letter. +% I don't want any info fields in the graphics. To turn off the +% fields, give a blank infoname for that letter. infoname S infoname R infoname B infoname D infoname Z infoname H +infoname N infoline true writehistory true diff -r 6e96742a67a3 -r 50dccc8f1ac0 web/css/dottes.css --- a/web/css/dottes.css Sun Mar 31 19:51:22 2013 +0100 +++ b/web/css/dottes.css Sun Mar 31 20:51:02 2013 +0100 @@ -28,7 +28,6 @@ height: 136px; background-color: black; - /* background-color: #9900cc; */ background-image: url('../img/banner.png'); background-repeat: no-repeat; background-position: center center; @@ -126,17 +125,7 @@ { font-size: 20px; position: relative; - top: 10px; -} - -table.dottes-tune-table -{ - margin: 10px; -} - -table.dottes-tune-table td -{ - vertical-align: middle; + top: 12px; } ul.tune-type-list @@ -168,3 +157,41 @@ display: inline; margin: 10px; } + +div.dottes-tune-list +{ + display: table; + margin: 10px; +} + +div.dottes-tune-list-item +{ + display: table-row; +} + +div.dottes-tune-list-item-link +{ + display: table-cell; + vertical-align: middle; +} + +div.dottes-tune-list-item-image +{ + display: table-cell; + vertical-align: middle; +} + +div.dottes-change-no +{ + display: none; +} + +div.dottes-change-yes +{ + display: block; + margin: 10px; +} + +div.dottes-change-link +{ +} diff -r 6e96742a67a3 -r 50dccc8f1ac0 web/img/banner.png Binary file web/img/banner.png has changed diff -r 6e96742a67a3 -r 50dccc8f1ac0 web/img/purple-fabric-background.jpg Binary file web/img/purple-fabric-background.jpg has changed diff -r 6e96742a67a3 -r 50dccc8f1ac0 web/index.html --- a/web/index.html Sun Mar 31 19:51:22 2013 +0100 +++ b/web/index.html Sun Mar 31 20:51:02 2013 +0100 @@ -106,6 +106,13 @@ +
+

Who is responsible for this?

+

Found a mistake, missing a tune or just want something changed? + Email Jim at + dottes@cryhavoc.org.uk.

+
+ diff -r 6e96742a67a3 -r 50dccc8f1ac0 web/robots.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/robots.txt Sun Mar 31 20:51:02 2013 +0100 @@ -0,0 +1,3 @@ +# Stop indexing of this site. +User-agent: * +Disallow: /
@TITLE@@TITLE@ first line