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

2020.07.14

Browse Source
This commit is contained in:
Seymour Shlien
2020-07-14 15:15:16 -04:00
parent 494e063cf2
commit 0e68274e42
5 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/CHANGES
View File

@@ -13745,4 +13745,12 @@ can take various values.
You can find a test file detune.abc in the samples folder. You can find a test file detune.abc in the samples folder.
July 14 2020
yaps: cleaned up numerous gcc warnings such as
drawtune.c:3245:16: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
lineno = (int)(ft->item);
changed
lineno = (long)(ft->item);
etc.

2
doc/readme.txt
View File

@@ -3,7 +3,7 @@ abcMIDI : abc <-> MIDI conversion utilities
midi2abc version 3.46 June 22 2020 midi2abc version 3.46 June 22 2020
abc2midi version 4.38 July 05 2020 abc2midi version 4.38 July 05 2020
abc2abc version 2.08 June 04 2020 abc2abc version 2.08 June 04 2020
yaps version 1.77 June 04 2020 yaps version 1.78 June 14 2020
abcmatch version 1.73 June 04 2020 abcmatch version 1.73 June 04 2020
midicopy version 1.36 June 04 2019 midicopy version 1.36 June 04 2019

24
drawtune.c
View File

@@ -1475,7 +1475,7 @@ static void sizevoice(struct voice* v, struct tune* t)
case DYNAMIC: case DYNAMIC:
break; break;
case LINENUM: case LINENUM:
lineno = (int)(ft->item); lineno = (long)(ft->item);
break; break;
case MUSICLINE: case MUSICLINE:
break; break;
@@ -2958,7 +2958,7 @@ static int printvoiceline(struct voice* v)
(v->place->type == LEFT_TEXT) || (v->place->type == CENTRE_TEXT) || (v->place->type == LEFT_TEXT) || (v->place->type == CENTRE_TEXT) ||
(v->place->type == VSKIP))) { (v->place->type == VSKIP))) {
if (v->place->type == LINENUM) { if (v->place->type == LINENUM) {
lineno = (int)(v->place->item); lineno = (long)(v->place->item);
}; };
if (v->place->type == NEWPAGE) { if (v->place->type == NEWPAGE) {
newpage(); newpage();
@@ -2970,7 +2970,7 @@ static int printvoiceline(struct voice* v)
printtext(centre, v->place->item, &textfont); printtext(centre, v->place->item, &textfont);
}; };
if (v->place->type == VSKIP) { if (v->place->type == VSKIP) {
vskip((double)((int)v->place->item)); vskip((double)((long)v->place->item));
}; };
v->place = v->place->next; v->place = v->place->next;
}; };
@@ -3004,21 +3004,21 @@ static int printvoiceline(struct voice* v)
switch (ft->type) { switch (ft->type) {
case SINGLE_BAR: case SINGLE_BAR:
fprintf(f, "%.1f bar\n", ft->x); fprintf(f, "%.1f bar\n", ft->x);
printbarnumber(ft->x, (int)ft->item); printbarnumber(ft->x, (long)ft->item);
break; break;
case DOUBLE_BAR: case DOUBLE_BAR:
fprintf(f, "%.1f dbar\n", ft->x); fprintf(f, "%.1f dbar\n", ft->x);
printbarnumber(ft->x, (int)ft->item); printbarnumber(ft->x, (long)ft->item);
inend = endrep(inend, endstr, xend, ft->x, spacing->yend); inend = endrep(inend, endstr, xend, ft->x, spacing->yend);
break; break;
case BAR_REP: case BAR_REP:
fprintf(f, "%.1f fbar1 %.1f rdots\n", ft->x, ft->x+10); fprintf(f, "%.1f fbar1 %.1f rdots\n", ft->x, ft->x+10);
printbarnumber(ft->x, (int)ft->item); printbarnumber(ft->x, (long)ft->item);
inend = endrep(inend, endstr, xend, ft->x, spacing->yend); inend = endrep(inend, endstr, xend, ft->x, spacing->yend);
break; break;
case REP_BAR: case REP_BAR:
fprintf(f, "%.1f rdots %.1f fbar2\n", ft->x, ft->x+10); fprintf(f, "%.1f rdots %.1f fbar2\n", ft->x, ft->x+10);
printbarnumber(ft->x, (int)ft->item); printbarnumber(ft->x, (long)ft->item);
inend = endrep(inend, endstr, xend, ft->x, spacing->yend); inend = endrep(inend, endstr, xend, ft->x, spacing->yend);
break; break;
case REP1: case REP1:
@@ -3041,7 +3041,7 @@ static int printvoiceline(struct voice* v)
break; break;
case BAR1: case BAR1:
fprintf(f, "%.1f bar\n", ft->x); fprintf(f, "%.1f bar\n", ft->x);
printbarnumber(ft->x, (int)ft->item); printbarnumber(ft->x, (long)ft->item);
inend = endrep(inend, endstr, xend, ft->x - ft->xleft, spacing->yend); inend = endrep(inend, endstr, xend, ft->x - ft->xleft, spacing->yend);
inend = 1; inend = 1;
strcpy(endstr, "1"); strcpy(endstr, "1");
@@ -3049,7 +3049,7 @@ static int printvoiceline(struct voice* v)
break; break;
case REP_BAR2: case REP_BAR2:
fprintf(f, "%.1f rdots %.1f fbar2\n", ft->x, ft->x+10); fprintf(f, "%.1f rdots %.1f fbar2\n", ft->x, ft->x+10);
printbarnumber(ft->x, (int)ft->item); printbarnumber(ft->x, (long)ft->item);
inend = endrep(inend, endstr, xend, ft->x - ft->xleft, spacing->yend); inend = endrep(inend, endstr, xend, ft->x - ft->xleft, spacing->yend);
inend = 2; inend = 2;
strcpy(endstr, "2"); strcpy(endstr, "2");
@@ -3242,7 +3242,7 @@ static int printvoiceline(struct voice* v)
if(psaction->color == 'b') redcolor = 0; if(psaction->color == 'b') redcolor = 0;
break; break;
case LINENUM: case LINENUM:
lineno = (int)(ft->item); lineno = (long)(ft->item);
break; break;
case MUSICLINE: case MUSICLINE:
v->line = midline; v->line = midline;
@@ -3365,7 +3365,7 @@ static int getlineheight(struct voice* v, double* height)
(v->place->type == LEFT_TEXT) || (v->place->type == CENTRE_TEXT) || (v->place->type == LEFT_TEXT) || (v->place->type == CENTRE_TEXT) ||
(v->place->type == VSKIP))) { (v->place->type == VSKIP))) {
if (v->place->type == LINENUM) { if (v->place->type == LINENUM) {
lineno = (int)(v->place->item); lineno = (long)(v->place->item);
}; };
if (v->place->type == LEFT_TEXT) { if (v->place->type == LEFT_TEXT) {
*height = *height + textfont.pointsize + textfont.space; *height = *height + textfont.pointsize + textfont.space;
@@ -3374,7 +3374,7 @@ static int getlineheight(struct voice* v, double* height)
*height = *height + textfont.pointsize + textfont.space; *height = *height + textfont.pointsize + textfont.space;
}; };
if (v->place->type == VSKIP) { if (v->place->type == VSKIP) {
*height = *height + (double)((int)v->place->item); *height = *height + (double)((long)v->place->item);
}; };
v->place = v->place->next; v->place = v->place->next;
}; };

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.77 June 04 2020 yaps" #define VERSION "1.78 July 14 2020 yaps"
#include <stdio.h> #include <stdio.h>
#ifdef USE_INDEX #ifdef USE_INDEX
#define strchr index #define strchr index