CryHavoc
/
dottes
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.cryhavoc.org.uk/dottes

This commit is contained in:
Jim Hague 2017-10-09 17:30:56 +01:00
parent e83ad3e0e3 38b27fd3dc
commit 3befbfba06
29 changed files with 79 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Morris/BalanceTheStraw.abc
View File

@ -4,7 +4,7 @@ A: Fieldtown
M: 6/8 M: 6/8
L: 1/8 L: 1/8
Q: 130 Q: 130
P: (AABB)4 P: (A2.B2)4
K: G K: G
P: A P: A
D | "G" G2 B BAB | "C" c2 A ABc | "D7" ded cBA | "G" B2 A G3 || D | "G" G2 B BAB | "C" c2 A ABc | "D7" ded cBA | "G" B2 A G3 ||

2
Morris/BeanSetting.abc
View File

@ -1,7 +1,7 @@
X: 1 X: 1
T: Bean Setting T: Bean Setting
A: Headington A: Headington
P: A(AB2)4 P: A.(A.B2)4
Q: 1/2=80 Q: 1/2=80
M: 4/4 M: 4/4
L: 1/8 L: 1/8

2
Morris/BonnyGreen.abc
View File

@ -5,7 +5,7 @@ L:1/8
A:Bampton A:Bampton
O:English O:English
R:Jig R:Jig
P:A3BC P:A3.B.C
K:D K:D
Q:3/8=100 Q:3/8=100
A2B2c2 |\ A2B2c2 |\

2
Morris/ConstantBilly.abc
View File

@ -3,7 +3,7 @@ T: Constant Billy
A: Headington A: Headington
M: 6/8 M: 6/8
L: 1/8 L: 1/8
P: A(AB)4 P: A.(A.B)4
K: G K: G
P: A P: A
D | "G" GBd B2 B | "D7" cBc A2 A | "G" BAG "C" EFG | "D7" DEF "G" G2 :| D | "G" GBd B2 B | "D7" cBc A2 A | "G" BAG "C" EFG | "D7" DEF "G" G2 :|

2
Morris/CountryGardens.abc
View File

@ -4,7 +4,7 @@ M: C
A: Fieldtown A: Fieldtown
L: 1/8 L: 1/8
Q: 1/4=150 Q: 1/4=150
P: A(A2(BA)2)4 P: A.(A2.(BA)2)4
K: G K: G
P: A P: A
"G7" g2 g>f "C" e2 e2 | "D7" d2 d>c "G" B2 B>c | "G" d2 G2 "C" A2 c2 |\ "G7" g2 g>f "C" e2 e2 | "D7" d2 d>c "G" B2 B>c | "G" d2 G2 "C" A2 c2 |\

3
Morris/DogsOfWar.abc
View File

@ -2,11 +2,14 @@ X: 1
T: Dogs of War T: Dogs of War
C: Paul Ferrett C: Paul Ferrett
A: Botley A: Botley
P: A.(A.B)4
M: C M: C
L: 1/8 L: 1/8
K: G K: G
P: A
D |: "Em" E2>G2 "D" FEDF | "Em" G2 z2 "D" A4 |\ D |: "Em" E2>G2 "D" FEDF | "Em" G2 z2 "D" A4 |\
"Em" GF E2 "D" DEFA | "Em" G2 E2 E2 D2 :| "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 "D" EFGA |\
"G" B2 GB "D" A2 FA | "G" GFED "Em" E4 | "G" B2 GB "D" A2 FA | "G" GFED "Em" E4 |
"G" B2 GB "D" A2 FA | "Em" G2 z2 "D" A4 |\ "G" B2 GB "D" A2 FA | "Em" G2 z2 "D" A4 |\

2
Morris/GettingUpstairs.abc
View File

@ -1,7 +1,7 @@
X:1 X:1
T: Getting Upstairs T: Getting Upstairs
A: Headington A: Headington
P: A(A2B)4 P: A.(A2.B)4
Q: 1/4=168 Q: 1/4=168
M: 4/4 M: 4/4
L: 1/4 L: 1/4

9
Morris/LongOdds.abc → Morris/Greenham.abc
View File

@ -1,12 +1,15 @@
X: 1 X: 1
T: Long Odds
T: Greenham T: Greenham
T: Long Odds
P: (TBC)
M: 4/4 M: 4/4
L: 1/8 L: 1/8
Q: 120 Q: 120
R: hornpipe R: hornpipe
B: Thomas Preston "Twenty-Four Country Dances of the Year" 1791 B: Thomas Preston "Twenty-Four Country Dances of the Year" 1791
K: G 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" 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 |]

2
Morris/HasteToTheWedding.abc
View File

@ -1,7 +1,7 @@
X: 1 X: 1
T: Haste to the Wedding T: Haste to the Wedding
A: Headington A: Headington
P: A(AB2)4 P: A.(A.B2)4
Q: 3/8=92 Q: 3/8=92
M: 6/8 M: 6/8
L: 1/8 L: 1/8

4
Morris/HighlandMary.abc → Morris/HighlandMaryHighlandMary.abc
View File

