Mercurial > dottes

changeset 718:003b5eddeead

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, 09 Oct 2017 17:30:56 +0100
parents 464faab3c136 (current diff) bb8617ae4042 (diff)
children 072e66f55ed6
files Morris/HighlandMary.abc Morris/LongOdds.abc Morris/OldTomOfOxford.abc
diffstat 32 files changed, 113 insertions(+), 74 deletions(-) [+]
line wrap: on
line diff
--- a/Morris/BalanceTheStraw.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/BalanceTheStraw.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -4,7 +4,7 @@
 M: 6/8
 L: 1/8
 Q: 130
-P: (AABB)4
+P: (A2.B2)4
 K: G
 P: A
 D | "G" G2 B BAB | "C" c2 A ABc | "D7" ded cBA | "G" B2 A G3  ||
--- a/Morris/BeanSetting.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/BeanSetting.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -1,7 +1,7 @@
 X: 1
 T: Bean Setting
 A: Headington
-P: A(AB2)4
+P: A.(A.B2)4
 Q: 1/2=80
 M: 4/4
 L: 1/8
--- a/Morris/BonnyGreen.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/BonnyGreen.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -5,7 +5,7 @@
 A:Bampton
 O:English
 R:Jig
-P:A3BC
+P:A3.B.C
 K:D
 Q:3/8=100
 A2B2c2 |\
--- a/Morris/ConstantBilly.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/ConstantBilly.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -3,7 +3,7 @@
 A: Headington
 M: 6/8
 L: 1/8
-P: A(AB)4
+P: A.(A.B)4
 K: G
 P: A
 D | "G" GBd B2 B | "D7" cBc A2 A | "G" BAG "C" EFG | "D7" DEF "G" G2 :|
--- a/Morris/CountryGardens.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/CountryGardens.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -4,7 +4,7 @@
 A: Fieldtown
 L: 1/8
 Q: 1/4=150
-P: A(A2(BA)2)4
+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 |\
--- a/Morris/DogsOfWar.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/DogsOfWar.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -2,11 +2,14 @@
 T: Dogs of War
 C: Paul Ferrett
 A: Botley
+P: A.(A.B)4
 M: C
 L: 1/8
 K: G
+P: A
 D |: "Em" E2>G2 "D" FEDF | "Em" G2 z2 "D" A4 |\
      "Em" GF E2 "D" DEFA | "Em" G2 E2 E2 D2 :|
+P: B
 |: "G" B2 GB "D" A2 FA | "G" GFED "D" EFGA |\
     "G" B2 GB "D" A2 FA | "G" GFED "Em" E4 |
     "G" B2 GB "D" A2 FA | "Em" G2 z2 "D" A4 |\
--- a/Morris/GettingUpstairs.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/GettingUpstairs.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -1,7 +1,7 @@
 X:1
 T: Getting Upstairs
 A: Headington
-P: A(A2B)4
+P: A.(A2.B)4
 Q: 1/4=168
 M: 4/4
 L: 1/4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Morris/Greenham.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -0,0 +1,15 @@
+X: 1
+T: Greenham
+T: Long Odds
+P: (TBC)
+M: 4/4
+L: 1/8
+Q: 120
+R: hornpipe
+B: Thomas Preston "Twenty-Four Country Dances of the Year" 1791
+K: G
+P: A
+"G" DGGA B2BG | "C" c2cA "D" BGFE| "G" DGGA BABd | "D" ecAF "G" G2G2 ||
+P: B
+"Em" egfe e2dB | "C" cedc c2B2 | "Am" ABcA "G" Bcd2 | "D" ecAG "G" GFED  |
+"Em" egfe e2dB | "C" cedc c2B2 | "Am" ABcA "G" Bcd2 | "D" ecAF "G" G2G2 |]
--- a/Morris/HasteToTheWedding.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/HasteToTheWedding.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -1,7 +1,7 @@
 X: 1
 T: Haste to the Wedding
 A: Headington
-P: A(AB2)4
+P: A.(A.B2)4
 Q: 3/8=92
 M: 6/8
 L: 1/8
