From 9e01f4dcd3d905eb4e135ddaf017ee66ec9ced8f Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Tue, 17 Jun 2014 14:09:03 +0100 Subject: [PATCH 1/3] In ABC proper, ties should be after the first note, not before the second. abcm2ps copes, abc2xml throws a bad parse. --- Session/MidsummerWaltz.abc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Session/MidsummerWaltz.abc b/Session/MidsummerWaltz.abc index 0878168..de86ac9 100644 --- a/Session/MidsummerWaltz.abc +++ b/Session/MidsummerWaltz.abc @@ -8,10 +8,10 @@ K:G L:1/4 Q:140 "D" D B A | "G" G2 A | B>c d | "D" A3 | "G" B B A | "Em" G2 G | "Am" A2 G | "D" F/D/-D2 | -"D" D B A | "G" G2 A | B>c d | "D" A3 | "Am" E c B | "D" A2 B | "C" G3| "G " -G3 :| +"D" D B A | "G" G2 A | B>c d | "D" A3 | "Am" E c B | "D" A2 B | "C" G3-| "G" G3 :| "G" B>A B | "Am" c>B c | "Bm" d>c d | "C" e3 | "Em" e2 d |\ "C" c2 B | "Am" A2 G | "D" F/D/-D2 | "G" B>A B | "Am" c>B c | -"Bm" d2 e | "D" A3 | "Am" E c B | "D" A2 B | "C" G3|\ -"G " -G3 | "G" B>A B | "Am" c>B c | "Bm" d>c d | "C" e3 | +"Bm" d2 e | "D" A3 | "Am" E c B | "D" A2 B | "C" G3- |\ +"G" G3 | "G" B>A B | "Am" c>B c | "Bm" d>c d | "C" e3 | "Em" e2 d | "C" c2 B | "Am" A2 G | "D" F/D/-D2 | "D" D B A |\ -"G" G2 A | "G" B>c d | "D" A3 | "Am" E c B | "D" A2 B | "C" G3| "G " -G3 |] +"G" G2 A | "G" B>c d | "D" A3 | "Am" E c B | "D" A2 B | "C" G3- | "G" G3 |] From 59724808cb4ca365a6ed6ffa0f58e064dd0cd4ac Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Tue, 17 Jun 2014 14:10:18 +0100 Subject: [PATCH 2/3] abc2xml doesn't like Q:n/d where n<>1. --- Session/LanigansBall.abc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Session/LanigansBall.abc b/Session/LanigansBall.abc index 5eff07b..3068ea7 100644 --- a/Session/LanigansBall.abc +++ b/Session/LanigansBall.abc @@ -4,7 +4,7 @@ R:Jig H:Seamus Quinn M:6/8 L:1/8 -Q:3/8=120 +Q:180 K:Em "Em" E2E G2A|B2A Bcd| "D" D2D F2G|ABA AFD| "Em" E2E G2A|B2A Bcd|"Bm" eBB B2A| "Em" BEE E3:| From 2f05dc69760c6d68aee7f47cd0ad3dac7dce6049 Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Tue, 17 Jun 2014 14:13:28 +0100 Subject: [PATCH 3/3] Ensure that web directory doesn't exist. I had a problem in a build with one web directory being created as a file. --- makeWeb.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/makeWeb.sh b/makeWeb.sh index 8409945..7513525 100755 --- a/makeWeb.sh +++ b/makeWeb.sh @@ -77,6 +77,7 @@ if [ -n "$instrument" ]; then subtitle="${subtitle} ($instrument)" fi +rm -rf $webdir mkdir -p $webdir sed -e "s/@BUILD@/$buildno/" -e "s/@SUBTITLE@/$subtitle/" \