Merge with upstream.

This commit is contained in:
Jim Hague 2017-09-16 23:09:55 +01:00
commit fab846039f
18 changed files with 154 additions and 67 deletions

12
.hgtags
View File

@ -93,3 +93,15 @@ df9c60f6fbd742479bc974eb7937e13af5ba655a build-default-253
482a0759486f0b05d3470826bab00cfd681a9926 build-default-256 482a0759486f0b05d3470826bab00cfd681a9926 build-default-256
31cec1d79cb64382fc78bc6417dd842e5c203f51 build-default-257 31cec1d79cb64382fc78bc6417dd842e5c203f51 build-default-257
36d3adf30558b3fd3c9f90ec1c78f9f01bf2dc3c build-default-258 36d3adf30558b3fd3c9f90ec1c78f9f01bf2dc3c build-default-258
763c6916cc7dd83476fd2b9397dad37efcd6d74d build-default-259
7a96dea85c12677dd73649c90b862f8dcca51925 build-default-260
114d3468510f99203afd2a0e46bdcb15f8f20829 build-default-261
6247ad593ede858145273b50893ecac90ec55aeb build-default-262
4b4a47568f5a1656820afa961e09f973334e87ca build-default-263
c9945842c5236f002645aa6957dd20e2ad5bb432 build-default-264
df13ed6522099c52624ed6b0d164650f0cca7df5 build-default-265
57ac5ad9556d5f45573dc23ab37ac312d0cc9f93 build-default-266
7ad6c0aa958da1e114cc3c45c60775c6a359eb77 build-default-267
dff7d9fb81b3aa3aeed1791a857e2bc28fe6141a build-default-270
411557b5fd5253f091ccd379a8d1492cf15ecc08 build-default-271
0e0cbc22a87f9a2a409f649da7abef63d0850150 build-default-272

View File

@ -0,0 +1,14 @@
X: 1
T: Sue's French Tune
M: 3/4
L: 1/4
K: Em
Q: 160
"Em" B2 B | "C" c2 B | "D" A2 B | "Em" E3 |\
E G E | "D" F3 | F G A | "B" B3 |
"Em" B2 B | "C" c2 B | "D" A2 B | "Em" E3 |\
E G E | "D" F2 A | "B" G2 F | "Em" E3 :|
"C" e c A | e c A | "Em" B G E | B G E |\
"D" A F D | A F D | A G A | "B" B3 |
"C" e c A | e c A | "Em" B G E | B G E |\
"D" A F D | A F D | "B" A G F | "Em" E3 :|

View File

@ -3,12 +3,12 @@ T:Banbury Bill
A:Bampton A:Bampton
M:C M:C
L:1/4 L:1/4
Q:160 Q:1/4=170
P:A.(A.B3)3.A P:A.(A.B3)3.A
K:D K:D
P:A P:A
| "D" DE FD | "Em" GA B2 | "A7" EF GA/G/ | "D" FG "A7" A A/B/ | F/E/ | "D" DE FD | "Em" GA B2 | "A7" EF GA/G/ | "D" FG "A7" A A/B/ |
| "D" AD FA | de f e/f/ | "Em" ge "A7" cB/c/ | "D" d2 d2 || "D" AD FA | de f e/f/ | "Em" ge "A7" cB/c/ | "D" d2 d ||
P:B P:B
| "D" de fd | "A7" cd e2 | "Em" Bc de/d/ | "A7" cB A B/c/ | A | "D" de fd | "A7" cd e2 | "Em" Bc de/d/ | "A7" cB A B/c/ |
"D" dA A2 | FG A2 | "G" B/c/ d "A7" c/d/e/c/ | "D" d2 d2 |] "D" dA A2 | FG A2 | "G" B/c/ d "A7" c/d/e/c/ | "D" d2 d |]

12
Session/Bagpipers.abc Normal file
View File

@ -0,0 +1,12 @@
X: 1
T: Bagpipers
Q: 1/4=140
M: 4/4
L: 1/4
K: G
N: Dottes: The melody should be accompanied by a continuous drone
N:+ on the string below on fiddle - the chords are a suggested drone.
D | "C" E/F/ G G F | E2 E D | E>D E F | "G" G/F/G/A/ G D |
"C" E/F/ G G F | E2 E D | E>D E F | "G" G2 G :|
A | "G" B/c/ d d B | B A "D" A2 | "G" B/A/B/c/ d A | B/A/B/c/ d D |
"C" E/F/ G G F | E2 E D | E>D E F | "G" G3 :|

View File

