diff --git a/Morris/Skirmish.abc b/Morris/Skirmish.abc index 82f607e..29cd562 100644 --- a/Morris/Skirmish.abc +++ b/Morris/Skirmish.abc @@ -4,11 +4,14 @@ T:British Grenadiers A:Bledington R:March O:England +P:A(AB2)3 M:4/4 L:1/4 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|\ "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/|\ "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|] diff --git a/Morris/WilliamAndNancy.abc b/Morris/WilliamAndNancy.abc index c73da65..8359b11 100644 --- a/Morris/WilliamAndNancy.abc +++ b/Morris/WilliamAndNancy.abc @@ -13,11 +13,10 @@ D|"G"G2G GBd|"C"e2e "G"dBG|"D7"A2d "G"BAG|"C"E2"D7"F "G"G2:| P:B d|"G"e2d B2d|"C"gfe "G"d2d| "G"e2d B2d|"C"gfe "D7"d2c|\ "G"B2B Bcd|"C"e2e "G"dBG|"D7"A2d "G"BAG|"C"E2"D7"F "G"G2:| -T:Slows M:4/4 L:1/4 P:C -"G"d2|"C"e2 "G"d2|B2 d2|"Em"gf "A7"e2|"D7"d2 "G"d2|"C"e2 "G"d2|\ +"^Slows" "G"d2|"C"e2 "G"d2|B2 d2|"Em"gf "A7"e2|"D7"d2 "G"d2|"C"e2 "G"d2|\ M:3/8 L:1/8 "G"B2d|\ diff --git a/abctemplate.py b/abctemplate.py index 6c4e0fd..43aa265 100755 --- a/abctemplate.py +++ b/abctemplate.py @@ -24,6 +24,7 @@ # * tradition. The Morris tradition the dance tune is from. # * composer. The tune composer. # * key. The tune key. +# * parts. The tune parts order (A(AB2)3 etc.). # * changefile. The name of the 'change' file, if any. # * changename. The change file base name. # * changetitle. The change file tune title. @@ -70,6 +71,7 @@ if __name__ == "__main__": vars["tradition"] = getFieldDisplayText(lines, fdir, "A", latex=args.latex) vars["composer"] = getFieldDisplayText(lines, fdir, "C", latex=args.latex) vars["key"] = getFieldDisplayText(lines, fdir, "K", latex=args.latex) + vars["parts"] = getFieldDisplayText(lines, fdir, "P", latex=args.latex) vars["notes"] = getFieldDisplayText(lines, fdir, "N", starts="Dottes:", latex=args.latex) if vars["notes"]: vars["notesvisibility"] = "yes" diff --git a/dottes.html.tune b/dottes.html.tune index c2831cd..b8fb50a 100644 --- a/dottes.html.tune +++ b/dottes.html.tune @@ -25,14 +25,17 @@