From d486659fdd5b04ebb7ad1db8945c750a57e6c7f5 Mon Sep 17 00:00:00 2001 From: sshlien Date: Sun, 16 Feb 2025 20:30:44 -0500 Subject: [PATCH] 2025.02.16 --- VERSION | 2 +- doc/CHANGES | 24 ++++++++++++++++++++++++ doc/readme.txt | 2 +- store.c | 4 ++-- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index e8aa3ee..1569e7f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -February 15 2025 +February 16 2025 diff --git a/doc/CHANGES b/doc/CHANGES index bfe45a0..b256e61 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -15644,3 +15644,27 @@ To if (acc == '_' && !microtone) pitchvalue = pitchvalue - (float) (mul*accidental_size); +February 16 2025 + +abc2midi produced the wrong results for temperamentequal 31 + +X:5 +T: temperamentequal 31 +M:none +L:1/2 +K:C +% +%%text \%\%MIDI temperamentequal 31 +%%MIDI temperamentequal 31 +"^Octave divided in 31 equal parts"\ +=c ^/c ^c ^3/c ^^c =d _/d _d _3/d __d =c2 | +% + +Fix: +In pitchof_b (store.c) it is necessary to scale the microtoneshift by the +accidental_size prior to adding it to the pitchvalue. + + pitchvalue += microtoneshift*accidental_size; /* [SS] 2025.02.16 */ + + + diff --git a/doc/readme.txt b/doc/readme.txt index 6b32ff8..98d0123 100644 --- a/doc/readme.txt +++ b/doc/readme.txt @@ -1,7 +1,7 @@ abcMIDI : abc <-> MIDI conversion utilities midi2abc version 3.63 February 13 2025 -abc2midi version 5.01 February 15 2025 +abc2midi version 5.02 February 16 2025 abc2abc version 2.22 April 30 2024 yaps version 1.94 April 30 2024 abcmatch version 1.83 February 19 2024 diff --git a/store.c b/store.c index 0940415..36e3b26 100755 --- a/store.c +++ b/store.c @@ -186,7 +186,7 @@ int main() */ -#define VERSION "5.01 February 15 2025 abc2midi" +#define VERSION "5.02 February 16 2025 abc2midi" /* enables reading V: indication in header */ #define XTEN1 1 @@ -3796,7 +3796,7 @@ int *pitchbend; /* microtone fraction (eg _12/53B,) */ microtoneshift = (float) setmicrotone.num /(float) setmicrotone.denom; /* printf("microtoneshift = %f for setmicrotone %d %d\n",microtoneshift, setmicrotone.num,setmicrotone.denom); */ - pitchvalue += microtoneshift; + pitchvalue += microtoneshift*accidental_size; /* [SS] 2025.02.16 */ } microtone = 0;