@ -1,7 +1,7 @@
X: 1 X: 1
T: Exploding Potato, The T: Exploding Potato, The
C: Ed Pritchard C: Ed Pritchard
N: Change: ExtensionReel.abc N: Dottes: Change: <ExtensionReel.abc>
M: C M: C
L: 1/4 L: 1/4
Q: 180 Q: 180

11
Session/MountHills.abc Normal file
View File

@ -0,0 +1,11 @@
X: 1
T: Mount Hills
S: Playford
Q: 1/4=152
M: 4/4
L: 1/4
K: G
"G" G d B B | "D" A/B/A/G/ F D | "G" G d B B/c/ | "Am" d c/B/ A2 |
"G" G d B B | "D" A/B/A/G/ F D | "Am" G F/E/ c B/A/ | "D" F2 "G" G2 :|
"D" F>G A B | c B A G/F/ | "C" G E c d | "G" B2 "D" A2 |
"G" d/e/d/c/ B B | "Em" G G E G/B/ | "Am" c B/A/ "Am7" G/F/G/A/ | "D" A2 "G" G2 :|

View File

@ -3,7 +3,7 @@ T:Orange in Bloom
T:Sherborne Waltz T:Sherborne Waltz
R:Waltz R:Waltz
O:England O:England
N: Dottes From Paul Hardy's Session Tunebook. N: Dottes: From Paul Hardy's Session Tunebook.
Z:Paul Hardy's Session Tunebook 2013 (see www.paulhardy.net). Creative Commons cc by-nc-sa licenced. Z:Paul Hardy's Session Tunebook 2013 (see www.paulhardy.net). Creative Commons cc by-nc-sa licenced.
M:3/4 M:3/4
L:1/8 L:1/8

View File

@ -0,0 +1,13 @@
X: 1
T: Sussex Cotillion
N: Goes into Mount Hills
Q: 1/4=130
M: 4/4
L: 1/4
K: G
N: Dottes: Change: <MountHills.abc>
D | "G" G2 "D" d>c | "Em" B/c/A/B/ G A/B/ | "C" c B A G | "D" F/G/A/F/ D>D |
"C" E D/E/ "D" F E/F/ | "G" G/F/G/A/ "Em" G "C" c | "G" B A/G/ "D" A G/F/ | "G" G2 G :|
B/c/ | "G" d d/c/ B B/c/ | d/e/d/c/ B d | "C" e d e f | "G" g f/e/ d2 |
"G" g f/e/ d d | "C" e d/c/ "G" B A/B/ | "C" c B "Am" A G | "D" F/G/A/F/ D>D |
"C" E D/E/ F E/F/ | "G" G/F/G/A/ "Em" G c | "G" B A/G/ "D" A G/F/ | "G" G2 G :|

View File

@ -7,7 +7,7 @@
# The output is given in purely numeric form, to avoid needing to # The output is given in purely numeric form, to avoid needing to
# re-parse it in an external script. A single line is printed with # re-parse it in an external script. A single line is printed with
# the highest note followed by a space and the lowest note. Middle C ('C') is # the highest note followed by a space and the lowest note. Middle C ('C') is
# 100. D an octave about ('d') is 108. D an octave above that ('d'') is # 100. D an octave above ('d') is 108. D an octave above that ('d'') is
# 205. D below middle C ('d,') is 94. And so on. # 205. D below middle C ('d,') is 94. And so on.
# #
# For example: # For example:

View File

