Mercurial > dottes

changeset 795:c979a83fdd26 build-default-299

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream.
author Jim Hague <jim.hague@acm.org>
date Thu, 26 Apr 2018 15:05:29 +0100
parents 3ba2e11466cd (diff) 022d27f0472c (current diff)
children 1cdafbd22363 1158f22940d6
files
diffstat 6 files changed, 36 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/Session/Compact/KingOfTheFairies.abc	Thu Apr 26 14:36:25 2018 +0100
+++ b/Session/Compact/KingOfTheFairies.abc	Thu Apr 26 15:05:29 2018 +0100
@@ -7,14 +7,15 @@
 N: Dottes: Change: <LanigansBall.abc>.
 K: Em
 B,2 |\
-|: "Em" (ED)EF (GF)GA | B2B2 G3 A | B2E2 (EF)GE | "D" (FG)FE D3 B, |\
+"Em" (ED)EF (GF)GA | B2B2 G3 A | B2E2 (EF)GE | "D" (FG)FE D3 B, |\
 "Em" (ED)EF (GF)GA | (BA)(GB) "D" d3 c |
-"Em" B2E2 "Bm" (GF)(ED) | [1 "Em" E6 B,2 :| [2 "Em" E6 z2 ||\
-|: "Em" e2 e2 (Bd)ef | (ga)gf "C" e3 f | "Em" e2 B2 (BA)B^c |\
+"Em" B2E2 "Bm" (GF)(ED) | "Em" E6 :|\
+d |\
+"Em" e2 e2 (Bd)ef | (ga)gf "C" e3 f | "Em" e2 B2 (BA)B^c |\
 "Bm" (de)d^c (Bc) (3(dcB) |
 "Em" e2 B2 (Bd)ef |\
 (ga)gf "C" e3 f | "Em" (gf) (3(efg) "D" (fe) (3(def) |\
 "Em" e2 (ed) e3 f | g2 z e "D" f2 z d | "Em" (ed)(B^c) "Bm" d3 e |
 "D" (dB)AF "Em" (GA)B^c | "Bm" (dB)(AF) "Em" (GF)(ED) |\
 B,2 E2 (EF)GA | B2 e2 (ed)ef | e2 B2 "Bm" (BA)(GF) |\
-[1 "Em" E6 z d :| [2 "Em" E6 |]
+"Em" E6 :|]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Session/Compact/TomTolleys.abc	Thu Apr 26 15:05:29 2018 +0100
@@ -0,0 +1,20 @@
+X: 1
+T: Tom Tolley's Hornpipe
+R: Hornpipe
+N: Dottes: Change: <IronLegs.abc>.
+M: 4/4
+L: 1/4
+Q: 1/4=132
+K: G
+B/c/ |\
+"G" d/c/B/A/ G/g/f/g/ | "C" e2 d2 | "C" c/d/c/B/ A/B/A/G/ | "D7" F2 "C" E2 |\
+"G" D/E/F/G/ A B |
+"C" c d/e/ "D" d c | "G" B/A/G/A/ "D7" D F | "G" G3 :|\
+d |\
+"Em" g b/g/ e a/g/ | "D7" f>e "G" d e/f/ |
+"Em" g b/g/ e a/g/ | "D" f>e "G" d e/f/ |\
+"G" g/d/d/d/ g/d/d/d/ | "G" g/d/g/d/ g/d/d/d/ |\
+"Em" g>f e/d/c/B/ |
+"Am" A/B/A/G/ F E |\
+"D" D/E/F/G/ A B | "C" c d/e/ d c |\
+"G" B/A/G/A/ "D7" D F | "G" G3 :|
--- a/Session/KingOfTheFairies.abc	Thu Apr 26 14:36:25 2018 +0100
+++ b/Session/KingOfTheFairies.abc	Thu Apr 26 15:05:29 2018 +0100
@@ -7,13 +7,14 @@
 N: Dottes: Change: <LanigansBall.abc>.
 K: Em
 B,2 |\
-|: "Em" (ED)EF (GF)GA | B2B2 G3 A | B2E2 (EF)GE | "D" (FG)FE D3 B, |
+"Em" (ED)EF (GF)GA | B2B2 G3 A | B2E2 (EF)GE | "D" (FG)FE D3 B, |
 "Em" (ED)EF (GF)GA | (BA)(GB) "D" d3 c | "Em" B2E2 "Bm" (GF)(ED) |\
-[1 "Em" E6 B,2 :| [2 "Em" E6 z2 ||
-|: "Em" e2 e2 (Bd)ef | (ga)gf "C" e3 f | "Em" e2 B2 (BA)B^c |\
+"Em" E6 :|
+d |\
+"Em" e2 e2 (Bd)ef | (ga)gf "C" e3 f | "Em" e2 B2 (BA)B^c |\
 "Bm" (de)d^c (Bc) (3(dcB) | "Em" e2 B2 (Bd)ef |
 (ga)gf "C" e3 f | "Em" (gf) (3(efg) "D" (fe) (3(def) |\
 "Em" e2 (ed) e3 f | g2 z e "D" f2 z d | "Em" (ed)(B^c) "Bm" d3 e |
 "D" (dB)AF "Em" (GA)B^c | "Bm" (dB)(AF) "Em" (GF)(ED) |\
 B,2 E2 (EF)GA | B2 e2 (ed)ef | e2 B2 "Bm" (BA)(GF) |\
-[1 "Em" E6 z d :| [2 "Em" E6 |]
+"Em" E6 :|]
--- a/Session/MaguireAndPatterson.abc	Thu Apr 26 14:36:25 2018 +0100
+++ b/Session/MaguireAndPatterson.abc	Thu Apr 26 15:05:29 2018 +0100
@@ -4,10 +4,11 @@
 L: 1/4
 Q: 1/4=120
 K: D
-D/F/ |: "D" A>B A | A G F | "A" E D E | "D" F2 D/F/ |\
-        A>B A | A G F | "A" E D E | "D" D2 D/E/ |
-        F F>E | F F>E | F F>E | F2 F/E/ |\
-        "G" D>E F | "A" E D E | "G" (D3 |[1 "D" D2) D/F/  :| [2 "D" D F A ||
+D/F/ |\
+"D" A>B A | A G F | "A" E D E | "D" F2 D/F/ |\
+    A>B A | A G F | "A" E D E | "D" D2 D/E/ |
+    F F>E | F F>E | F F>E | F2 F/E/ |\
+"G" D>E F | "A" E D E | "G" (D3 |[1 "D" D2)  :| [2 "D" D F A ||
 |: "Bm" d>d d | "A" c B A | "G" A d A | "D" B>A B/c/ |\
    "Bm" d>e d | "A" c B A | "G" A d f | "A" e3 |
    "D" A>B A | A G F | "A" E D E | "D" F2 F/E/ |\
--- a/dottes.html.tune	Thu Apr 26 14:36:25 2018 +0100
+++ b/dottes.html.tune	Thu Apr 26 15:05:29 2018 +0100
@@ -32,7 +32,6 @@
             <div class="dottes-tune-header-title">
               <h1>${title}</h1>
               <h2>${subtitle}</h2>
-              <h3>${tradition}</h3>
             </div>
             <div class="dottes-tune-header-composer">
               <em>${composer}</em>
--- a/dottes.tex.tune	Thu Apr 26 14:36:25 2018 +0100
+++ b/dottes.tex.tune	Thu Apr 26 15:05:29 2018 +0100
@@ -1,5 +1,5 @@
 \tunestart
-\showtune{$name}{$title}{$subtitle}{$fulltitle}{$tradition}{$composer}{$parts}{$tuneimagefile}
+\showtune{$name}{$title}{$subtitle}{$fulltitle}{$composer}{$parts}{$tuneimagefile}
 $notes
 
 $history