--- a/Morris/HighlandMary.abc	Sun Oct 08 21:37:57 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-X:1
-T:Highland Mary
-M:C
-A:Bampton
-N: Dottes: We also dance Highland Mary to <OldTomOfOxford.abc>.
-L:1/8
-Q:150
-P:A(AB2)4
-K:G
-P:A
-D2 | "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\
-     "G" d2 de "D7" dcBA | "G" GABG "D7" D2 D2 |
-     "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\
-     "G" d2 de "D7" dcBA | "G" G2 "D7" F2 "G" G2 D2 ||
-P:B
-   "G" GABc "D7" d2 d2 | "C" ed cB "D7" c2 Bc |\
-   "G" d2 de "D7" dcBA | "G" GABG "D7" D2 D2 |
-   "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\
-   "G" d2 de "D7" dcBA | "G" G2 "D7" F2 "G" G4 ||
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Morris/HighlandMaryHighlandMary.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -0,0 +1,19 @@
+X:1
+T:Highland Mary
+M:C
+A:Bampton
+N: Dottes: We also dance Highland Mary to <HighlandMaryOldTomOfOxford.abc>.
+L:1/8
+Q:150
+P:A.(A.B2)4
+K:G
+P:A
+D2 | "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\
+     "G" d2 de "D7" dcBA | "G" GABG "D7" D2 D2 |
+     "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\
+     "G" d2 de "D7" dcBA | "G" G2 "D7" F2 "G" G2 D2 ||
+P:B
+   "G" GABc "D7" d2 d2 | "C" ed cB "D7" c2 Bc |\
+   "G" d2 de "D7" dcBA | "G" GABG "D7" D2 D2 |
+   "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\
+   "G" d2 de "D7" dcBA | "G" G2 "D7" F2 "G" G4 ||
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Morris/HighlandMaryOldTomOfOxford.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -0,0 +1,15 @@
+X: 1
+T: Highland Mary
+T: Old Tom of Oxford
+A: Bampton
+P:A.(A.B2)4
+N: Dottes: We also dance Highland Mary to <HighlandMaryHighlandMary.abc>.
+M: C|
+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 ||
+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 |]
--- a/Morris/HuntTheSquirrel.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/HuntTheSquirrel.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -1,7 +1,7 @@
 X: 1
 T: Hunt the Squirrel
 A: Headington
-P: A(AB)4
+P: A.(AB)4
 Q: 1/4=160
 M: 4/4
 L: 1/4
--- a/Morris/JennyLind.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/JennyLind.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -1,12 +1,13 @@
 X: 1
 T: Jenny Lind
+P: (AB)4
 M: C
 K: D
 L: 1/4
 P: A
 "D" F A "G" G B | "D" A f f/e/ f | "A7" G e e/d/ e |\
 "D" F A d A/G/ | "D" F A "G" G B |
