# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1476549437 -3600
# Node ID a44de27fd0f80b148daae2c9880f6c027f35e36b
# Parent  640326bb4ef3d0076643aaac7d946d1b55eac5b9# Parent  0608283c1ae4aac8beff516a20dd8811c5e89687
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 0608283c1ae4 -r a44de27fd0f8 .hgtags
--- a/.hgtags	Sat Oct 15 17:37:05 2016 +0100
+++ b/.hgtags	Sat Oct 15 17:37:17 2016 +0100
@@ -65,3 +65,9 @@
 4791b1a4c7df97c0b51f5bbdbc8e6ddbfda5074e build-default-228
 4a4642a93a8701bf35cc0baf8a03683222528608 build-default-229
 e8cd5dca110e2cfee329705c9cec3b82587ca905 build-default-230
+a6f19c2c3b7fc04322d75f9cf02820e5ddedceba build-default-231
+e83437ddb505a04b357cd0154599419ba25bc1a0 build-default-232
+aa317abeddc3a8c9625d050353176ababc4e0c50 build-default-233
+e2eff99671a516cbe1803f9ffa43685ab5136336 build-default-234
+c6568aedca9e81e565b888c34d51c45043164b3d build-default-235
+726df98abe8876386e380f5564d21e2c0f5bbdef build-default-236
diff -r 0608283c1ae4 -r a44de27fd0f8 Library/HarvestHome.abc
--- a/Library/HarvestHome.abc	Sat Oct 15 17:37:05 2016 +0100
+++ b/Library/HarvestHome.abc	Sat Oct 15 17:37:17 2016 +0100
@@ -6,7 +6,7 @@
 L:1/8
 Q:1/4=120
 AF |\
