Mercurial > dottes

changeset 1041:54e08d3cf13e build-default-375

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 Wed, 19 Feb 2020 14:33:07 +0000
parents e6587dc18509 (diff) 953088656131 (current diff)
children f2a55f14fc00
files
diffstat 6 files changed, 26 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Beginners/intro.md	Wed Feb 19 14:19:17 2020 +0000
+++ b/Beginners/intro.md	Wed Feb 19 14:33:07 2020 +0000
@@ -1,4 +1,4 @@
-This page lists the tunes selected for the monthly Oxford Beginners session.
+These are tunes chosen for the monthly Oxford Beginners session.
 
 The Oxford Beginners session is an opportunity for all inexperienced
 musicians to gather and play together. The tunes, all popular in the
@@ -7,7 +7,7 @@
 a go at. They don't require a fast tempo, and the range of notes is limited.
 But they're still real tunes, as played at other sessions.
 
-The first tunes in the list are those we think are especially easy.
+The first tunes listed are those we think are especially easy.
 Start with those!
 
 The tunes are drawn mostly from the Cry Havoc session repertoire.
--- a/Beginners/subtitle.txt	Wed Feb 19 14:19:17 2020 +0000
+++ b/Beginners/subtitle.txt	Wed Feb 19 14:33:07 2020 +0000
@@ -1,1 +1,1 @@
-Tunes for the Oxford Beginners Session.
+Tunes for the Oxford Beginners Session
--- a/Morris/Valentine.abc	Wed Feb 19 14:19:17 2020 +0000
+++ b/Morris/Valentine.abc	Wed Feb 19 14:33:07 2020 +0000
@@ -7,19 +7,19 @@
 Q: 120
 P: A
 d |\
-"C" gfe ede | edc cBc | "G" dBg dBG | "Am" FAA "D" A2 d |
-"C" gfe ede | edc cBc | "G" dBG FAF | "G" GA>G G2 ||
+"C" gfe ede | edc cBc | "G" dBg dBG | "D7" FAA A2 d |
+"C" gfe ede | edc cBc | "G" dBG "D7" FAF | "G" GA>G G2 ||
 P: B
 B/c/ |\
-"G" ded dBd | BGG G2 A/B/ | "C" cAc BGB | "Am" FAA "D7" A2 B/c/ |
+"G" ded dBd | BGG G2 A/B/ | "D7" cAc "G" BGB | "D7" FAA A2 B/c/ |
 "G" ded dBd | BGG GBd | "C" efg "G" d2c | "G" BGG G2 ||
 P: C
 B/c/ |\
 "G" ded dBd | "G" BGG G2 A/B/ |\
 M: 4/4
 Q: 150
-"C" c2 A2 "D7" c4 | "G" B2 G2 "Em" B4 | "Am" F2 A2 "A7" A4 |
+"D7" c2 A2 c4 | "G" B2 G2 B4 | "D7" F2 A2 A4 |
 "D7" (A4 A2) Bc |\
 M: 6/8
 Q: 120
-ded dBd | "G" BGG GBd | "C" efg "G" d2c | BGG G2 |]
+"G" ded dBd | BGG GBd | "C" efg "G" d2c | "C" BGG G2 |]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Session/Inisheer.abc	Wed Feb 19 14:33:07 2020 +0000
@@ -0,0 +1,13 @@
+X: 1
+T: Inisheer
+C: Tommy Walsh
+R: waltz
+M: 3/4
+L: 1/8
+K: Gmaj
+DGA |\
+"G" B3A B<d | "Em" B3A B<d | "C" E3B AB | "D" D3B A<G |
+"G" B3A B<d | "Em" B3A B<d | "C" G3B "D" A/G/F | "G" G3 :|
+ABd |\
+"C" e3f e<d | "G" B3A Bd | "C" ef ed B/c/d |
+"C" e4 Bd | "Am" e3f e<d | "G" B3A B<d | "G" D3B "D" A/G/F| "G" G3 :|
--- a/makeWebAudio.sh	Wed Feb 19 14:19:17 2020 +0000
+++ b/makeWebAudio.sh	Wed Feb 19 14:33:07 2020 +0000
@@ -69,7 +69,6 @@
     fi
     # Calculate new tempo.
     newtempo=$(( ( $numtempo * $4 ) / $5 ))
-    echo "Old tempo $tempo new tempo ${notelenprefix}${newtempo}"
     # Insert new tempo and delete old. Old may not exist,
     # so do this rather than overwrite.
     sed -e "/^Q:/d" -e "/^K:/a\\
--- a/web/index.html	Wed Feb 19 14:19:17 2020 +0000
+++ b/web/index.html	Wed Feb 19 14:33:07 2020 +0000
@@ -55,6 +55,7 @@
             <ul class="tune-type-list">
               <li><a href="Morris">Morris</a></li>
               <li><a href="Session">Session</a></li>
+              <li><a href="Beginners">Beginners</a></li>
               <li><a href="Library">Library</a></li>
             </ul>
           </div>
@@ -87,6 +88,7 @@
             <ul class="tune-type-list">
               <li><a href="Morris-Cello">Morris</a></li>
               <li><a href="Session-Cello">Session</a></li>
+              <li><a href="Beginners-Cello">Beginners</a></li>
               <li><a href="Library-Cello">Library</a></li>
             </ul>
           </div>
@@ -108,6 +110,7 @@
             <ul class="tune-type-list">
               <li><a href="Morris-HornInF">Morris</a></li>
               <li><a href="Session-HornInF">Session</a></li>
+              <li><a href="Beginners-HornInF">Beginners</a></li>
               <li><a href="Library-HornInF">Library</a></li>
             </ul>
           </div>
@@ -129,6 +132,7 @@
             <ul class="tune-type-list">
               <li><a href="Morris-AltoRecorderCFingering">Morris</a></li>
               <li><a href="Session-AltoRecorderCFingering">Session</a></li>
+              <li><a href="Beginners-AltoRecorderCFingering">Beginners</a></li>
               <li><a href="Library-AltoRecorderCFingering">Library</a></li>
             </ul>
           </div>
@@ -147,6 +151,7 @@
             <ul class="tune-type-list">
               <li><a href="Morris-AltoSax">Morris</a></li>
               <li><a href="Session-AltoSax">Session</a></li>
+              <li><a href="Beginners-AltoSax">Beginners</a></li>
               <li><a href="Library-AltoSax">Library</a></li>
             </ul>
           </div>