richard/abcmidi
1
0
Fork 0
mirror of https://github.com/sshlien/abcmidi.git synced 2026-04-15 22:33:42 +00:00
Code Issues Projects Releases Wiki Activity

2021.02.21

Browse Source
This commit is contained in:
Seymour Shlien
2021-02-21 10:28:19 -05:00
parent 388fc83b86
commit 86f1bf5c95
4 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1,2 +1,2 @@
2021 January 24 2021 2021 February 21 2021

21
doc/CHANGES
View File

@@ -14086,4 +14086,25 @@ Hooks to new instructions !accent! !mordent!, !sfz!, !wedge! were
added to the function event_handle_instruction() in store.c. added to the function event_handle_instruction() in store.c.
February 21 2021
Abc2midi bug: unfortunately the fix applied to add_missing_repeats
applied on January 21 2021 caused a new problem for single voice files.
For example:
X: 1
T: repeat bug
R: jig
M: 6/8
L: 1/8
K: G
D |"G" ~G3 GAB |"D"ABA ABd | "G"edd gdB | "D"AGF "G"G2 ::
A | "G"BAB dBd| "Em"ege "G"dBd | gfg "D"aga | "G"bgf g2 :|
Those files do not contain a VOICE feature, so that the fix results
in the leftrepeat being misplaced. The problem was repaired by
testing the varieable voicesused before searching for the VOICE feature.

2
doc/readme.txt
View File

@@ -1,7 +1,7 @@
abcMIDI : abc <-> MIDI conversion utilities abcMIDI : abc <-> MIDI conversion utilities
midi2abc version 3.47 November 01 2020 midi2abc version 3.47 November 01 2020
abc2midi version 4.47 January 24 2021 abc2midi version 4.49 February 21 2021
abc2abc version 2.12 October 19 2020 abc2abc version 2.12 October 19 2020
yaps version 1.86 December 10 2020 yaps version 1.86 December 10 2020
abcmatch version 1.77 December 10 2020 abcmatch version 1.77 December 10 2020

15
store.c
View File

@@ -186,7 +186,7 @@ int main()
*/ */
#define VERSION "4.47 January 24 2021 abc2midi" #define VERSION "4.49 February 21 2021 abc2midi"
/* enables reading V: indication in header */ /* enables reading V: indication in header */
#define XTEN1 1 #define XTEN1 1
@@ -4707,6 +4707,13 @@ if (nofnop == 0) {
done = 1; done = 1;
}; };
/* The following instructions were added to avoid numerous
warnings if they appear in the abc file (in particular the
files derived from Craig Sapp's kern files using hum2abc).
Though most of these instructions are part of the abc
2.2 standard, I have yet to implement them.
*/
if (strcmp(s,"accent") == 0) { /* [SS] 2021-01-24 */ if (strcmp(s,"accent") == 0) { /* [SS] 2021-01-24 */
done = 1; done = 1;
}; };
@@ -4723,6 +4730,10 @@ if (nofnop == 0) {
done = 1; done = 1;
}; };
if (strcmp(s,"turn") == 0) { /* [SS] 2021-01-25 */
done = 1;
};
if (done == 0 && quiet == -1) { /* [SS] 2013-11-02 */ if (done == 0 && quiet == -1) { /* [SS] 2013-11-02 */
sprintf(buff, "instruction !%s! ignored", s); sprintf(buff, "instruction !%s! ignored", s);
event_warning(buff); event_warning(buff);
@@ -6023,10 +6034,12 @@ for (i = num2add-1; i >= 0; i--) {
leftrepeat = add_leftrepeat_at[i]; leftrepeat = add_leftrepeat_at[i];
k=0; k=0;
/* [SS] 2021-12-21 */ /* [SS] 2021-12-21 */
if (voicesused) { /* 2021-02-21 */
while (feature[leftrepeat] != VOICE && k < 20) { while (feature[leftrepeat] != VOICE && k < 20) {
leftrepeat++; leftrepeat++;
k++; k++;
} }
}
insertfeature(BAR_REP,0,0,0,leftrepeat+1); insertfeature(BAR_REP,0,0,0,leftrepeat+1);
/* for (j=0;j<=parts;j++) { [SS] 2011-06-06 */ /* for (j=0;j<=parts;j++) { [SS] 2011-06-06 */
for (j=0;j<26;j++) { /* [SS] 2011-08-03 */ for (j=0;j<26;j++) { /* [SS] 2011-08-03 */