@ -2,10 +2,10 @@ X:1
T:Highland Mary T:Highland Mary
M:C M:C
A:Bampton A:Bampton
N: Dottes: We also dance Highland Mary to <OldTomOfOxford.abc>. N: Dottes: We also dance Highland Mary to <HighlandMaryOldTomOfOxford.abc>.
L:1/8 L:1/8
Q:150 Q:150
P:A(AB2)4 P:A.(A.B2)4
K:G K:G
P:A P:A
D2 | "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\ D2 | "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\

10
Morris/OldTomOfOxford.abc → Morris/HighlandMaryOldTomOfOxford.abc
View File

@ -1,11 +1,15 @@
X: 1 X: 1
T: Old Tom of Oxford
T: Highland Mary T: Highland Mary
T: Old Tom of Oxford
A: Bampton A: Bampton
P:A.(A.B2)4
N: Dottes: We also dance Highland Mary to <HighlandMaryHighlandMary.abc>.
M: C| M: C|
L: 1/4 L: 1/4
K: Gmaj 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/ | 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/ | 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 |]

2
Morris/HuntTheSquirrel.abc
View File

@ -1,7 +1,7 @@
X: 1 X: 1
T: Hunt the Squirrel T: Hunt the Squirrel
A: Headington A: Headington
P: A(AB)4 P: A.(AB)4
Q: 1/4=160 Q: 1/4=160
M: 4/4 M: 4/4
L: 1/4 L: 1/4

3
Morris/JennyLind.abc
View File

@ -1,12 +1,13 @@
X: 1 X: 1
T: Jenny Lind T: Jenny Lind
P: (AB)4
M: C M: C
K: D K: D
L: 1/4 L: 1/4
P: A P: A
"D" F A "G" G B | "D" A f f/e/ f | "A7" G e e/d/ e |\ "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" 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 K: G
P: B P: B
"C" g f e/g/f/e/ | "G" d B B/A/ B | "D7" c A A/G/ A |\ "C" g f e/g/f/e/ | "G" d B B/A/ B | "D7" c A A/G/ A |\

2
Morris/LadsABunchum.abc
View File

@ -5,7 +5,7 @@ S:Seabright \& Bruno
A:Adderbury A:Adderbury
O:English O:English
R:Reel R:Reel
P:A.(AB)6B P:A.(AB)6.B
K:G K:G
I:speed 400 I:speed 400
P:A P:A

2
Morris/LaudnumBunches.abc
View File

@ -1,7 +1,7 @@
X:1 X:1
T: Laudnum Bunches T: Laudnum Bunches
A: Headington A: Headington
P: A(AB3)2(AC3)2 P: A.(A.B3)2.(A.C3)2
Q: 3/8=88 Q: 3/8=88
M: 6/8 M: 6/8
L: 1/8 L: 1/8

1
Morris/PostmansKnock.abc
View File

@ -2,6 +2,7 @@ X:1
T:Postman's Knock, The T:Postman's Knock, The
M:6/8 M:6/8
S:Bacon (RD ex Blunt MSS) S:Bacon (RD ex Blunt MSS)
P:B.A6.B
A:Adderbury A:Adderbury
O:English O:English
R:Jig R:Jig

2
Morris/RigsOfMarlow.abc
View File

@ -1,7 +1,7 @@
X: 1 X: 1
T: Rigs of Marlow T: Rigs of Marlow
A: Headington A: Headington
P: A(AB)4 P: A.(AB)4
Q: 1/4=144 Q: 1/4=144
M: 4/4 M: 4/4
L: 1/4 L: 1/4

3
Morris/ShaveTheDonkey.abc
View File

@ -1,12 +1,11 @@
X:1 X:1
T:Shave the Donkey T:Shave the Donkey
T:Step n' Fetch Her
M:4/4 M:4/4
S:Bacon (RD) S:Bacon (RD)
A:Bampton A:Bampton
O:English O:English
R:Reel R:Reel
P:A.(AB3)3.A P:A.(A.B3)3.A
K:G K:G
I:speed 300 I:speed 300
P:A P:A

2
Morris/ShepherdsHey.abc
View File

@ -5,7 +5,7 @@ M: 4/4
L: 1/8 L: 1/8
Q: 130 Q: 130
R: reel R: reel
P: (A2B2)6 P: (A2.B2)6
K: Gmaj K: Gmaj
P: A P: A
"G" BcdB "C" c2c2 | "G" BcdB "D7" A2A2 | "G" BcdB "C" c2Bc | "D7" d2d2 "G" G4 || "G" BcdB "C" c2c2 | "G" BcdB "D7" A2A2 | "G" BcdB "C" c2Bc | "D7" d2d2 "G" G4 ||

2
Morris/Shooting.abc
View File

@ -4,7 +4,7 @@ T: Beaux of London City
A: Adderbury A: Adderbury
M: 9/8 M: 9/8
L: 1/8 L: 1/8
P: 6(2A.3B) P: (2A.3B)6
K: G K: G
P: A P: A
D | "G" G2 G BAG B<dD | GDG B2 "D" A A2 D |\ D | "G" G2 G BAG B<dD | GDG B2 "D" A A2 D |\