@ -65,17 +65,6 @@
<audio controls loop> <audio controls loop>
<source src="../${masterbooke}/normal-${name}.mp3" type="audio/mpeg" /> <source src="../${masterbooke}/normal-${name}.mp3" type="audio/mpeg" />
<source src="../${masterbooke}/normal-${name}.ogg" type="audio/ogg" /> <source src="../${masterbooke}/normal-${name}.ogg" type="audio/ogg" />
<object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95">
<param name="FileName" value="normal-${name}.mp3" />
<param name="autoStart" value="false" />
<param name="autoplay" value="false" />
<param name="playCount" value="100000" />
<object type="audio/mpeg" data="normal-${name}.mp3">
<param name="controller" value="true" />
<param name="autoplay" value="false" />
<param name="playCount" value="100000" />
</object>
</object>
</audio> </audio>
</div> </div>
<div class="dottes-tune-learner-download"> <div class="dottes-tune-learner-download">
@ -97,17 +86,6 @@
<audio controls loop> <audio controls loop>
<source src="../${masterbooke}/littleslow-${name}.mp3" type="audio/mpeg" /> <source src="../${masterbooke}/littleslow-${name}.mp3" type="audio/mpeg" />
<source src="../${masterbooke}/littleslow-${name}.ogg" type="audio/ogg" /> <source src="../${masterbooke}/littleslow-${name}.ogg" type="audio/ogg" />
<object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95">
<param name="FileName" value="littleslow-${name}.mp3" />
<param name="autoStart" value="false" />
<param name="autoplay" value="false" />
<param name="playCount" value="100000" />
<object type="audio/mpeg" data="littleslow-${name}.mp3">
<param name="controller" value="true" />
<param name="autoplay" value="false" />
<param name="playCount" value="100000" />
</object>
</object>
</audio> </audio>
</div> </div>
<div class="dottes-tune-learner-download"> <div class="dottes-tune-learner-download">
@ -129,17 +107,6 @@
<audio controls loop> <audio controls loop>
<source src="../${masterbooke}/slow-${name}.mp3" type="audio/mpeg" /> <source src="../${masterbooke}/slow-${name}.mp3" type="audio/mpeg" />
<source src="../${masterbooke}/slow-${name}.ogg" type="audio/ogg" /> <source src="../${masterbooke}/slow-${name}.ogg" type="audio/ogg" />
<object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95">
<param name="FileName" value="slow-${name}.mp3" />
<param name="autoStart" value="false" />
<param name="autoplay" value="false" />
<param name="playCount" value="100000" />
<object type="audio/mpeg" data="slow-${name}.mp3">
<param name="controller" value="true" />
<param name="autoplay" value="false" />
<param name="playCount" value="100000" />
</object>
</object>
</audio> </audio>
</div> </div>
<div class="dottes-tune-learner-download"> <div class="dottes-tune-learner-download">
@ -161,17 +128,6 @@
<audio controls loop> <audio controls loop>
<source src="../${masterbooke}/veryslow-${name}.mp3" type="audio/mpeg" /> <source src="../${masterbooke}/veryslow-${name}.mp3" type="audio/mpeg" />
<source src="../${masterbooke}/veryslow-${name}.ogg" type="audio/ogg" /> <source src="../${masterbooke}/veryslow-${name}.ogg" type="audio/ogg" />
<object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95">
<param name="FileName" value="veryslow-${name}.mp3" />
<param name="autoStart" value="false" />
<param name="autoplay" value="false" />
<param name="playCount" value="100000" />
<object type="audio/mpeg" data="veryslow-${name}.mp3">
<param name="controller" value="true" />
<param name="autoplay" value="false" />
<param name="playCount" value="100000" />
</object>
</object>
</audio> </audio>
</div> </div>
<div class="dottes-tune-learner-download"> <div class="dottes-tune-learner-download">

View File

@ -75,15 +75,6 @@
<audio controls> <audio controls>
<source src="../${masterbooke}/${name}.mp3" type="audio/mpeg" /> <source src="../${masterbooke}/${name}.mp3" type="audio/mpeg" />
<source src="../${masterbooke}/${name}.ogg" type="audio/ogg" /> <source src="../${masterbooke}/${name}.ogg" type="audio/ogg" />
<object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95">
<param name="FileName" value="${name}.mp3" />
<param name="autoStart" value="false" />
<param name="autoplay" value="false" />
<object type="audio/mpeg" data="${name}.mp3">
<param name="controller" value="true" />
<param name="autoplay" value="false" />
</object>
</object>
</audio> </audio>
</div> </div>
<div class="dottes-tune-footer-last"> <div class="dottes-tune-footer-last">

View File

