Mercurial > dottes

changeset 913:be3a8c9b5bee build-default-335

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author Jim Hague <jim.hague@acm.org>
date Mon, 08 Apr 2019 20:10:57 +0100
parents bc7d23921e10 (current diff) eaa779540c4b (diff)
children e8e0c6ebee16
files
diffstat 24 files changed, 89 insertions(+), 88 deletions(-) [+]
line wrap: on
line diff
--- a/Morris/BalanceTheStraw.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/BalanceTheStraw.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -7,7 +7,7 @@
 P: (A2.B2)4
 K: G
 P: A
-D | "G" G2 B BAB | "C" c2 A ABc | "D7" ded cBA | "G" B2 A G3  ||
+D | "G" G2 B BAB | "D7" c2 A ABc | "G" ded "C" cBA | "D7" B2 A "G" G3  ||
 P: B
-Bc | "G" d2 d d2 B | c2 c "D7" B2 A | "G" ded BGB | "D7" c2 B A2 D |
-   "G" G2 B BAB | "C" c2 A ABc | "D7" ded cBA | "G" B2 A G3 |]
+Bc | "G" d2 d d2 B | "C" c2 c "D7" B2 A | "G" ded BGB | "C" c2 B "D7" A2 D |
+   "G" G2 B BAB | "D7" c2 A ABc | "G" ded "C" cBA | "D7" B2 A "G" G3 |]
--- a/Morris/BanburyBill.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/BanburyBill.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -7,8 +7,8 @@
 P:A.(A.B3)3.A
 K:D
 P:A
-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 d ||
+F/E/ | "D" DE FD | "G" GA B2 | "A7" EF GA/G/ | "D" FG "A7" A A/B/ |
+  "D" AD FA | de f e/f/ | "G" ge "A7" cB/c/ | "D" d2 d ||
 P:B
-A | "D" de fd  | "A7" cd e2 | "Em" Bc de/d/ | "A7" cB A B/c/ |
+A | "D" de fd  | "A7" cd e2 | "G" Bc de/d/ | "A7" cB A B/c/ |
   "D" dA A2  | FG A2 | "G" B/c/ d "A7" c/d/e/c/ | "D" d2 d |]
--- a/Morris/BanksOfTheDee.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/BanksOfTheDee.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -9,18 +9,18 @@
 Q:120
 P:A
 D |\
-"G" DEF GAB | "C" ced "G" cBA | "Em" BGE"D"D dc | "G" BcA "D" G2  ||
+"D"  DEF "G" GAB | "C" ced "D7" cBA | "G" BGE "D" D dc | "D7" BcA "G" G2  ||
 P:B
 B |\
-   "G" Bcd d2 g | "C" ede "G" dBG | Bcd "Em" efg | "G" GAG "D" FED |
-   "C" cec "G" BdB  | "D" GFG "G" AFD | GFE"D7"D dc | BcA "G" G2 ||
+   "G" Bcd d2 g | "C" ede "G" dBG | Bcd "C" efg | "G" GAG "D" FED |
+   "C" cec "G" BdB  | "D" GFG AFD | "C" GFE "D" D dc | "D7" BcA "G" G2 ||
 P:C
 M:4/4
 Q: 180
 %%MIDI gchordoff
-    "^Slows" B2c2 d4 | d4 g4 | e2d2 e4 | d2B2 G4 |\
-    B2c2 d4 | e2f2 g4 | G2A2 G4 | F2E2 D3 B |
+    "^Slows" "G" B2c2 d4 | d4 g4 | "C" e2d2 e4 | "G" d2B2 G4 |\
+    "G" B2c2 d4 | "C" e2f2 g4 | G2A2 G4 | "D7" F2E2 D3 B |
 %%MIDI gchordon
 M:6/8
 Q:120
-   "C" cec "G" BdB  | "D" GFG "G" AFD | GFE"D7"D dc | BcA "G" G3 |]
+   "C" cec "G" BdB  | "D" GFG AFD | "C" GFE "D7" D dc | BcA "G" G3 |]
--- a/Morris/BeanSetting.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/BeanSetting.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -8,13 +8,13 @@
 K: G
 P: A
 d>B |\
