Merge upstream. build-default-364
authorJim Hague <jim.hague@acm.org>
Mon, 02 Dec 2019 22:36:37 +0000
changeset 1010 62a43e801dbe
parent 1009 f642bd5835a5 (current diff)
parent 1008 cca512dc020e (diff)
child 1011 5688c4994b84
Merge upstream.
--- a/.hgtags	Mon Dec 02 22:36:06 2019 +0000
+++ b/.hgtags	Mon Dec 02 22:36:37 2019 +0000
@@ -190,3 +190,7 @@
 745c2db297a551830fffb0f593cd01a210c223fd build-default-357
 c612450d5dc163261002a478fee73dcad225a889 build-default-358
 020baffff30ee998b96b2a0574c18a8809f03a4a build-default-359
+4474cc2e88f70d4ad42517d2692495d357a259a9 build-default-360
+19c737d183acf57c1fc0fea87e0f21a2335f91c8 build-default-361
+1d86f87c3c7df381f0e79af79e83ca0e933cd9c7 build-default-362
+e8547392c2e61216bf38734b0db3769b542119cd build-default-363
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Library/KingsHouse.abc	Mon Dec 02 22:36:37 2019 +0000
@@ -0,0 +1,12 @@
+X: 1
+T: King's House, The
+M: 3/4
+L: 1/8
+Q: 140
+K: D
+EAB | \
+c2 e>c BA | a2 f2 a>f | e2 f>e cA | B4 cd |
+ed G2 g>f | e>d d2 cd | e2 g2 BG | A3 :|
+Ace | \
+a2 a2 fd | e>d c2 ef | g2 G2 d>c | B4 A/2B/2c/2d/2 |
+e2 ec BA | d>e f2 g>f | e2 d>c BA | A3 :|
--- a/Morris/GettingUpstairs.abc	Mon Dec 02 22:36:06 2019 +0000
+++ b/Morris/GettingUpstairs.abc	Mon Dec 02 22:36:37 2019 +0000
@@ -1,7 +1,7 @@
 X:1
 T: Getting Upstairs
 A: Headington
-P: A.(A2.B)4
+P: A.(A.B2)4
 Q: 1/4=168
 M: 4/4
 L: 1/4
@@ -13,5 +13,5 @@
 "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" c/e/d/c/ | "G" B G D G |
+"G" B>c d d | 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/LadsABunchum.abc	Mon Dec 02 22:36:06 2019 +0000
+++ b/Morris/LadsABunchum.abc	Mon Dec 02 22:36:37 2019 +0000
@@ -5,16 +5,21 @@
 A:Adderbury
 O:English
 R:Reel
-P:A.(AB)6.B
+P:A.(BC)6.C
 K:G
 Q:150
 P:A
-A2 | "G" B2 B2    Bcde           | "C" c2 A2   "D7" A2 Bc |
-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        be!
+B2 B2    BcdB           | c2 A2 A4   |\
+w:  Oh dear  moth-er, what a  fool I be,
+d2 d2  dcBA         | B2    G2       G4 |
+w: Six  young mai-dens came a  court-in'      me.
+B2>B2 B2 dd | cAAA A4 |\
+w:  Five were  blind and the   oth-er coul-dn't see,
+d2 d2  dcBA         | B2  G2 G4 |]
+w: oh   dear  moth-er, what a     fool I  be!
 P:B
+"G" B2 B2 BcdB | "C" c2 A2 "D7" A2 Bc |\
+"G" dedB "C" cdcA |  "G" B2 A2 G2 :|
+P:C
 gf | "C" e2 d2 "G" d2 GA | "G" B2 B2 B2 gf | "C" e2 d2 c2 B2 |\
 "D7" A2 G2 "G" G2 :|
--- a/Morris/RingOBells.abc	Mon Dec 02 22:36:06 2019 +0000
+++ b/Morris/RingOBells.abc	Mon Dec 02 22:36:37 2019 +0000
@@ -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 A2 G "C" A | "G" B2 "D" (3ABA | "G" G2 ||
+"G" dG "C" c2 | "G" B A 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 |