richard/abcmidi
1
0
Fork 0
mirror of https://github.com/sshlien/abcmidi.git synced 2026-02-04 04:38:10 +00:00
Code Issues Projects Releases Wiki Activity

2021.03.30

Browse Source
This commit is contained in:
Seymour Shlien
2021-03-30 09:30:08 -04:00
parent 515e536d12
commit 12bf348274
4 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1,2 +1,2 @@
2021 March 27 2021 2021 March 30 2021

16
doc/CHANGES
View File

@@ -14136,3 +14136,19 @@ should be
March 30 2021
abc2midi bug: though grace notes only contain notes, the syntax allows
you to substitute chords for grace notes. For example,
X:1
T:acc
M:4/4
L:1/4
K:G
[DF]|E {[bc]}B cd|D4|
The function applygrace_new (in store.c) was modified so that the two notes
in the chord [bc] are treated as if they were one note. Otherwise
the measure would be too short (B is shrunk to make room for b and c)
and there could be a loss of synchronization between the voices.

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.50 March 10 2021 abc2midi version 4.51 March 30 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.78 March 27 2021 abcmatch version 1.78 March 27 2021

29
store.c
View File

@@ -186,7 +186,7 @@ int main()
*/ */
#define VERSION "4.50 March 10 2021 abc2midi" #define VERSION "4.51 March 30 2021 abc2midi"
/* enables reading V: indication in header */ /* enables reading V: indication in header */
#define XTEN1 1 #define XTEN1 1
@@ -5245,7 +5245,9 @@ int place;
int nextinchord; int nextinchord;
int hostnotestart, hostnoteend; int hostnotestart, hostnoteend;
int adjusted_num, adjusted_den; int adjusted_num, adjusted_den;
int notesinchord;
notesinchord = -1;
j = place; j = place;
start = -1; start = -1;
while ((j < notes) && (start == -1)) { while ((j < notes) && (start == -1)) {
@@ -5307,11 +5309,26 @@ int place;
grace_denom = 1; grace_denom = 1;
p = start; p = start;
while (p <= end) { while (p <= end) {
if ((feature[p] == NOTE) || (feature[p] == REST)) { switch(feature[p]) { /* [SS] 2021-03-30 */
grace_num = grace_num * denom[p] + grace_denom * num[p]; case NOTE:
grace_denom = grace_denom * denom[p]; case REST:
reduce(&grace_num, &grace_denom); if (notesinchord <= 0) {
}; /* if chordal grace note, only count the first note */
grace_num = grace_num * denom[p] + grace_denom * num[p];
grace_denom = grace_denom * denom[p];
reduce(&grace_num, &grace_denom);
if (notesinchord == 0) notesinchord++;
}
break;
case CHORDON:
notesinchord = 0;
break;
case CHORDOFF:
notesinchord = -1;
break;
default:
break;
}
p = p + 1; p = p + 1;
}; };