-"G" G2 G>A B2 B2 | "Am" A>B (3cBA "D" G>A B2 |\
-"G" G2 G>A B2 B2 | "Am" A>B (3cBA "G" G2 d>B |
-    G2 G>A B2 B2 | "Am" A>B (3cBA "D" G>A B2 |\
+"G" G2 G>A B2 B2 | "D7" A>B (3cBA "G" G>A B2 |\
+"G" G2 G>A B2 B2 | "D7" A>B (3cBA "G" G2 d>B |
+"G" G2 G>A B2 B2 | "D7" A>B (3cBA "G" G>A B2 |\
 "G" G2 G>A B2 B2 | "Am" A>B (3cBA "G" G3 ||
 M: 6/8
 Q: 3/8=80
 P: B
-B>AG B>AG | B/2(d3d2) B | "Am"A>BA A2 B | "C" c2 d e>dc | "G" B>AG B>dB |\
+"G" B>AG B>AG | B/2(d3d2) B | "D7" A>BA A2 B | "C" c2 d e>dc | "G" B>AG B>dB |\
 M: 9/8
-"Am" ABc "D" def "G" g3 |]
+"D7" ABc def "G" g3 |]
--- a/Morris/BlackJoke.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/BlackJoke.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -7,10 +7,10 @@
 Q: 120
 K: G
 P: A
-D | "G" DGG GFG | "C" AcB "D" AGF | "G" GAB "Em" dcB |\
-    "Am" AcB "D" AGF | "G" GAB "C" EFG | "D" DEF "G" G3 :|
+D | "G" DGG GFG | "D7" AcB "D" AGF | "G" GAB dcB |\
+    "D7" AcB AGF | "G" GAB "C" EFG | "D7" DEF "G" G3 :|
 P: B
 B | "G" d2 d d2 d | "C" ede "D" d2 c | "G" B2 d d2 d |\
     "C" ede "D" d2 c | "G" B2 B BAG |
 "C" AcB "D" AGF | "G" GAB dcB | "C" AcB "D" AGF |\
-"G" GAB "C" EFG | "D" DEF "G" G3 |]
+"G" GAB "C" EFG | "D7" DEF "G" G3 |]
--- a/Morris/BonnyGreen.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/BonnyGreen.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -10,9 +10,9 @@
 Q:3/8=100
 A2B2c2 |\
 P:A
-|: "D" dcd AFA | "G" BAB "A" ABc  | "D" dcd "A" efg |\
-[1 "D" faf "A" e2 A :|\
-[2 "D" f2 e d2 A ||
+|: "D" dcd AFA | "G" BAB "A7" ABc  | "D" dcd "A7" efg |\
+[1 "D" faf "A7" e2 A :|\
+[2 "A7" f2 e "D" d2 A ||
 K:G
 P:B
 |: "G" dcB "D" AGF | "G" GAB "C" cde | "G" ded dcB | B3 "D" A2 d |\
--- a/Morris/Compact/BanksOfTheDee.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/Compact/BanksOfTheDee.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -5,18 +5,20 @@
 K:G
 Q:120
 P:A
-"G" DEF GAB | "C" ced "G" cBA | "Em" BGE"D"D dc | "G" BcA "D" G3  ||\
+D |\
+"D"  DEF "G" GAB | "C" ced "D7" cBA | "G" BGE "D" D dc | "D7" BcA "G" G2  ||\
 P:B
+B |\
    "G" Bcd d2 g | "C" ede "G" dBG |
-   Bcd "Em" efg | "G" GAG "D" FED |\
-   "C" cec "G" BdB  | "D" GFG "G" AFD | GFE"D7"D dc | BcA "G" G3  ||
+   Bcd "C" efg | "G" GAG "D" FED |\
+   "C" cec "G" BdB  | "D" GFG AFD | "C" GFE "D" D dc | "D7" BcA "G" G2 ||
 P:C
 M:4/4
 Q: 180
 %%MIDI gchordoff
-    "^Slows" B2c2 d4 | d4 g4 | e2d2 e4 | d2B2 G4 |\
-    B2c2 d4 | e2f2 g4 | G2A2 G4 | F2E2 D4 |
+    "^Slows" "G" B2c2 d4 | d4 g4 | "C" e2d2 e4 | "G" d2B2 G4 |\
+    "G" B2c2 d4 | "C" e2f2 g4 | G2A2 G4 | "D7" F2E2 D3 B |
 %%MIDI gchordon
 M:6/8
 Q:120
-   "C" cec "G" BdB  | "D" GFG "G" AFD | GFE"D7"D dc | BcA "G" G3 |]
+   "C" cec "G" BdB  | "D" GFG AFD | "C" GFE "D7" D dc | BcA "G" G3 |]
--- a/Morris/Compact/LaudnumBunches.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/Compact/LaudnumBunches.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -7,20 +7,20 @@
 K: G
 P: A
 d |\
-"G" Bcd "C" efg | "D" afe d2 c | "G" Bcd "C" efg| "D" b2 a g2 :|\
+"G" Bcd "C" efg | "D" afe d2 c | "G" Bcd "C" efg| "D7" b2 a "G" g2 :|\
 P: B
 "G" d |\
-BAG B<dB | "A" AGA AGA |
-"G" B<dB AGA | B<Ge "D" d2 c |\
-"G" Bcd "C" efg | "D" afe d2 c | "G" Bcd "C" efg | "D" b2 a g2 ||\
+BAG B<dB | "D7" AGA AGA |
+"G" B<dB "D7" AGA | B<G "C" e d2 c |\
+"G" Bcd "C" efg | "D" afe d2 c | "G" Bcd "C" efg | "D7" b2 a "G" g2 ||\
 P: C
 "G" d | BAG B<dB |
 M: 4/4
 L: 1/4
 Q: 1/2=88
-"D" A z A2 | "G" G A B<d | B2 "D" A2 | "G" G A B<G | \
-"C" e>e "G" d>c |\
+"D" A z A2 | "G" G A B<d | B2 "D" A2 | "G" G A B<G |\
+"C" e>e "D7" d>c |\
 M: 6/8
 L: 1/8
 Q: 3/8=88
-Bcd "C" efg | "D" afe d2 c | "G"Bcd "C" efg | "D" b2 a g2 |]
+"G" Bcd "C" efg | "D" afe d2 c | "G"Bcd "C" efg | "D" b2 a "G" g2 |]
--- a/Morris/Compact/PostmansKnock.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/Compact/PostmansKnock.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -16,9 +16,9 @@
 P:B
 "D" A2F2A2  A2F2A2 | "G" B2c2d2  "D" A6 |\
 w: Ev-er-y morn-ing as true as the clock,
-"D" d2c2B2     A4    F2   | "A" F4 E2  "D" F6 |
+"D" d2c2B2     A4    F2   | "D" F4 "A7" E2  "D" F6 |
 w: some-bod-y hears the    post-man's  knock.
-"D" A2F2A2  A2F2A2| "A" B2c2d2  "D" A6 |\
+"D" A2F2A2  A2F2A2| "G" B2c2d2  "D" A6 |\
 w: Ev-er-y morn-ing as true as the clock,
-    d2c2B2    A4    d2  | d6   "A" c6 | "D" d6 z4 z2 ||
+    d2c2B2    A4    d2  | d6   "A7" c6 | "D" d6 z4 z2 ||
 w: some-bod-y hears the  post-    man's   knock.
--- a/Morris/Compact/RingOBells.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/Compact/RingOBells.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -13,8 +13,8 @@
 P:B
 Bc |\
 "G" d2 "C" c2 | "G" Bg "C" e2 | "G" d2 "C" c2 | "G" Bg "C" e2 |\
-"G" dG "C" c2 | "G" B (3A/2B/2A/2 G "C" A | "G" B2 "D" A2 | "G" G2 ||
+"G" dG "C" c2 | "G" B A2 G "C" A | "G" B2 "D" (3ABA | "G" G2 ||
 P:C
-"G" "^Heading up" d (3c/2d/2c/2 B (3A/2B/2A/2 |\
+"^Heading up" d (3c/2d/2c/2 "G" B (3A/2B/2A/2 |\
 "G" Gg fe | d (3c/2d/2c/2 B (3A/2B/2A/2 |\
 Gg fe | "G" dB "C" c2 | "G" BA GA | "G" B2 "D" A2 | "G" G4 |]
--- a/Morris/Compact/StepBack.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/Compact/StepBack.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -7,11 +7,11 @@
 P: (A2.B2)3.A2
 K: G
 P: A
-"G" g f/g/ a b | "C" a g/f/ e/f/ g | "D7" f d "C" e c | "G" d d/c/ B/c/ d |\
+"G" g f/g/ "D " a b | a g/f/ "C" e/f/ g | "D" f d "C" e c | "G" d d/c/ B/c/ d |\
 "C" g g/f/ e d/c/ |
 "G" B d g2 | "G" B B/G/ "D7" A F | "G" G2 G2 ||\
 P: B
-"G" d/c/B/A/ G A/B/ | c d e f | g/f/e/d/ c d |
+"G" d/c/B/A/ G A/B/ | "C" c d e f | g/f/e/d/ c d |
 "Em" e/f/g/b/ "D" a f/a/ |\
-"C" g e/g/ "Bm" f d/f/ | "Am" e/c/A/B/ "D7" c e | "G" d/c/B/A/ G A/B/ |\
+"C" g e/g/ "D" f d/f/ | "C" e/c/A/B/ "D7" c e | "G" d/c/B/A/ G A/B/ |\
 "C" c2 c2 |]
--- a/Morris/CountryGardens.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/CountryGardens.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -7,10 +7,10 @@
 P: A.(A2.(BA)2)4
 K: G
 P: A
-"G7" g2 g>f "C" e2 e2 | "D7" d2 d>c "G" B2 B>c | "G" d2 G2 "C" A2 c2 |\
+"G" g2 g>f "C" e2 e2 | "D7" d2 d>c "G" B2 B>c | "G" d2 G2 "C" A2 c2 |\
     "D7" B2>A2 "G" G4 ||
 P: B
-"A7" g>a g>e "D" f2 d2 | "A7" g>a g>e "D" f2 d2 | "A7" g2 g>f e2 a2 |\
+"G" g>a g>e "D" f2 d2 | "G" g>a g>e "D" f2 d2 | "G" g2 g>f "A7" e2 a2 |\
     f2>e2 "D7"d2 B>c |
-"G7" d2 g>f "C" e2 e2 | "D7" d>e d>c "G" B2 B>c | "G" d2 G2 "C" A2 c2 |\
+"G" d2 g>f "C" e2 e2 | "D7" d>e d>c "G" B2 B>c | d2 G2 "C" A2 c2 |\
     "D7" B2>A2 "G" G4 |]
--- a/Morris/GettingUpstairs.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/GettingUpstairs.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -8,11 +8,10 @@
 K: G
 P: A
 d/c/ |\
-"G" B G D G | "D7" F/G/A/B/ c/e/d/c/ |\
+"G" B G D G | "D7" F/G/A/B/ "C" c/e/d/c/ |\
 "G" B G D G | "D7" F/G/A/F/ "G" G d/c/ |
-"G" B G D G | "D7"  F/G/A/B/ c/e/d/c/ |\
+"G" B G D G | "D7"  F/G/A/B/ "C" c/e/d/c/ |\
 "G" B G D G | "D7"F/G/A/F/ "G" G2  ||
 P: B
-"G" B>c d G | B c d2 | "C" e>d c B | "D7" A B c/e/d/c/ | "G" B G D G |
-"D7" F/G/A/B/ c/e/d/c/ | "G" B G D G |\
-[1 "D7" F/G/A/F/ "G" G2 :| [2 "D7"F/G/A/F/ "G" G |]
+"G" B>c d G | B c d2 | "C" e>d c B | "D7" A B "C" c/e/d/c/ | "G" B G D G |
+"D7" F/G/A/B/ "C" c/e/d/c/ | "G" B G D G | "D7" F/G/A/F/ "G" G2 |]
--- a/Morris/HasteToTheWedding.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/HasteToTheWedding.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -8,9 +8,9 @@
 K: G
 P: A
 D |\
-"G" DED DGB | "A" AGA "G" BGE | DED dcB | "Am"cBc "D" A2 E |
-"G" DED DGB | "Am" AGA "G" BGE | DED "D" d2 c | "G" BGG G2 ||
+"G" DED DGB | "C" AGA "G" BGE | "D" DED dcB | cBc A2 E |
+"G" DED DGB | "C" AGA "G" BGE | "D" DED d2 c | "G" BGG G2 ||
 P: B
 d |\
-dBd dBd | "C" ece ece | "G" d2 d dcB | "Am" cBc "D" ABc |
-"G" d3 B2 G | "Am" AGA "G" BGE | DED "D" d2 c | "G" BGG G2 |]
+"G" dBd dBd | "C" ece ece | "G" d2 d dcB | "D" cBc ABc |
+"G" d3 B2 G | "C" AGA "G" BGE | "D" DED d2 c | "G" BGG G2 |]
--- a/Morris/HighlandMaryOldTomOfOxford.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/HighlandMaryOldTomOfOxford.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -9,8 +9,8 @@
 L: 1/4
 K: Gmaj
 P: A
-B/c/ | "D" d e/f/ "G" g d | "D" c B A B/A/ | "G" G B/c/ d g | "D" f g a f/e/ |
-       "D" d e/f/ "G" g d | "D" c B A e/f/ | "G" g d c B | "D" A B/A/ "G" G ||
+B/c/ | "G" d e/f/ g d | "C" c B "D7" A B/A/ | "G" G B/c/ d g | "D" f g a f/e/ |
+       "G" d e/f/ g d | "C" c B "D7" A e/f/ | "G" g d c B | "D" A B/A/ "G" G ||
 P: B
-z/A/ | "G" B d B d | "G" B d g/f/e/d/ | "C" c e c e | "C" c e g/f/e/d/ |
-       "G" B d B c | "D" d e/f/ "G" g d | "G" g d c B | "D" A B/A/ "G" G |]
+z/A/ | "G" B d B d | "G" B d g/f/e/d/ | "C" c e c e | "C" c e f/e/d/c/ |
+       "G" B d B c | d e/f/ g d | g d c B | "D" A B/A/ "G" G |]
--- a/Morris/HuntTheSquirrel.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/HuntTheSquirrel.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -7,8 +7,8 @@
 L: 1/4
 K: G
 P: A
-"G" G/A/B/c/ d B | G/A/B/c/ d B | "Em" G/A/B/c/d B/G/ | "D" A/G/F/A/ "G" G D |
-"G" G/A/B/c/ d B | G/A/B/c/ d B | "Em" G/A/B/c/ d B/G/ | "D" A/G/F/A/ "G" G2 ||
+"G" G/A/B/c/ d B | G/A/B/c/ d B | G/A/B/c/d B/G/ | "D" A/G/F/A/ "G" G D |
+"G" G/A/B/c/ d B | G/A/B/c/ d B | G/A/B/c/ d B/G/ | "D" A/G/F/A/ "G" G2 ||
 P: B
-"G" d g "D" f a/f/ | "G" g b/g/ "D" d>e | d>e d/c/B/A/ | "G" G A B2 |
-"G" d g "D" f a/f/ | "G" g b/g/ "D" d>e | d>e d/c/B/A/ | "G" G F G2 |]
+"G" d g "D" f a/f/ | "G" g b/g/ d>e | "D7" d>e d/c/B/A/ | "G" G A B2 |
+"G" d g "D" f a/f/ | "G" g b/g/ d>e | "D7" d>e d/c/B/A/ | "G" G "D7" F "G" G2 |]
--- a/Morris/LadsABunchum.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/LadsABunchum.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -16,5 +16,5 @@
 w: Six  young mai-dens come a  court-in'      me.
 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 |\
+gf | "C" e2 d2 "G" d2 GA | "G" B2 B2 B2 gf | "C" e2 d2 c2 B2 |\
 "D7" A2 G2 "G" G2 :|
--- a/Morris/LaudnumBunches.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/LaudnumBunches.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -8,19 +8,19 @@
 K: G
 P: A
 d |\
-"G" Bcd "C" efg | "D" afe d2 c | "G" Bcd "C" efg| "D" b2 a g2 :|
+"G" Bcd "C" efg | "D" afe d2 c | "G" Bcd "C" efg| "D7" b2 a "G" g2 :|
 P: B
 "G" d |\
-BAG B<dB | "A" AGA AGA | "G" B<dB AGA | B<Ge "D" d2 c |
-"G" Bcd "C" efg | "D" afe d2 c | "G" Bcd "C" efg | "D" b2 a g2 ||
+BAG B<dB | "D7" AGA AGA | "G" B<dB "D7" AGA | B<G "C" e d2 c |
+"G" Bcd "C" efg | "D" afe d2 c | "G" Bcd "C" efg | "D7" b2 a "G" g2 ||
 P: C
 "G" d | BAG B<dB |\
 M: 4/4
 L: 1/4
 Q: 1/2=88
 "D" A z A2 | "G" G A B<d | B2 "D" A2 | "G" G A B<G |
-"C" e>e "G" d>c |\
+"C" e>e "D7" d>c |\
 M: 6/8
 L: 1/8
 Q: 3/8=88
-Bcd "C" efg | "D" afe d2 c | "G"Bcd "C" efg | "D" b2 a g2 |]
+"G" Bcd "C" efg | "D" afe d2 c | "G"Bcd "C" efg | "D" b2 a "G" g2 |]
--- a/Morris/MountainGoats.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/MountainGoats.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -7,9 +7,9 @@
 L: 1/8
 Q: 130
 P: A
