# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1508011377 -3600
# Node ID 33b4d07c59071d318f19f9d7993719ac0c4ca9e5
# Parent  fe789453007251c52494e80ab2e564eb4a6cbefe# Parent  e605fccf6e331061e22235c19b1dc3df34044265
Merge with upstream.

diff -r e605fccf6e33 -r 33b4d07c5907 Morris/Compact/BanksOfTheDee.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Morris/Compact/BanksOfTheDee.abc	Sat Oct 14 21:02:57 2017 +0100
@@ -0,0 +1,22 @@
+X:1
+T:Banks of the Dee, The
+M:6/8
+P:(A2.B2)2.(A2.C2)2
+K:G
+Q:120
+P:A
+"G" DEF GAB | "C" ced "G" cBA | "Em" BGE"D"D dc | "G" BcA "D" G3  ||\
+P: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  ||
+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 |
+%%MIDI gchordon
+M:6/8
+Q:120
+   "C" cec "G" BdB  | "D" GFG "G" AFD | GFE"D7"D dc | BcA "G" G3 |]
diff -r e605fccf6e33 -r 33b4d07c5907 Morris/Compact/BlueBells.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Morris/Compact/BlueBells.abc	Sat Oct 14 21:02:57 2017 +0100
@@ -0,0 +1,22 @@
+X:1
+T:Blue Bells of Scotland
+M:4/4
+L:1/8
+P:(A.B)6.C
+K:G
+Q: 160
+d2 | g4    f2  e2   | d4    e2  g2  | B2   B2   c2  A2  | G6 :|
+w: Oh   where oh_     where has my   high-land las-sie   gone?
+w: She's gone to the  woods with her fri-lly  knick-ers  on!
+P:A
+d2 | "G" g2 g2 "C" f2  e2 | "G" d2 d2 "C" e2 g2 |\
+     "G" B2  B2 "D7" c2 A2 | "G" G6 :|\
+P:B
+d>c |\
+"G" B2 G2  "Bm" B2 d2 | "Em" g2 g2 "A7" e2 fg  |
+"D" f2 d2 "A7" e2 c2 | "D" d4 "C" e2 "D7" f2 |\
+"G" g2 g2 "C" f2 e2 | "G" d2 d2 "C"e2 g2 | "G" B2 B2 "D7" c2 A2  | "G" G8 ||
+P:C
+Q:320
+"^Double time" d2 | "G" g2 g2 "C" f2  e2 | "G" d2 d2 "C" e2 g2  |\
+     "G" B2  B2 "D7" c2 A2 | "G" G6 :|
diff -r e605fccf6e33 -r 33b4d07c5907 Morris/Compact/LaudnumBunches.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Morris/Compact/LaudnumBunches.abc	Sat Oct 14 21:02:57 2017 +0100
@@ -0,0 +1,26 @@
+X:1
+T: Laudnum Bunches
+P: A.(A.B3)2.(A.C3)2
+Q: 3/8=88
+M: 6/8
+L: 1/8
+K: G
+P: A
+d |\
+"G" Bcd "C" efg | "D" afe d2 c | "G" Bcd "C" efg| "D" b2 a g2 "G" d |\
+    Bcd "C" efg | "D" afe d2 c | "G" Bcd "C" efg | "D" b2 ag2 ||
+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 ||
+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 |\
+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 |]
diff -r e605fccf6e33 -r 33b4d07c5907 Morris/Skirmish.abc
--- a/Morris/Skirmish.abc	Sat Oct 14 13:02:41 2017 +0100
+++ b/Morris/Skirmish.abc	Sat Oct 14 21:02:57 2017 +0100
@@ -10,8 +10,8 @@
 Q:1/4=160
 K:G
 P:A
-D|"G"G D G A|B2 "D"A B/c/|"G"d G "D7"B/A/ G/F/|"G"G3 D|\
+D|"G"G D G A|B2 "D"A B/c/|"G"d G "D7"B/A/ G/F/|"G"G3 D|
   "G"G D G A|B2 "D7"A B/c/|"G"d G "D7"B/A/ G/F/|"G"G3 ||
 P:B
-B/c/|"G"d>e d c|B c d d|"C"e e "Am"d/c/ B/A/|"G"G2 "D"F D/D/|\
+B/c/|"G"d>e d c|B c d d|"C"e e "Am"d/c/ B/A/|"G"G2 "D"F D/D/|
 "G"G F/G/ "D"A G/A/|"G"B A/B/ "D"c B/c/|"G"d G "D7"B/A/ G/F/|"G"G3|]