7
Morris/Sidesteps.abc
View File

@ -1,12 +1,15 @@
X: 1 X: 1
T: Side Steps T: Side Steps
C: Paul Ferrett C: Paul Ferrett
P: A.(AB)4
M: C M: C
K:G K:G
L: 1/8 L: 1/8
P: A
D2 \ D2 \
|: "Em" E2>"D"G2 FE D2 | "Em" EFGG "D" FE D2 | "Em" EFGB "D" A2 "A" G2 |\ "Em" E2>"D"G2 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 D2 ||
P: B
|: "G" d2 de d2 B2 | "D" ABcA "G" B2 G2 | dedB "D" c2 A2 |\ |: "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 | "C" A2 c2 "D" B2 G2 | "G" dedB "D" c2 A2 |
"D" ABcA "G" B2 G2 | "D" ABcA "G" B2 "D" A2 |\ "D" ABcA "G" B2 G2 | "D" ABcA "G" B2 "D" A2 |\

2
Morris/Skirmish.abc
View File

@ -4,7 +4,7 @@ T:British Grenadiers
A:Bledington A:Bledington
R:March R:March
O:England O:England
P:A(AB2)3 P:A.(A.B2)3
M:4/4 M:4/4
L:1/4 L:1/4
Q:1/4=160 Q:1/4=160

2
Morris/StepBack.abc
View File

@ -3,7 +3,7 @@ T: Step Back
A: Fieldtown A: Fieldtown
M: C M: C
L: 1/4 L: 1/4
P: 3(2A.2B).2A P: (A2.B2)3.A2
K: G K: G
P: A 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/ a b | "C" a g/f/ e/f/ g | "D7" f d "C" e c | "G" d d/c/ B/c/ d |

16
Morris/StepNFetchHer.abc Normal file
View File

@ -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 :|

6
Morris/SweetJennyJones.abc
View File

@ -4,9 +4,9 @@ M: 3/4
S: Seabright S: Seabright
A: Adderbury A: Adderbury
O: English O: English
P:A(AB)6.A P: A.(AB)6.A
K:D K: D
I:speed 450 I: speed 450
P:A P:A
A2 | "D" d2 A2 F2 | "D" D3 E F2 | "Em" G2 B2 e2 | "A7" c2 A2 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 w: My sweet Jen- ny Jones she's the pride of Lan-gol-len

6
Morris/VandalsOfHammerwich.abc
View File

@ -4,12 +4,12 @@ M:4/4
A:Lichfield A:Lichfield
O:English O:English
R:Reel R:Reel
P:(AB)4A2B P:A.(AB)4
K:G K:G
I:speed 600 Q:150
P:A 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>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 P:B
|: "G" d4 d2>e2| "G" d2 d2 d4 | "C" e2 g2 f2 e2 | "G" e2 d2 d2 de | |: "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 |\ "C" d2 c2 c2 cd | "G" c2 B2 B2 Bc | "D7" d2 c2 A2 F2 |\

2
Morris/WilliamAndNancy.abc
View File

@ -6,7 +6,7 @@ B:Sussex Tune Book
D:Morris On D:Morris On
F:http://richardrobinson.tunebook.org.uk/tune/6547 F:http://richardrobinson.tunebook.org.uk/tune/6547
M:6/8 M:6/8
P:(AB)2(AC)2A P:(AB)2.(AC)2.A
K:G K:G
P:A P:A
D|"G"G2G GBd|"C"e2e "G"dBG|"D7"A2d "G"BAG|"C"E2"D7"F "G"G2:| D|"G"G2G GBd|"C"e2e "G"dBG|"D7"A2d "G"BAG|"C"E2"D7"F "G"G2:|

12
Morris/YoungCollins.abc
View File

@ -1,13 +1,17 @@
X: 1 X: 1
T: Young Collins T: Young Collins
A: Bledington A: Bledington
P: A.(A2.B2)4
M: C M: C
K: G K: G
L: 1/8 L: 1/8
Q: 150
D2 \ D2 \
|: "G" GABc d2 d2 | "C" c2 e2 "D7" A2 Bc | "G" d2 d2 "C" e2 dc |\ P: A
"D7" B2 A2 "G" G2 D2 :| "G" GABc d2 d2 | "C" c2 e2 "D7" A2 Bc | "G" d2 d2 "C" e2 dc |\
|: "C" E2 D2 EF G2 | "D7" A2 A2 "G" G2>A2 | "G" B2 G2 Bc d2 |\ "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 | "C" e2 e2 "D7" d4 |
"G" GABc d2 d2 | "C" c2 e2 "D7" A2 Bc | "G" d2 d2 "C" e2 dc |\ "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 |]

7
abcfield.py
View File

@ -181,7 +181,12 @@ def expandCustomMarkdown(t, dir, latex):
fname = m.group(1) + ".abc" fname = m.group(1) + ".abc"
path = pathlib.Path(dir, fname) path = pathlib.Path(dir, fname)
with path.open() as f: 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 re.sub(r'<(.*?).abc>', getTitle, t)
# Return the raw text for a given field. Optionally the nth field is taken, # Return the raw text for a given field. Optionally the nth field is taken,