-e^c |\
-"G" dBFB DGBG | "Am" cBAc "D" F2 FE | DFAB dcBd | "A" edd^c c4 |
-"G" dBFB DGBG | "Am" cBAc egfe | "G" d^cd=c BADF | "D" GDBA "G" G2 ||
+d^c |\
+"G" dBGB DGBG | "C" cBAc "D" F2 FE | DFAB cBAc | "A7" edd^c "D" d2 d^c |
+"G" dBGB DGBG | "C" cBcd  egfe | "G" d^cd=c "D7" BAGF | "G" GD "D7" BA "G" G2 ||
 P: B
-"G" [AB,]2 AB "D" AFAB | d2 "C" c2 [cE]2 | E2 "C" FG ABcA | "D" e2 d2 ^c2 =c2 |
-"D" d2 AB AFAB | "C" c2 A2 e2 e2 | "D" d^cd=c BAGF | "G" GABd G4 |]
+"G" D2 AB "D" AFAB | d2 "C" c2 c4 | E2 "C" FG ABcA | "D" e2 d2 ^c2 =c2 |
+"D" D2 AB AFAB | "C" c2 A2 e2 e2 | "D" d^cd=c BAGF | "G" GABd g4 |]
--- a/Morris/PostmansKnock.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/PostmansKnock.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -18,9 +18,9 @@
 P:B
 "D" A2F2A2  A2F2A2 | "G" B2c2d2  "D" A6 |\
 w: Ev-er-y morn-ing as true as the clock,