-"D" DAFA DAFA | defe dcBA | "G" eA fA gA fA | "A7" ed cB AG FE |
+"D" DAFA DAFA | defe dcBA | "G" eA fA gA fA | "A7" (3efe (3dcB (3ABA (3GFE |
 "D" DAFA DAFA | defe dcBA | "G" eA fA "A7" gece | "D" d2 "G" f2 "D" d2:|
 cd |\
 "A7" eA (3AAA fA (3AAA | gA fA eA (3AAA | "G" eA fA "A7" gA fA |\
diff -r 0608283c1ae4 -r a44de27fd0f8 Library/Mourisque.abc
--- a/Library/Mourisque.abc	Sat Oct 15 17:37:05 2016 +0100
+++ b/Library/Mourisque.abc	Sat Oct 15 17:37:17 2016 +0100
@@ -1,6 +1,6 @@
 X:1
-T:La Mourisque
-T:La Basse danse 5
+T:Mourisque, La
+T:Basse danse 5, La
 R:March
 C:Tielman Susato 1551
 O:Flemish
diff -r 0608283c1ae4 -r a44de27fd0f8 Library/NavvyOnTheLine.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Library/NavvyOnTheLine.abc	Sat Oct 15 17:37:17 2016 +0100
@@ -0,0 +1,13 @@
+X:1
+T:Navvy on the Line
+R:hornpipe
+M:4/4
+L:1/8
+Q:120
+K:G
+Bc |\
+"G"dgfe "D7"dcBA | "G"GBDG B2AG | "D7"FADF A2GF | "G"GBDG B2Bc |
+"G"dgfe "D7"dcBA | "G"GBDG B2AG | "D7"FGAB cdef | "G"g2G2 G2 :|
+AG |\
+"D7" FADF A2GF |     "G"GBDG B2AG | "D7"FADF A2GF | "G"GDEF "D7"GABc |
+"G"  dgfe "D7"dcBA | "G"GBDG B2AG | "D7"FGAB cdef | "G"g2G2 G2 :|
diff -r 0608283c1ae4 -r a44de27fd0f8 Library/OffToCalifornia.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Library/OffToCalifornia.abc	Sat Oct 15 17:37:17 2016 +0100
@@ -0,0 +1,13 @@
+X:1
+T:Off to California
+R:Hornpipe
+O:Ireland
+M:4/4
+Q:1/4=120
+K:G
+(3DEF|\
+"G"GFGB "D"AGED|"G"GBdg "C"e2(3def|"G"gfgd "C"edBG|"D"ABAG "C"E2(3DEF|
+"G"GFGB "D"AGED|"G"GBdg "C"e2(3def|"G"gfgd "C"edBG|"D"(3ABA GF "G"G2:|
+(3def|\
+"Em"gfeg "D"fedf|"Em"edef edBd|"Em"gfgd "D"edBG|"D"ABAG "C"E2(3DEF|
+"G"GFGB "D"AGED|"G"GBdg "C"e2(3def|"G"gfgd "C"edBG|"D"(3ABA GF "G"G2:|
diff -r 0608283c1ae4 -r a44de27fd0f8 Library/RattlingBog.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Library/RattlingBog.abc	Sat Oct 15 17:37:17 2016 +0100
@@ -0,0 +1,13 @@
+X:1
+T:Rattling Bog
+M:4/4
+L:1/8
+R:Reel
+Q:160
+K:D
+de |\
+"D" f4 f2>e2 | "G" d2 B2 B2>B2 | "D" A2 d2 dcde | "A" f2 e2 e2 de |
+"D" f4 f2>e2 | "G" d2 B2 B2>B2 | "D" A2 a2 a2 f2 | "A" e2 d2 "D" d2 :|
+de |\
+"D" f2 d2 "A" e2 de | "D" f2 d2 "A" e2 de | "D" f2 a2 a2 f2 | "A" e2 d2 e2 de |
+"D" f2 d2 "A" e2 de | "D" f2 d2 "A" e2 de | "D" f2 a2 a2 f2 | "A" e2 d2 "D" d2 :|
diff -r 0608283c1ae4 -r a44de27fd0f8 Library/RightsOfMan.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Library/RightsOfMan.abc	Sat Oct 15 17:37:17 2016 +0100
@@ -0,0 +1,14 @@
+X:1
+T:Rights Of Man, The
+O:Ireland
+M:4/4
+L:1/8
+Q:140
+R:Hornpipe
+K:G
+GA |\
+"Em" (3BcB  (3ABA (3GAG  (3FGF | EFGA  B2ef | gfed  edBd | "D" cBAG A2GA |
+"Em" (3BcB  (3ABA (3GAG  (3FGF | EFGA  B2ef | gfed  "D" Bgfg | "Em" e2 E2 E2 :|
+ga |\
+"Em" babg efga | babg egfe | "D" d2 d^c defg | afdf a2 gf |
+"C"  edef gfga | bgaf gfef | "D" gfed Bgfg | "Em" e2 E2 E2 :|
diff -r 0608283c1ae4 -r a44de27fd0f8 Library/SiBheagSiMhor.abc
--- a/Library/SiBheagSiMhor.abc	Sat Oct 15 17:37:05 2016 +0100
+++ b/Library/SiBheagSiMhor.abc	Sat Oct 15 17:37:17 2016 +0100
@@ -1,17 +1,17 @@
 X: 1
-T: Si Bheag, Si Mhor
+T: Si Bheag Si Mhor
 C: Turlough O'Carolan (1670-1736)
 M: 3/4
 L: 1/8
 Q: 140
 K: Dmaj
 de |\
-"D" f2>e2 d2 | "Bm" d2>e2 d2 | "G" B4 A2 | "D" F4 A2 |\
-"G" BA Bc d2 | "A7" e4 de | "D" f4 e2 |
-"Bm" d4 f2 | "G" A4 d2 | F4 "A7" E2 |\
-"D" D4 f2 | "G" B4 e2 | "D" A4 dc | "D" d4 "A7" c2 | "D" d4 :|
+"D" f2>e2 d2 | d2 de d2 | "G" B4 A2 | "D" F4 A2 |\
+"G" BA Bc d2 | "A" e4 de | "D" f4 e2 |
+d4 f2 | "G" B4 e2 | "D" A4 d2 | "F#" F4 E2 |\
+"Bm" D4 f2 | "G" B4 e2 | "A" A4 dc | "D" (d6 | d4) :|
 de |\
-"D" f2>e2 d2 | "A7" ed ef a2 | "G" b4 a2 | "D" f4 ed |\
-"A7" e4 a2 | "D" f4 e2 | "G" d4 B2 |
-"Bm" B4 A2 | "D" F4 "A7" E2 | "D" D4 f2 | "G" B4 e2 | "D" A2>f2 a2 |\
-"G" ba gf ed | "A7" e4 dc | "D" d4 "A7" c2 | "D" d4 :|
+"D" f2 fe d2 | ed ef a2 | "G" b4 a2 | "D" f4 ed |\
+"A" e4 a2 | "Bm" f4 e2 | "G" d4 B2 |
+B4 A2 | "D" F4 E2 | "Bm" D4 f2 | "G" B4 e2 | "D" A2>f2 a2 |\
+"G" ba gf ed | "A" e4 dc | "D" (d6 | d4) :|
diff -r 0608283c1ae4 -r a44de27fd0f8 Library/SirRogerDeCoverley.abc
--- a/Library/SirRogerDeCoverley.abc	Sat Oct 15 17:37:05 2016 +0100
+++ b/Library/SirRogerDeCoverley.abc	Sat Oct 15 17:37:17 2016 +0100
@@ -1,6 +1,5 @@
 X:1
 T:Sir Roger de Coverley
-S:Trad
 M:9/8
 Q:180
 K:G
diff -r 0608283c1ae4 -r a44de27fd0f8 dottes.html.learnertune
--- a/dottes.html.learnertune	Sat Oct 15 17:37:05 2016 +0100
+++ b/dottes.html.learnertune	Sat Oct 15 17:37:17 2016 +0100
@@ -21,8 +21,8 @@
 
     <div class="grid_12 dottes-body">
       <div class="dottes-tune-display">
-        <img src="../img/learner.png">Work out the tune or play along
-        with these audio players. They play the tune repeatedly. There's
+        <img src="../img/learner.png">Work out the melody or play along
+        with these audio players. They play the melody repeatedly. There's
         a variety of speeds to choose from. You can also download the
         audio files.
       </div>
@@ -59,14 +59,14 @@
             </div>
             <div class="dottes-tune-footer-centre">
               <audio controls loop>
-                <source src="../@MASTERBOOKE@/@TUNE@.mp3" type="audio/mpeg" />
-                <source src="../@MASTERBOOKE@/@TUNE@.ogg" type="audio/ogg" />
+                <source src="../@MASTERBOOKE@/normal-@TUNE@.mp3" type="audio/mpeg" />
+                <source src="../@MASTERBOOKE@/normal-@TUNE@.ogg" type="audio/ogg" />
                 <object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95">
-                  <param name="FileName" value="@TUNE@.mp3" />
+                  <param name="FileName" value="normal-@TUNE@.mp3" />
                   <param name="autoStart" value="false" />
                   <param name="autoplay" value="false" />
                   <param name="playCount" value="100000" />
-                  <object type="audio/mpeg" data="@TUNE@.mp3">
+                  <object type="audio/mpeg" data="normal-@TUNE@.mp3">
                     <param name="controller" value="true" />
                     <param name="autoplay" value="false" />
                     <param name="playCount" value="100000" />
diff -r 0608283c1ae4 -r a44de27fd0f8 makeWebAudio.sh
--- a/makeWebAudio.sh	Sat Oct 15 17:37:05 2016 +0100
+++ b/makeWebAudio.sh	Sat Oct 15 17:37:17 2016 +0100
@@ -18,13 +18,13 @@
 
 # Make MP3 and OGG files for the input .abc. Since we're listening to
 # a doorbell playing the tunes, go for lowest quality (and hence smallest)
-# MP3 and OGG.
+# MP3 and OGG. $1 is the input filename, $2 is optional args for timidity.
 makeaudiofiles()
 {
     name=`basename $1 .abc`
 
     abc2midi $1 -o $builddir/${name}.mid
-    timidity -OwM -o $builddir/${name}.wav $builddir/${name}.mid
+    timidity -OwM $2 -o $builddir/${name}.wav $builddir/${name}.mid
     lame -m m -V 9 --quiet $builddir/${name}.wav $builddir/${name}.mp3
     # Timidity can generate OGG directly. But we need to generate WAV
     # for lame, and oggenc produces smaller output. OGG is needed for
@@ -38,6 +38,9 @@
 # Make audio for a new tempo for the abc file $1, giving the output files
 # the same name with a prefix $2. The new tempo is the original tempo
 # (120 used if not specified), multiplied by $3 and divided by $4.
+# These audio files are for Learner use; I've found that having the
+# chords thumping away can make it hard to distinguish the melody, so
+# arrange for timidity to mute everything except the melody track.
 makeaudiofortempo()
 {
     name=`basename $filename .abc`
@@ -58,7 +61,7 @@
     # Insert new tempo and delete old. Old may not exist,
     # so do this rather than overwrite.
     sed -e "/^Q:/d" -e "/^K:/aQ: ${notelenprefix}${newtempo}" $1 > $builddir/$newspeedfilename
-    makeaudiofiles $builddir/$newspeedfilename
+    makeaudiofiles $builddir/$newspeedfilename --mute=0,-1
     rm $builddir/$newspeedfilename
 }
 
@@ -70,6 +73,7 @@
 
         # Now make 1/4, 1/2 and 3/4 speed audio.
         makeaudiofortempo $filename "veryslow" 1 4
-        makeaudiofortempo $filename "slow" 1 2
+        makeaudiofortempo $filename "slow" 2 4
         makeaudiofortempo $filename "littleslow" 3 4
+        makeaudiofortempo $filename "normal" 4 4
     done