From 47181bf50402a383b975ce6e5fce9449ef982486 Mon Sep 17 00:00:00 2001 From: Seymour Shlien Date: Mon, 1 Aug 2022 17:17:39 -0400 Subject: [PATCH] 2022.08.01 --- VERSION | 2 +- doc/CHANGES | 5 +++++ doc/readme.txt | 2 +- parseabc.c | 5 +++++ store.c | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 67d256a..4f1df2b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -2022 July 31 2022 +August 01 2022 diff --git a/doc/CHANGES b/doc/CHANGES index d3b4e64..196ccd7 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -14847,4 +14847,9 @@ Fix: parseabc.c and music_utils.c was modified to ignore the clef=tab indication. +August 1 2022 + +Fixed the abc parser so it does not report a malformed note +when it encounters a dotted bar line .| -- (in parsemusic() in parseabc.c). +The dotted bar line is treated as a regular bar line. diff --git a/doc/readme.txt b/doc/readme.txt index 948e040..d5d1ecd 100644 --- a/doc/readme.txt +++ b/doc/readme.txt @@ -1,7 +1,7 @@ abcMIDI : abc <-> MIDI conversion utilities midi2abc version 3.54 April 28 2022 -abc2midi version 4.75 July 31 2022 +abc2midi version 4.76 August 01 2022 abc2abc version 2.18 June 14 2022 yaps version 1.90 June 14 2022 abcmatch version 1.82 June 14 2022 diff --git a/parseabc.c b/parseabc.c index 97d0d46..b6c59ea 100644 --- a/parseabc.c +++ b/parseabc.c @@ -2910,6 +2910,11 @@ parsemusic (field) p = p+1; } + if (*p == '.' && *(p+1) == '|') { /* [SS] 2022-08.01 dotted bar */ + p = p +1; + /* ignore dotted bar */ + } + if (((*p >= 'a') && (*p <= 'g')) || ((*p >= 'A') && (*p <= 'G')) || (strchr ("_^=", *p) != NULL) || (strchr (decorations, *p) != NULL)) { diff --git a/store.c b/store.c index e016a94..84190b5 100644 --- a/store.c +++ b/store.c @@ -186,7 +186,7 @@ int main() */ -#define VERSION "4.75 July 30 2022 abc2midi" +#define VERSION "4.76 August 01 2022 abc2midi" /* enables reading V: indication in header */ #define XTEN1 1