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

2023.01.06

Browse Source
This commit is contained in:
Seymour Shlien
2023-01-06 14:22:28 -05:00
parent 7fae7302c3
commit c981535a2a
6 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1,2 +1,2 @@
January 05 2022 January 06 2023

28
doc/CHANGES
View File

@@ -14995,3 +14995,31 @@ which describes how all the transpose directives should work.
This code was implemented in parseSoundScore() which now replaces This code was implemented in parseSoundScore() which now replaces
parseSound(). It also fixes yaps. parseSound(). It also fixes yaps.
January 06 2023
abcmidi ignores sound=cD in the following example.
X:2
T: sound + score
M: 4/4
K:C
V:1 sound=cD score=FD
cdec z4
V:2
z4 c4
Analysis: *transpose is set to -10 by parseSoundScore when it
processes sound=CD but when parseSoundScore is called again
with score=FD it sets *transpose to 0, the initialized value
of transp_sound. The last value of *transpose is used by
event_voice.
Fix: if parseSoundScore is called by the abc2midi executable,
then *transpose is not set to transp_sound when the score=
directive is processed. There is a similar issue when
parseSoundScore is called by yaps. We do not want to set
*transpose to transp_score when the sound= is processed.

4
doc/readme.txt
View File

@@ -1,9 +1,9 @@
abcMIDI : abc <-> MIDI conversion utilities abcMIDI : abc <-> MIDI conversion utilities
midi2abc version 3.58 December 09 2022 midi2abc version 3.58 December 09 2022
abc2midi version 4.80 December 30 2022 abc2midi version 4.82 January 06 2022
abc2abc version 2.18 June 14 2022 abc2abc version 2.18 June 14 2022
yaps version 1.90 June 14 2022 yaps version 1.92 January 06 2022
abcmatch version 1.82 June 14 2022 abcmatch version 1.82 June 14 2022
midicopy version 1.38 May 06 2022 midicopy version 1.38 May 06 2022
midistats version 0.58 December 09 2022 midistats version 0.58 December 09 2022

10
parseabc.c
View File

@@ -1102,8 +1102,14 @@ if (**s != '=')
*gottranspose = 1; *gottranspose = 1;
if (fileprogram == ABC2MIDI) *transpose = transp_sound; if (fileprogram == ABC2MIDI) {
if (fileprogram == YAPS) *transpose = transp_score; /* [SS] 2023.01.06 */
if (casecmp(word,"score") != 0) *transpose = transp_sound;
}
if (fileprogram == YAPS) {
/* [SS] 2023.01.06 */
if (casecmp(word,"sound") != 0) *transpose = transp_score;
}
return(1); return(1);
} }
} }

2
store.c
View File

@@ -186,7 +186,7 @@ int main()
*/ */
#define VERSION "4.81 January 05 2023 abc2midi" #define VERSION "4.82 January 06 2023 abc2midi"
/* enables reading V: indication in header */ /* enables reading V: indication in header */
#define XTEN1 1 #define XTEN1 1

2
yapstree.c
View File

@@ -22,7 +22,7 @@
/* yapstree.c - back-end for abc parser. */ /* yapstree.c - back-end for abc parser. */
/* generates a data structure suitable for typeset music */ /* generates a data structure suitable for typeset music */
#define VERSION "1.91 January 05 2023 yaps" #define VERSION "1.92 January 06 2023 yaps"
#include <stdio.h> #include <stdio.h>
#ifdef USE_INDEX #ifdef USE_INDEX
#define strchr index #define strchr index