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

2021.06.24

Browse Source
This commit is contained in:
Seymour Shlien
2021-06-24 14:37:48 -04:00
parent 1105ee0c8b
commit 504cbe93f7
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 May 25 2021 2021 June 24 2021

26
doc/CHANGES
View File

@@ -14251,3 +14251,29 @@ time signatures like M: none or M:7/8. The code for dealing with
3/2, 3/4, 3/8 ... time signatures was improved. 3/2, 3/4, 3/8 ... time signatures was improved.
June 24 2021
abc2midi bug: in the following sample
X:1
T: octave
M: 2/4
L: 1/8
K: none octave=1
V:1
C4|
V:2
C4|
The octave=1 applies only to voice 1 and does not
act as global variable applying to both voices.
Analysis: event_octave either sets global.octaveshift or
v.octaveshift depending upon the variable pastheader. Pastheader
was set to 1 by headerprocess() in event_key() prior to calling
event_octave which prevented global.octaveshift from being set.
Fix: moved headerprocess(), getvoicecontext(), etc to after
calling event_octave().

4
doc/readme.txt
View File

@@ -1,7 +1,7 @@
abcMIDI : abc <-> MIDI conversion utilities abcMIDI : abc <-> MIDI conversion utilities
midi2abc version 3.47 May 25 2021 midi2abc version 3.47 May 25 2021
abc2midi version 4.57 May 25 2021 abc2midi version 4.58 June 24 2021
abc2abc version 2.15 May 25 2021 abc2abc version 2.15 May 25 2021
yaps version 1.87 May 25 2021 yaps version 1.87 May 25 2021
abcmatch version 1.79 May 25 2021 abcmatch version 1.79 May 25 2021
@@ -14,7 +14,7 @@ J.R.Allwright@westminster.ac.uk
University of Westminster, University of Westminster,
London, UK London, UK
November 2020 June 2021
Seymour Shlien Seymour Shlien
Ottawa, Canada Ottawa, Canada

17
store.c
View File

@@ -186,7 +186,7 @@ int main()
*/ */
#define VERSION "4.57 May 25 2021 abc2midi" #define VERSION "4.58 June 24 2021 abc2midi"
/* enables reading V: indication in header */ /* enables reading V: indication in header */
#define XTEN1 1 #define XTEN1 1
@@ -5957,11 +5957,13 @@ int explict;
copymap(&global); copymap(&global);
sf = sharps; sf = sharps;
mi = minor; mi = minor;
headerprocess();
v = getvoicecontext(1); /* [SS] 2021-06-24
if (!inbody) v1index = notes; /* save position in case of split voice */ ***headerprocess();
};
***v = getvoicecontext(1);
***if (!inbody) v1index = notes; /* save position in case of split voice */
if (gotclef) if (gotclef)
{ {
event_octave(clef->octave_offset, 0); event_octave(clef->octave_offset, 0);
@@ -5969,6 +5971,11 @@ int explict;
if (gotoctave) { if (gotoctave) {
event_octave(octave,0); event_octave(octave,0);
}; };
/* [SS] 2021-06-24 */
headerprocess();
v = getvoicecontext(1);
if (!inbody) v1index = notes; /* save position in case of split voice */
};
}; };
} }