-"D" d2c2B2     A4    F2   | "A" F4 E2  "D" F6 |
+"D" d2c2B2     A4    F2   | "D" F4 "A7" E2  "D" F6 |
 w: some-bod-y hears the    post-man's  knock.
-"D" A2F2A2  A2F2A2| "A" B2c2d2  "D" A6 |\
+"D" A2F2A2  A2F2A2| "G" B2c2d2  "D" A6 |\
 w: Ev-er-y morn-ing as true as the clock,
-    d2c2B2    A4    d2  | d6   "A" c6 | "D" d6 z4 z2 ||
+    d2c2B2    A4    d2  | d6   "A7" c6 | "D" d6 z4 z2 ||
 w: some-bod-y hears the  post-    man's   knock.
--- a/Morris/RingOBells.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/RingOBells.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -13,7 +13,7 @@
 P:B
 Bc |\
 "G" d2 "C" c2 | "G" Bg "C" e2 | "G" d2 "C" c2 | "G" Bg "C" e2 |
-"G" dG "C" c2 | "G" B (3A/2B/2A/2 G "C" A | "G" B2 "D" A2 | "G" G2 ||
+"G" dG "C" c2 | "G" B A2 G "C" A | "G" B2 "D" (3ABA | "G" G2 ||
 P:C
 "^Heading up" d (3c/2d/2c/2 "G" B (3A/2B/2A/2 |\
 "G" Gg fe | d (3c/2d/2c/2 B (3A/2B/2A/2 |
--- a/Morris/Sidesteps.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/Sidesteps.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -9,10 +9,10 @@
 P: A
 D2 | \
 "Em" E2>G2 "D" FE D2 | "Em" EFGG "D" FE D2 | "Em" EFGB "D" A2 "A" G2 |\
-"D" F2 "A" (3EFE "D" D2 D2 ||
+"D" F2 "A" (3EFE "D" D2 ||
 P: B
-|: "G" d2 de d2 B2 | "D" ABcA "G" B2 G2 | dedB "D" c2 A2 |\
-"C" A2 c2 "D" B2 G2 | "G" dedB "D" c2 A2 |
+|: Bc | "G" d2 de d2 B2 | "D" ABcA "G" B2 G2 | dedB "D" c2 A2 |\
+    A2 c2 "G" B2 G2 | "G" dedB "D" c2 A2 |
 "D" ABcA "G" B2 G2 | "D" ABcA "G" B2 "D" A2 |\
-[1 "G" G2 "D" F2 "C" E2 "G" Bc :|\
-[2 "G" G2 "D" F2 "C" E2 "D" D2 |]
+[1 "G" G2 "D" F2 "C" E2 "G" :|\
+[2 "Em" G2 F2 E2 |]
--- a/Morris/StepBack.abc	Thu Apr 04 22:50:39 2019 +0100
+++ b/Morris/StepBack.abc	Mon Apr 08 20:10:57 2019 +0100
@@ -7,9 +7,9 @@
 P: (A2.B2)3.A2
 K: G
 P: A
-"G" g f/g/ a b | "C" a g/f/ e/f/ g | "D7" f d "C" e c | "G" d d/c/ B/c/ d |
+"G" g f/g/ "D " a b | a g/f/ "C" e/f/ g | "D" f d "C" e c | "G" d d/c/ B/c/ d |
 "C" g g/f/ e d/c/ | "G" B d g2 | "G" B B/G/ "D7" A F | "G" G2 G2 ||
 P: B
-"G" d/c/B/A/ G A/B/ | c d e f | g/f/e/d/ c d | "Em" e/f/g/b/ "D" a f/a/ |
-"C" g e/g/ "Bm" f d/f/ | "Am" e/c/A/B/ "D7" c e | "G" d/c/B/A/ G A/B/ |\
+"G" d/c/B/A/ G A/B/ | "C" c d e f | g/f/e/d/ c d | "Em" e/f/g/b/ "D" a f/a/ |
+"C" g e/g/ "D" f d/f/ | "C" e/c/A/B/ "D7" c e | "G" d/c/B/A/ G A/B/ |\
 "C" c2 c2 |]
--- a/dottes.tex	Thu Apr 04 22:50:39 2019 +0100
+++ b/dottes.tex	Mon Apr 08 20:10:57 2019 +0100
@@ -214,7 +214,7 @@
 remove the offending tune.
 
 Finally, many, many thanks to all who have helped me with this project,
-in particular fellow Havocs Nerys, MickP, Susie and Ed. And most
+in particular fellow Havocs KateK, Nerys, MickP, Susie and Ed. And most
 especially to Jane, without whose enthusiasm, support and encouragement
 this would never have been possible.