-"D" A f f/e/ f | "A7" g c c/g/f/e/ | [1 "D" d3 A/G/ :| [2 "D" d3 ef |
+"D" A f f/e/ f | "A7" g c c/g/f/e/ | [1 "D" d3 A/G/ :| [2 "D" d3 ef ||
 K: G
 P: B
 "C" g f e/g/f/e/ | "G" d B B/A/ B | "D7" c A A/G/ A |\
--- a/Morris/LadsABunchum.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/LadsABunchum.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -5,7 +5,7 @@
 A:Adderbury
 O:English
 R:Reel
-P:A.(AB)6B
+P:A.(AB)6.B
 K:G
 I:speed 400
 P:A
--- a/Morris/LaudnumBunches.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/LaudnumBunches.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -1,7 +1,7 @@
 X:1
 T: Laudnum Bunches
 A: Headington
-P: A(AB3)2(AC3)2
+P: A.(A.B3)2.(A.C3)2
 Q: 3/8=88
 M: 6/8
 L: 1/8
--- a/Morris/LongOdds.abc	Sun Oct 08 21:37:57 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-X: 1
-T: Long Odds
-T: Greenham
-M: 4/4
-L: 1/8
-Q: 120
-R: hornpipe
-B: Thomas Preston "Twenty-Four Country Dances of the Year" 1791
-K: G
-"G" DGGA B2BG | "C" c2cA "D" BGFE| "G" DGGA BABd | "D" ecAF "G" G2G2 :|
-"Em" egfe e2dB | "C" cedc c2B2 | "Am" ABcA "G" Bcd2 | "D" ecAG "G" GFED  |
-"Em" egfe e2dB | "C" cedc c2B2 | "Am" ABcA "G" Bcd2 | "D" ecAF "G" G2G2 :|
--- a/Morris/OldTomOfOxford.abc	Sun Oct 08 21:37:57 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-X: 1
-T: Old Tom of Oxford
-T: Highland Mary
-A: Bampton
-M: C|
-L: 1/4
-K: Gmaj
-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 :|
-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 :|
--- a/Morris/PostmansKnock.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/PostmansKnock.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -2,6 +2,7 @@
 T:Postman's Knock, The
 M:6/8
 S:Bacon (RD ex Blunt MSS)
+P:B.A6.B
 A:Adderbury
 O:English
 R:Jig
--- a/Morris/RigsOfMarlow.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/RigsOfMarlow.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -1,7 +1,7 @@
 X: 1
 T: Rigs of Marlow
 A: Headington
-P: A(AB)4
+P: A.(AB)4
 Q: 1/4=144
 M: 4/4
 L: 1/4
--- a/Morris/ShaveTheDonkey.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/ShaveTheDonkey.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -1,12 +1,11 @@
 X:1
 T:Shave the Donkey
-T:Step n' Fetch Her
 M:4/4
 S:Bacon (RD)
 A:Bampton
 O:English
 R:Reel
-P:A.(AB3)3.A
+P:A.(A.B3)3.A
 K:G
 I:speed 300
 P:A
--- a/Morris/ShepherdsHey.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/ShepherdsHey.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -5,7 +5,7 @@
 L: 1/8
 Q: 130
 R: reel
-P: (A2B2)6
+P: (A2.B2)6
 K: Gmaj
 P: A
 "G" BcdB "C" c2c2 | "G" BcdB "D7" A2A2 | "G" BcdB "C" c2Bc | "D7" d2d2 "G" G4 ||
--- a/Morris/Shooting.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/Shooting.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -4,7 +4,7 @@
 A: Adderbury
 M: 9/8
 L: 1/8
-P: 6(2A.3B)
+P: (2A.3B)6
 K: G
 P: A
 D | "G" G2 G BAG B<dD | GDG B2 "D" A A2 D |\
--- a/Morris/Sidesteps.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/Sidesteps.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -1,12 +1,15 @@
 X: 1
 T: Side Steps
 C: Paul Ferrett
+P: A.(AB)4
 M: C
 K:G
 L: 1/8
+P: A
 D2 \
-|: "Em" E2>"D"G2 FE D2 | "Em" EFGG "D" FE D2 | "Em" EFGB "D" A2 "A" G2 |\
-"D" F2 "A" (3EFE "D" D2 D2 :|
+"Em" E2>"D"G2 FE D2 | "Em" EFGG "D" FE D2 | "Em" EFGB "D" A2 "A" G2 |\
+"D" F2 "A" (3EFE "D" D2 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 |
 "D" ABcA "G" B2 G2 | "D" ABcA "G" B2 "D" A2 |\
--- a/Morris/Skirmish.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/Skirmish.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -4,7 +4,7 @@
 A:Bledington
 R:March
 O:England
-P:A(AB2)3
+P:A.(A.B2)3
 M:4/4
 L:1/4
 Q:1/4=160
--- a/Morris/StepBack.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/StepBack.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -3,7 +3,7 @@
 A: Fieldtown
 M: C
 L: 1/4
-P: 3(2A.2B).2A
+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 |
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Morris/StepNFetchHer.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -0,0 +1,16 @@
+X:1
+T:Step n' Fetch Her
+M:4/4
+S:Bacon (RD)
+A:Bampton
+O:English
+R:Reel
+P:A.(AB3)3.A
+K:G
+I:speed 300
+P:A
+"G" d2 B2 "D7" dcBA | "G" G2 g2 "C" e2 g2 |\
+"G" d2 B2 "D7" dcBA | "G" G2 B2 G4 :|
+P:B
+"D7" A3 c "G" B2 d2 | "D7" A3 c "G"  B2 d2 |\
+"D7" A3 c "C" B2 de | "D7" dcBA  "G" G4 :|
--- a/Morris/SweetJennyJones.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/SweetJennyJones.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -4,9 +4,9 @@
 S: Seabright
 A: Adderbury
 O: English
-P:A(AB)6.A
-K:D
-I:speed 450
+P: A.(AB)6.A
+K: D
+I: speed 450
 P:A
    A2 | "D" d2 A2 F2 | "D" D3 E  F2 | "Em" G2 B2 e2 | "A7" c2  A2
 w: My   sweet Jen- ny   Jones she's the  pride of Lan-gol-len
--- a/Morris/VandalsOfHammerwich.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/VandalsOfHammerwich.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -4,12 +4,12 @@
 A:Lichfield
 O:English
 R:Reel
-P:(AB)4A2B
+P:A.(AB)4
 K:G
-I:speed 600
+Q:150
 P:A
 "G" D2 G2 B2 G2 | "G" D2 G2 B2 G2 | "D7" d2>e2 d2>e2  | "D7" d2 cB A2 FE |
-"G" D2 G2 B2 G2 | "G" D2 G2 B2 G2 | "D7" d2 cB A2 F2 | "G" G4 B2 c2 |
+"G" D2 G2 B2 G2 | "G" D2 G2 B2 G2 | "D7" d2 cB A2 F2 | "G" G4 B2 c2 ||
 P:B
 |: "G" d4 d2>e2| "G" d2 d2 d4 | "C" e2 g2 f2 e2 | "G" e2 d2 d2 de |
    "C" d2 c2 c2 cd | "G" c2 B2 B2 Bc | "D7" d2 c2 A2 F2 |\
--- a/Morris/WilliamAndNancy.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/WilliamAndNancy.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -6,7 +6,7 @@
 D:Morris On
 F:http://richardrobinson.tunebook.org.uk/tune/6547
 M:6/8
-P:(AB)2(AC)2A
+P:(AB)2.(AC)2.A
 K:G
 P:A
 D|"G"G2G GBd|"C"e2e "G"dBG|"D7"A2d "G"BAG|"C"E2"D7"F "G"G2:|
--- a/Morris/YoungCollins.abc	Sun Oct 08 21:37:57 2017 +0100
+++ b/Morris/YoungCollins.abc	Mon Oct 09 17:30:56 2017 +0100
@@ -1,13 +1,17 @@
 X: 1
 T: Young Collins
 A: Bledington
+P: A.(A2.B2)4
 M: C
 K: G
 L: 1/8
+Q: 150
 D2 \
-|: "G" GABc d2 d2 | "C" c2 e2 "D7" A2 Bc | "G" d2 d2 "C" e2 dc |\
-"D7" B2 A2 "G" G2 D2 :|
-|: "C" E2 D2 EF G2 | "D7" A2 A2 "G" G2>A2 | "G" B2 G2 Bc d2 |\
+P: A
+"G" GABc d2 d2 | "C" c2 e2 "D7" A2 Bc | "G" d2 d2 "C" e2 dc |\
+"D7" B2 A2 "G" G2 D2 ||
+P: B
+"C" E2 D2 EF G2 | "D7" A2 A2 "G" G2>A2 | "G" B2 G2 Bc d2 |\
 "C" e2 e2 "D7" d4 |
 "G" GABc d2 d2 | "C" c2 e2 "D7" A2 Bc | "G" d2 d2 "C" e2 dc |\
-"D7" B2 A2 "G" G4 :|
+"D7" B2 A2 "G" G4 |]
--- a/abcfield.py	Sun Oct 08 21:37:57 2017 +0100
+++ b/abcfield.py	Mon Oct 09 17:30:56 2017 +0100
@@ -181,7 +181,12 @@
         fname = m.group(1) + ".abc"
         path = pathlib.Path(dir, fname)
         with path.open() as f:
-            return "[" + getFieldDisplayText(f, dir, "T", latex) + "](" + fname + ")"
+            title = getFieldDisplayText(f, dir, "T", latex=latex)
+            f.seek(0)
+            subtitle = getFieldDisplayText(f, dir, "T", n=2, latex=latex)
+            if len(subtitle) > 0:
+                title = title + " (" + subtitle + ")"
+            return "[" + title + "](" + fname + ")"
     return re.sub(r'<(.*?).abc>', getTitle, t)
 
 # Return the raw text for a given field. Optionally the nth field is taken,