Hello community, here is the log from the commit of package abcm2ps for openSUSE:Factory checked in at 2019-11-08 15:28:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abcm2ps (Old) and /work/SRC/openSUSE:Factory/.abcm2ps.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "abcm2ps" Fri Nov 8 15:28:18 2019 rev:9 rq:746544 version:8.14.6 Changes: -------- --- /work/SRC/openSUSE:Factory/abcm2ps/abcm2ps.changes 2019-11-06 13:50:31.615793548 +0100 +++ /work/SRC/openSUSE:Factory/.abcm2ps.new.2990/abcm2ps.changes 2019-11-08 15:28:19.963165604 +0100 @@ -1,0 +2,20 @@ +Fri Nov 8 10:52:12 UTC 2019 - Michael Vetter <mvet...@suse.com> + +- Update compiler_flags.patch + +------------------------------------------------------------------- +Fri Nov 8 10:43:50 UTC 2019 - Michael Vetter <mvet...@suse.com> + +- Update to 8.14.6: + * bad voice combine '3' when 3 voices and unison + * don't separate the accents from the notes by tuplets + * clash of tuplet numbers with accents + * bad time signature when C or C| and more value(s) + * warnings from clang static analysis + * bad music font selection when not defined by 'url(..)' + * bad vertical offset of "%%multicol new" when W: and %%begintext + * bad handling of fonts + * Add option flatbeamgracing that applies flat beams to grace notes only + * put the upper tuplets a bit closer to the notes + +------------------------------------------------------------------- Old: ---- abcm2ps-8.14.5.tar.gz New: ---- abcm2ps-8.14.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abcm2ps.spec ++++++ --- /var/tmp/diff_new_pack.cTJySS/_old 2019-11-08 15:28:20.959166724 +0100 +++ /var/tmp/diff_new_pack.cTJySS/_new 2019-11-08 15:28:20.963166729 +0100 @@ -18,10 +18,11 @@ Name: abcm2ps -Version: 8.14.5 +Version: 8.14.6 Release: 0 Summary: A program to typeset abc tunes into Postscript License: LGPL-3.0-or-later +Group: Productivity/Publishing/Other Summary(de): Ein Werkzeug um ABC-Notationen in Postscript zu drucken URL: https://github.com/leesavide/abcm2ps/ Source0: https://github.com/leesavide/abcm2ps/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz ++++++ abcm2ps-8.14.5.tar.gz -> abcm2ps-8.14.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.5/abcm2ps.h new/abcm2ps-8.14.6/abcm2ps.h --- old/abcm2ps-8.14.5/abcm2ps.h 2019-07-17 09:44:10.000000000 +0200 +++ new/abcm2ps-8.14.6/abcm2ps.h 2019-11-05 14:02:00.000000000 +0100 @@ -529,7 +529,7 @@ int abc2pscompat, alignbars, aligncomposer, autoclef; int barsperstaff, breakoneoln, bstemdown, cancelkey, capo; int combinevoices, contbarnb, continueall, custos; - int dblrepbar, decoerr, dynalign, flatbeams, infoline; + int dblrepbar, decoerr, dynalign, flatbeams, flatbeamgracing, infoline; int gchordbox, graceslurs, graceword,gracespace, hyphencont; int keywarn, landscape, linewarn; int measurebox, measurefirst, measurenb, micronewps; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.5/abcparse.c new/abcm2ps-8.14.6/abcparse.c --- old/abcm2ps-8.14.5/abcparse.c 2019-07-17 09:44:10.000000000 +0200 +++ new/abcm2ps-8.14.6/abcparse.c 2019-11-05 14:02:00.000000000 +0100 @@ -411,7 +411,7 @@ static char *parse_acc(char *p, struct SYMBOL *s) { - int pit, acc; + int pit = 0, acc; unsigned nacc; nacc = 0; @@ -559,7 +559,7 @@ } if (middle) { - int pit, acc, l; + int pit = 0, acc, l; static const char line_tb[7] = {ALTO, TREBLE, ALTO, BASS, ALTO, BASS, ALTO}; @@ -2299,7 +2299,7 @@ { struct SYMBOL *s; char *q; - int pit, len, acc, nostem, chord, j, m, n; + int pit = 0, len, acc, nostem, chord, j, m, n; if (flags & ABC_F_GRACE) { /* in a grace note sequence */ s = abc_new(ABC_T_NOTE, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.5/configure new/abcm2ps-8.14.6/configure --- old/abcm2ps-8.14.5/configure 2019-07-17 09:44:10.000000000 +0200 +++ new/abcm2ps-8.14.6/configure 2019-11-05 14:02:00.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # (automatic update) -VERSION=8.14.5 -VDATE=2019-07-17 +VERSION=8.14.6 +VDATE=2019-11-05 CC=gcc CFLAGS="-g -O2 -Wall -pipe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.5/draw.c new/abcm2ps-8.14.6/draw.c --- old/abcm2ps-8.14.5/draw.c 2019-07-17 09:44:10.000000000 +0200 +++ new/abcm2ps-8.14.6/draw.c 2019-11-05 14:02:00.000000000 +0100 @@ -304,6 +304,9 @@ /* if (nflags>1) b=b+2*stem;*/ /* leave a bit more room if several beams */ /* have flat beams when asked */ + if ( cfmt.flatbeamgracing && s1->flags & ABC_F_GRACE) + a = 0; + if (cfmt.flatbeams) { // if (!(s1->flags & ABC_F_GRACE)) // b = -11 + staff_tb[staff].y; @@ -920,10 +923,11 @@ f = "ctsig"; l--; } - meter[0] = '\0'; - x -= 5; - y += 12; - break; + dx = (float) (13 * l); + putxy(x - 5 + dx * .5, y + 12); + a2b("%s\n", f); + x += dx; + continue; case 'c': if (s->u.meter.meter[i].top[1] != '.') { f = "imsig"; @@ -2842,7 +2846,7 @@ break; } - ym += dy + 2; + ym += dy; y1 = ym + a * (x1 - xm); y2 = ym + a * (x2 - xm); putxy(x2 - x1, y2 - y1); @@ -2973,6 +2977,12 @@ putxy(xm, yy); a2b("y%d bnumb\n", upstaff); + // let some room for the number + if (dir == SL_ABOVE) + y_set(upstaff, 1, xm - 3, 6, ym + 3); + else + y_set(upstaff, 0, xm - 3, 6, ym); + done: s->sflags &= ~S_IN_TUPLET; return next; @@ -4164,7 +4174,7 @@ if (cfmt.measurenb >= 0) draw_measnb(); -// draw_deco_note(); + draw_deco_note(); for (p_voice = first_voice; p_voice; p_voice = p_voice->next) { s = p_voice->sym; @@ -4216,7 +4226,7 @@ } } set_color(0); - draw_deco_note(); +// draw_deco_note(); draw_deco_staff(); set_sscale(-1); /* restore the scale parameters */ draw_all_lyrics(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.5/format.c new/abcm2ps-8.14.6/format.c --- old/abcm2ps-8.14.5/format.c 2019-07-17 09:44:10.000000000 +0200 +++ new/abcm2ps-8.14.6/format.c 2019-11-05 14:02:00.000000000 +0100 @@ -68,6 +68,7 @@ {"footer", &cfmt.footer, FORMAT_S, 0}, {"footerfont", &cfmt.font_tb[FOOTERFONT], FORMAT_F, 0}, {"flatbeams", &cfmt.flatbeams, FORMAT_B, 0}, + {"flatbeamgracing", &cfmt.flatbeamgracing, FORMAT_B, 0}, {"gchordbox", &cfmt.gchordbox, FORMAT_B, 0}, {"gchordfont", &cfmt.font_tb[GCHORDFONT], FORMAT_F, 3}, {"graceslurs", &cfmt.graceslurs, FORMAT_B, 0}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.5/glyph.c new/abcm2ps-8.14.6/glyph.c --- old/abcm2ps-8.14.5/glyph.c 2019-07-17 09:44:10.000000000 +0200 +++ new/abcm2ps-8.14.6/glyph.c 2019-11-05 14:02:00.000000000 +0100 @@ -238,7 +238,7 @@ } g1 = utf_1[i1]; if (!g1) { - g1 = calloc(64, sizeof(char **)); + g1 = calloc(64, sizeof(char *)); utf_1[i1] = g1; } if (i3 < 0) { @@ -247,7 +247,7 @@ } g = (char **) g1[i2]; if (!g) { - g = calloc(64, sizeof(char **)); + g = calloc(64, sizeof(char *)); g1[i2] = (char *) g; } if (i4 < 0) { @@ -256,7 +256,7 @@ } g1 = (char **) g[i3]; if (!g1) { - g1 = calloc(64, sizeof(char **)); + g1 = calloc(64, sizeof(char *)); g[i3] = (char *) g1; } g1[i4] = strdup(p); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.5/music.c new/abcm2ps-8.14.6/music.c --- old/abcm2ps-8.14.5/music.c 2019-07-17 09:44:10.000000000 +0200 +++ new/abcm2ps-8.14.6/music.c 2019-11-05 14:02:00.000000000 +0100 @@ -462,11 +462,14 @@ for (m = nhd; m > 0; m--) { if (s->u.note.notes[m].pit == s->u.note.notes[m - 1].pit && s->u.note.notes[m].acc == s->u.note.notes[m - 1].acc) { - memmove(&s->u.note.notes[m - 1], - &s->u.note.notes[m], - sizeof s->u.note.notes[0]); - memmove(&s->pits[m - 1], &s->pits[m], - sizeof s->pits[0]); + i = nhd - m; + if (i > 0) { + memmove(&s->u.note.notes[m], + &s->u.note.notes[m + 1], + sizeof s->u.note.notes[0] * i); + memmove(&s->pits[m], &s->pits[m + 1], + sizeof s->pits[0] * i); + } s->nhd = --nhd; } } @@ -1141,8 +1144,8 @@ s->wl = xx; break; case BAR: - if (s->sflags & S_NOREPBRA) - break; +// if (s->sflags & S_NOREPBRA) +// break; if (!(s->flags & ABC_F_INVIS)) { int bar_type; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.5/parse.c new/abcm2ps-8.14.6/parse.c --- old/abcm2ps-8.14.5/parse.c 2019-07-17 09:44:10.000000000 +0200 +++ new/abcm2ps-8.14.6/parse.c 2019-11-05 14:02:00.000000000 +0100 @@ -5203,7 +5203,8 @@ int job; if (s->state == ABC_S_TUNE) { - gen_ly(1); + if (!multicol_start) + gen_ly(1); } else if (s->state == ABC_S_GLOBAL) { if (epsf || !in_fname) return s; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.5/svg.c new/abcm2ps-8.14.6/svg.c --- old/abcm2ps-8.14.5/svg.c 2019-07-17 09:44:10.000000000 +0200 +++ new/abcm2ps-8.14.6/svg.c 2019-11-05 14:02:00.000000000 +0100 @@ -1072,7 +1072,6 @@ { char *q, *r; - q = p; for (q = p; *p != '\0';) { switch (*p++) { case '<': r = "<"; break; @@ -1151,11 +1150,11 @@ ".stroke {stroke: currentColor; fill: none}\n" "text{white-space: pre}\n"; static const char svg_font_style[] = - ".music {font:24px music;\n" + ".music {font:24px %s;\n" " fill: currentColor}\n"; static const char svg_font_style_url[] = "@font-face {\n" - " font-family:\"music\";\n" + " font-family:music;\n" " src:%s}\n" ".music {font:24px music;\n" " fill: currentColor}\n"; @@ -1168,7 +1167,7 @@ if (strchr(cfmt.musicfont, '(')) fprintf(fout, svg_font_style_url, cfmt.musicfont); else - fprintf(fout, svg_font_style); + fprintf(fout, svg_font_style, cfmt.musicfont); } fputs(svg_head2, fout); } @@ -2496,6 +2495,7 @@ gcur.font_n_old = gcur.font_n; gcur.font_n = strdup(fontnames[n]); gcur.font_s = h; + gold.font_n = NULL; } return; } @@ -2534,6 +2534,7 @@ free(gcur.font_n_old); gcur.font_n_old = gcur.font_n; gcur.font_n = s; + gold.font_n = NULL; } else { free(s); } @@ -3702,6 +3703,7 @@ gcur.font_n_old = gcur.font_n; gcur.font_n = strdup(s); gcur.font_s = h; + gold.font_n = NULL; } else { free(s); } @@ -4588,8 +4590,10 @@ memcpy(r, q, l); r[l] = '\0'; e = elt_new(); - if (!e) + if (!e) { + free(r); return; + } e->type = STR; e->u.s = (char *) r; } ++++++ compiler_flags.patch ++++++ --- /var/tmp/diff_new_pack.cTJySS/_old 2019-11-08 15:28:21.059166837 +0100 +++ /var/tmp/diff_new_pack.cTJySS/_new 2019-11-08 15:28:21.059166837 +0100 @@ -1,8 +1,8 @@ -diff -urEbw abcm2ps-8.14.5/configure abcm2ps-8.14.5.new/configure ---- abcm2ps-8.14.5/configure 2019-07-17 09:44:10.000000000 +0200 -+++ abcm2ps-8.14.5.new/configure 2019-07-18 15:01:30.465812774 +0200 +diff -urEbw abcm2ps-8.14.6/configure abcm2ps-8.14.6.new/configure +--- abcm2ps-8.14.6/configure 2019-11-05 14:02:00.000000000 +0100 ++++ abcm2ps-8.14.6.new/configure 2019-11-08 11:51:14.147405009 +0100 @@ -5,7 +5,7 @@ - VDATE=2019-07-17 + VDATE=2019-11-05 CC=gcc -CFLAGS="-g -O2 -Wall -pipe"
