From 98f0d36349af18677161612febb13606b4a810b1 Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Mon, 9 Oct 2017 16:38:38 +0100 Subject: [PATCH 1/3] Morris tunes - name of dance as title, name of tune subtitle. --- Morris/{LongOdds.abc => Greenham.abc} | 2 +- ...landMary.abc => HighlandMaryHighlandMary.abc} | 0 ...Oxford.abc => HighlandMaryOldTomOfOxford.abc} | 2 +- Morris/ShaveTheDonkey.abc | 1 - Morris/StepNFetchHer.abc | 16 ++++++++++++++++ 5 files changed, 18 insertions(+), 3 deletions(-) rename Morris/{LongOdds.abc => Greenham.abc} (100%) rename Morris/{HighlandMary.abc => HighlandMaryHighlandMary.abc} (100%) rename Morris/{OldTomOfOxford.abc => HighlandMaryOldTomOfOxford.abc} (100%) create mode 100644 Morris/StepNFetchHer.abc diff --git a/Morris/LongOdds.abc b/Morris/Greenham.abc similarity index 100% rename from Morris/LongOdds.abc rename to Morris/Greenham.abc index 882f9af..619955d 100644 --- a/Morris/LongOdds.abc +++ b/Morris/Greenham.abc @@ -1,6 +1,6 @@ X: 1 -T: Long Odds T: Greenham +T: Long Odds M: 4/4 L: 1/8 Q: 120 diff --git a/Morris/HighlandMary.abc b/Morris/HighlandMaryHighlandMary.abc similarity index 100% rename from Morris/HighlandMary.abc rename to Morris/HighlandMaryHighlandMary.abc diff --git a/Morris/OldTomOfOxford.abc b/Morris/HighlandMaryOldTomOfOxford.abc similarity index 100% rename from Morris/OldTomOfOxford.abc rename to Morris/HighlandMaryOldTomOfOxford.abc index ccddbad..5e87fc5 100644 --- a/Morris/OldTomOfOxford.abc +++ b/Morris/HighlandMaryOldTomOfOxford.abc @@ -1,6 +1,6 @@ X: 1 -T: Old Tom of Oxford T: Highland Mary +T: Old Tom of Oxford A: Bampton M: C| L: 1/4 diff --git a/Morris/ShaveTheDonkey.abc b/Morris/ShaveTheDonkey.abc index 834af29..8d84985 100644 --- a/Morris/ShaveTheDonkey.abc +++ b/Morris/ShaveTheDonkey.abc @@ -1,6 +1,5 @@ X:1 T:Shave the Donkey -T:Step n' Fetch Her M:4/4 S:Bacon (RD) A:Bampton diff --git a/Morris/StepNFetchHer.abc b/Morris/StepNFetchHer.abc new file mode 100644 index 0000000..5ea1c15 --- /dev/null +++ b/Morris/StepNFetchHer.abc @@ -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 :| From 02b29f13f32859e488d7a2976ec1ccaa1866c0bf Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Mon, 9 Oct 2017 17:30:31 +0100 Subject: [PATCH 2/3] Add subtitle if present in tune links. --- abcfield.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/abcfield.py b/abcfield.py index 05d8c94..cb3db54 100755 --- a/abcfield.py +++ b/abcfield.py @@ -181,7 +181,12 @@ def expandCustomMarkdown(t, dir, latex): 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, From 38b27fd3dc6a82d1807a48ad6af84c2311d5f6a8 Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Mon, 9 Oct 2017 17:30:48 +0100 Subject: [PATCH 3/3] Try to regularise the outline Parts header. --- Morris/BalanceTheStraw.abc | 2 +- Morris/BeanSetting.abc | 2 +- Morris/BonnyGreen.abc | 2 +- Morris/ConstantBilly.abc | 2 +- Morris/CountryGardens.abc | 2 +- Morris/DogsOfWar.abc | 3 +++ Morris/GettingUpstairs.abc | 2 +- Morris/Greenham.abc | 7 +++++-- Morris/HasteToTheWedding.abc | 2 +- Morris/HighlandMaryHighlandMary.abc | 4 ++-- Morris/HighlandMaryOldTomOfOxford.abc | 8 ++++++-- Morris/HuntTheSquirrel.abc | 2 +- Morris/JennyLind.abc | 3 ++- Morris/LadsABunchum.abc | 2 +- Morris/LaudnumBunches.abc | 2 +- Morris/PostmansKnock.abc | 1 + Morris/RigsOfMarlow.abc | 2 +- Morris/ShaveTheDonkey.abc | 2 +- Morris/ShepherdsHey.abc | 2 +- Morris/Shooting.abc | 2 +- Morris/Sidesteps.abc | 7 +++++-- Morris/Skirmish.abc | 2 +- Morris/StepBack.abc | 2 +- Morris/SweetJennyJones.abc | 6 +++--- Morris/VandalsOfHammerwich.abc | 6 +++--- Morris/WilliamAndNancy.abc | 2 +- Morris/YoungCollins.abc | 12 ++++++++---- 27 files changed, 55 insertions(+), 36 deletions(-) diff --git a/Morris/BalanceTheStraw.abc b/Morris/BalanceTheStraw.abc index 91b20f5..b6dc575 100644 --- a/Morris/BalanceTheStraw.abc +++ b/Morris/BalanceTheStraw.abc @@ -4,7 +4,7 @@ A: Fieldtown 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 || diff --git a/Morris/BeanSetting.abc b/Morris/BeanSetting.abc index 26461b4..05e6b3f 100644 --- a/Morris/BeanSetting.abc +++ b/Morris/BeanSetting.abc @@ -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 diff --git a/Morris/BonnyGreen.abc b/Morris/BonnyGreen.abc index cac9b93..e8c5939 100644 --- a/Morris/BonnyGreen.abc +++ b/Morris/BonnyGreen.abc @@ -5,7 +5,7 @@ L:1/8 A:Bampton O:English R:Jig -P:A3BC +P:A3.B.C K:D Q:3/8=100 A2B2c2 |\ diff --git a/Morris/ConstantBilly.abc b/Morris/ConstantBilly.abc index 88ddd54..0e60d99 100644 --- a/Morris/ConstantBilly.abc +++ b/Morris/ConstantBilly.abc @@ -3,7 +3,7 @@ T: Constant Billy 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 :| diff --git a/Morris/CountryGardens.abc b/Morris/CountryGardens.abc index 2bae974..a944a2e 100644 --- a/Morris/CountryGardens.abc +++ b/Morris/CountryGardens.abc @@ -4,7 +4,7 @@ M: C 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 |\ diff --git a/Morris/DogsOfWar.abc b/Morris/DogsOfWar.abc index e9e8faf..876ebea 100644 --- a/Morris/DogsOfWar.abc +++ b/Morris/DogsOfWar.abc @@ -2,11 +2,14 @@ X: 1 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 |\ diff --git a/Morris/GettingUpstairs.abc b/Morris/GettingUpstairs.abc index 6e6000f..8bd2d4b 100644 --- a/Morris/GettingUpstairs.abc +++ b/Morris/GettingUpstairs.abc @@ -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 diff --git a/Morris/Greenham.abc b/Morris/Greenham.abc index 619955d..a963a41 100644 --- a/Morris/Greenham.abc +++ b/Morris/Greenham.abc @@ -1,12 +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 -"G" DGGA B2BG | "C" c2cA "D" BGFE| "G" DGGA BABd | "D" ecAF "G" G2G2 :| +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 :| +"Em" egfe e2dB | "C" cedc c2B2 | "Am" ABcA "G" Bcd2 | "D" ecAF "G" G2G2 |] diff --git a/Morris/HasteToTheWedding.abc b/Morris/HasteToTheWedding.abc index 9e814d4..e7ed47d 100644 --- a/Morris/HasteToTheWedding.abc +++ b/Morris/HasteToTheWedding.abc @@ -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 diff --git a/Morris/HighlandMaryHighlandMary.abc b/Morris/HighlandMaryHighlandMary.abc index c6ba839..5511fea 100644 --- a/Morris/HighlandMaryHighlandMary.abc +++ b/Morris/HighlandMaryHighlandMary.abc @@ -2,10 +2,10 @@ X:1 T:Highland Mary M:C A:Bampton -N: Dottes: We also dance Highland Mary to . +N: Dottes: We also dance Highland Mary to . L:1/8 Q:150 -P:A(AB2)4 +P:A.(A.B2)4 K:G P:A D2 | "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\ diff --git a/Morris/HighlandMaryOldTomOfOxford.abc b/Morris/HighlandMaryOldTomOfOxford.abc index 5e87fc5..722cad7 100644 --- a/Morris/HighlandMaryOldTomOfOxford.abc +++ b/Morris/HighlandMaryOldTomOfOxford.abc @@ -2,10 +2,14 @@ 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 . 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 :| + "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 :| + "G" B d B c | "D" d e/f/ "G" g d | "G" g d c B | "D" A B/A/ "G" G |] diff --git a/Morris/HuntTheSquirrel.abc b/Morris/HuntTheSquirrel.abc index a191acb..3e3c8b3 100644 --- a/Morris/HuntTheSquirrel.abc +++ b/Morris/HuntTheSquirrel.abc @@ -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 diff --git a/Morris/JennyLind.abc b/Morris/JennyLind.abc index 5279a49..edbeb67 100644 --- a/Morris/JennyLind.abc +++ b/Morris/JennyLind.abc @@ -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 |\ diff --git a/Morris/LadsABunchum.abc b/Morris/LadsABunchum.abc index 9d8ee8d..2915ab1 100644 --- a/Morris/LadsABunchum.abc +++ b/Morris/LadsABunchum.abc @@ -5,7 +5,7 @@ S:Seabright \& Bruno A:Adderbury O:English R:Reel -P:A.(AB)6B +P:A.(AB)6.B K:G I:speed 400 P:A diff --git a/Morris/LaudnumBunches.abc b/Morris/LaudnumBunches.abc index 89ec287..080d9ef 100644 --- a/Morris/LaudnumBunches.abc +++ b/Morris/LaudnumBunches.abc @@ -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 diff --git a/Morris/PostmansKnock.abc b/Morris/PostmansKnock.abc index 4dc7f29..c9df7bf 100644 --- a/Morris/PostmansKnock.abc +++ b/Morris/PostmansKnock.abc @@ -2,6 +2,7 @@ X:1 T:Postman's Knock, The M:6/8 S:Bacon (RD ex Blunt MSS) +P:B.A6.B A:Adderbury O:English R:Jig diff --git a/Morris/RigsOfMarlow.abc b/Morris/RigsOfMarlow.abc index 2e036d8..8c44cac 100644 --- a/Morris/RigsOfMarlow.abc +++ b/Morris/RigsOfMarlow.abc @@ -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 diff --git a/Morris/ShaveTheDonkey.abc b/Morris/ShaveTheDonkey.abc index 8d84985..ed94c0a 100644 --- a/Morris/ShaveTheDonkey.abc +++ b/Morris/ShaveTheDonkey.abc @@ -5,7 +5,7 @@ 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 diff --git a/Morris/ShepherdsHey.abc b/Morris/ShepherdsHey.abc index e055335..123bb43 100644 --- a/Morris/ShepherdsHey.abc +++ b/Morris/ShepherdsHey.abc @@ -5,7 +5,7 @@ M: 4/4 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 || diff --git a/Morris/Shooting.abc b/Morris/Shooting.abc index 4675779..70f3f27 100644 --- a/Morris/Shooting.abc +++ b/Morris/Shooting.abc @@ -4,7 +4,7 @@ T: Beaux of London City 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
"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 |\ diff --git a/Morris/Skirmish.abc b/Morris/Skirmish.abc index 29cd562..029dce9 100644 --- a/Morris/Skirmish.abc +++ b/Morris/Skirmish.abc @@ -4,7 +4,7 @@ T:British Grenadiers 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 diff --git a/Morris/StepBack.abc b/Morris/StepBack.abc index ccd8208..2f77e1c 100644 --- a/Morris/StepBack.abc +++ b/Morris/StepBack.abc @@ -3,7 +3,7 @@ T: Step Back 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 | diff --git a/Morris/SweetJennyJones.abc b/Morris/SweetJennyJones.abc index a549183..043b2b7 100644 --- a/Morris/SweetJennyJones.abc +++ b/Morris/SweetJennyJones.abc @@ -4,9 +4,9 @@ M: 3/4 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 diff --git a/Morris/VandalsOfHammerwich.abc b/Morris/VandalsOfHammerwich.abc index 0a553e3..327a491 100644 --- a/Morris/VandalsOfHammerwich.abc +++ b/Morris/VandalsOfHammerwich.abc @@ -4,12 +4,12 @@ M:4/4 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 |\ diff --git a/Morris/WilliamAndNancy.abc b/Morris/WilliamAndNancy.abc index 8359b11..d5af838 100644 --- a/Morris/WilliamAndNancy.abc +++ b/Morris/WilliamAndNancy.abc @@ -6,7 +6,7 @@ B:Sussex Tune Book 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:| diff --git a/Morris/YoungCollins.abc b/Morris/YoungCollins.abc index 565d952..aca2dba 100644 --- a/Morris/YoungCollins.abc +++ b/Morris/YoungCollins.abc @@ -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 |]