@ -119,7 +119,7 @@
\textbf{Ye Crie Havoc Booke of Dottes} \textbf{Ye Crie Havoc Booke of Dottes}
Tune collection and presentation is copyright \copyright{} Jim Hague 2013 Tune collection and presentation is copyright \copyright{} Jim Hague 2013-2017
and is licensed under a Creative Commons and is licensed under a Creative Commons
Attribution-NonCommercial-ShareAlike 2.0 UK: England \& Wales License. Attribution-NonCommercial-ShareAlike 2.0 UK: England \& Wales License.
Details at \url{http://creativecommons.org/licenses/by-nc-sa/2.0/uk/}. Details at \url{http://creativecommons.org/licenses/by-nc-sa/2.0/uk/}.
@ -207,7 +207,8 @@ Find out more at \url{http://www.cryhavoc.org.uk/}, or email
information. Would-be dancers or musicians always welcome. information. Would-be dancers or musicians always welcome.
The Booke of Dottes was first produced to mark Cry Havoc's 20th The Booke of Dottes was first produced to mark Cry Havoc's 20th
anniversary in 2013. anniversary in 2013, and substantially updated for our 25th anniversary
in 2018.
% ----- % -----

View File

@ -1,4 +1,4 @@
\section{@SECTION@ tunes} \section{@SECTIONNAME@ tunes}
{\renewcommand{\arraystretch}{2.5} {\renewcommand{\arraystretch}{2.5}
\setlength\LTleft{0pt} \setlength\LTleft{0pt}

View File

@ -2,7 +2,7 @@
\newpage \newpage
\addcontentsline{toc}{chapter}{@SECTION@ tunes} \addcontentsline{toc}{chapter}{@SECTIONNAME@ tunes}
\vspace*{\fill} \vspace*{\fill}

View File

@ -41,6 +41,9 @@ makeASingleBooke()
./makeHornInF.sh $1 ./makeHornInF.sh $1
makeATransposedBooke $1-HornInF $1 "horn in F" makeATransposedBooke $1-HornInF $1 "horn in F"
./makeAltoRecorderCFingering.sh $1
makeATransposedBooke $1-AltoRecorderCFingering $1 "alto recorder, C fingering"
} }
makeBumperBooke() makeBumperBooke()

51
makeAltoRecorderCFingering.sh Executable file
View File

@ -0,0 +1,51 @@
#!/bin/bash
#
# Transpose a book for alto recorder with C fingering.
if [ $# != 1 ]; then
echo "Usage: makeAltoRecorderCFingering.sh <book dir name>"
exit 1
fi
# Transpose up (return 0) if bottom note was < F (< C for recorder).
transposeup()
{
(($3 < 103))
}
dir=`pwd`
booke=$dir/$1
outdir=$dir/$1-AltoRecorderCFingering
mkdir -p $outdir
# Copy book component items.
cp $booke/*.txt $outdir
echo "Alto Recorder (C Fingering)" > $outdir/instrument.txt
find $booke -name "*.abc" | sort |
while read filename
do
name=`basename $filename .abc`
range=`./abcrange.py $filename`
# Transpose concert pitch down a fifth.
# If there are any notes below 'F' (recorder 'C'), transpose
# up a seventh instead.
transpose=-5
if transposeup $range; then
transpose=7
fi
# There's no point in having transposed chords. Remove from the
# abc before transposing. Some badly formed chord items can give
# erroneous output from abc2abc (like, strings of binary gibberish).
sed -e "s/\"[^\"]*\"//g" $filename > $outdir/$name.abc.tmp
# Transpose. By default abc2abc will report errors in the output,
# but this messes up output formatting so stop it.
abc2abc $outdir/$name.abc.tmp -e -t $transpose > $outdir/$name.abc
rm $outdir/$name.abc.tmp
done

View File

@ -56,6 +56,8 @@ rm -f $builddir/firstlines.tex
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
section=$dir/$1 section=$dir/$1
# Section name - strip any instrument name off the end.
sectionname=${1/-*/}
for item in title subtitle instrument for item in title subtitle instrument
do do
@ -76,8 +78,8 @@ do
fi fi
done done
sed -e "s/@SECTION@/$1/" dottes.tex.section-tunes >> $builddir/tunes.tex sed -e "s/@SECTION@/$1/" -e "s/@SECTIONNAME@/$sectionname/" dottes.tex.section-tunes >> $builddir/tunes.tex
sed -e "s/@SECTION@/$1/" dottes.tex.section-firstlines >> $builddir/firstlines.tex sed -e "s/@SECTION@/$1/" -e "s/@SECTIONNAME@/$sectionname/" dottes.tex.section-firstlines >> $builddir/firstlines.tex
shift shift
done done

View File

@ -113,6 +113,27 @@
</div> </div>
</div> </div>
</div> </div>
<div class="dottes-transpose-container">
<div class="dottes-transpose-instrument">
<div class="dottes-transpose-instrument-item dottes-transpose-instrument-name">
<h1>Alto recorder using C fingering</h1>
</div>
<div class="dottes-transpose-instrument-item dottes-transpose-how">
<p>Transpose down a fifth, or up a seventh depending on the
range in the tune. This allows players familiar with the
descant recorder to use the fingering they already know
when playing the alto recorder, rather than having to
learn F fingering.</p>
</div>
<div class="dottes-transpose-instrument-item dottes-transpose-tune-types">
<ul class="tune-type-list">
<li><a href="Morris-AltoRecorderCFingering">Morris</a></li>
<li><a href="Session-AltoRecorderCFingering">Session</a></li>
<li><a href="Library-AltoRecorderCFingering">Library</a></li>
</ul>
</div>
</div>
</div>
</div> </div>
<div class="dottes-body"> <div class="dottes-body">