Hello community, here is the log from the commit of package abcm2ps for openSUSE:Factory checked in at 2020-06-22 17:46:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abcm2ps (Old) and /work/SRC/openSUSE:Factory/.abcm2ps.new.2956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "abcm2ps" Mon Jun 22 17:46:09 2020 rev:11 rq:816280 version:8.14.9 Changes: -------- --- /work/SRC/openSUSE:Factory/abcm2ps/abcm2ps.changes 2020-02-20 14:56:31.738423288 +0100 +++ /work/SRC/openSUSE:Factory/.abcm2ps.new.2956/abcm2ps.changes 2020-06-22 17:46:15.325912798 +0200 @@ -1,0 +2,18 @@ +Mon Jun 22 08:32:55 UTC 2020 - Michael Vetter <[email protected]> + +- Update to 8.14.9: + * fix: bad natural accidental when %%MIDI temperamentequal + +------------------------------------------------------------------- +Mon Jun 22 08:32:16 UTC 2020 - Michael Vetter <[email protected]> + +- Update to 8.14.8: + * fix: no respect the width in %%staffbreak + * fix: don't draw a staff when only %%staffbreak inside + * fix: bad repeat bracket when continued on next line, line starting by a bar + * fix: bad tuplet bracket again when at end of a voice overlay sequence + * fix: bad tuplet bracket when at end of a voice overlay sequence + * handle '%%MIDI temperamentequal ' + * accept '^1' and '_1' as microtone accidentals + +------------------------------------------------------------------- Old: ---- abcm2ps-8.14.7.tar.gz New: ---- abcm2ps-8.14.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abcm2ps.spec ++++++ --- /var/tmp/diff_new_pack.S1ac9Q/_old 2020-06-22 17:46:16.489916449 +0200 +++ /var/tmp/diff_new_pack.S1ac9Q/_new 2020-06-22 17:46:16.493916461 +0200 @@ -1,7 +1,7 @@ # # spec file for package abcm2ps # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2007 by Edgar Aichinger # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: abcm2ps -Version: 8.14.7 +Version: 8.14.9 Release: 0 Summary: A program to typeset abc tunes into Postscript License: LGPL-3.0-or-later ++++++ abcm2ps-8.14.7.tar.gz -> abcm2ps-8.14.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.7/abcm2ps.h new/abcm2ps-8.14.9/abcm2ps.h --- old/abcm2ps-8.14.7/abcm2ps.h 2020-02-19 14:00:51.000000000 +0100 +++ new/abcm2ps-8.14.9/abcm2ps.h 2020-06-21 18:03:16.000000000 +0200 @@ -532,8 +532,8 @@ int dblrepbar, decoerr, dynalign, flatbeams, flatbeamgracing, infoline; int gchordbox, graceslurs, graceword,gracespace, hyphencont; int keywarn, landscape, linewarn; - int measurebox, measurefirst, measurenb, micronewps; - int oneperpage; + int measurebox, measurefirst, measurenb; + int nedo, oneperpage; #ifdef HAVE_PANGO int pango; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.7/abcparse.c new/abcm2ps-8.14.9/abcparse.c --- old/abcm2ps-8.14.7/abcparse.c 2020-02-19 14:00:51.000000000 +0100 +++ new/abcm2ps-8.14.9/abcparse.c 2020-06-21 18:03:16.000000000 +0200 @@ -1585,13 +1585,17 @@ if (microscale == 0) { d--; d += (n - 1) << 8; /* short [ (n-1) | (d-1) ] */ - for (n = 1; n < MAXMICRO; n++) { + if (d == 0) { + n = MAXMICRO - 1; + } else { + for (n = 1; n < MAXMICRO; n++) { if (parse.micro_tb[n] == d) break; if (parse.micro_tb[n] == 0) { parse.micro_tb[n] = d; break; } + } } if (n == MAXMICRO) { syntax("Too many microtone accidentals", p); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.7/configure new/abcm2ps-8.14.9/configure --- old/abcm2ps-8.14.7/configure 2020-02-19 14:00:51.000000000 +0100 +++ new/abcm2ps-8.14.9/configure 2020-06-21 18:03:16.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # (automatic update) -VERSION=8.14.7 -VDATE=2020-02-19 +VERSION=8.14.9 +VDATE=2020-06-21 CC=gcc PKG_CONFIG=pkg-config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.7/draw.c new/abcm2ps-8.14.9/draw.c --- old/abcm2ps-8.14.7/draw.c 2020-02-19 14:00:51.000000000 +0100 +++ new/abcm2ps-8.14.9/draw.c 2020-06-21 18:03:16.000000000 +0200 @@ -3,7 +3,7 @@ * * This file is part of abcm2ps. * - * Copyright (C) 1998-2019 Jean-François Moine (http://moinejf.free.fr) + * Copyright (C) 1998-2020 Jean-François Moine (http://moinejf.free.fr) * Adapted from abc2ps, Copyright (C) 1996-1998 Michael Methfessel * * This program is free software; you can redistribute it and/or modify it @@ -983,6 +983,9 @@ } a2b("%d %s%d ", n, acc_tb[acc & 0x07], d); } else { + if (acc >> 3 != 0 + && cfmt.nedo) // %%MIDI temperamentequal <nedo> + n = ((((n >> 8) + 1) * 12) - 1) * 256 + cfmt.nedo - 1; a2b("%s%d ", acc_tb[acc & 0x07], n); } } @@ -2873,10 +2876,16 @@ x1 = s1->x - 7; if (s2->dur > s2->prev->dur) { - if (s2->next) - x2 = s2->next->x - s2->next->wl - 8; - else - x2 = realwidth - 6; + sy = s2->next; + if (!sy // maybe a note in an overlay voice + || sy->time != s2->time + s2->dur) { + for (sy = s2->ts_next; sy; sy = sy->ts_next) { + if ((sy->sflags & S_SEQST) + && sy->time >= s2->time + s2->dur) + break; + } + } + x2 = sy ? sy->x - sy->wl - 5 : realwidth - 6; } else { x2 = s2->x + 2; if (s2->u.note.notes[s2->nhd].shhd > 0) @@ -4617,17 +4626,18 @@ s2 = s->prev; if (!s2) break; - x2 = s2->x; - if (s2->type != BAR) - x2 += s2->wr; + if (s2->type == BAR) + x2 = s2->x; + else + x2 = s->x - s->xmx; staff = s->staff; x = xstaff[staff]; if (x >= 0) { if (x >= x2) continue; draw_staff(staff, x, x2); + xstaff[staff] = s->x; } - xstaff[staff] = s->x; break; default: //fixme:does not work for "%%staves K: M: $" */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.7/format.c new/abcm2ps-8.14.9/format.c --- old/abcm2ps-8.14.7/format.c 2020-02-19 14:00:51.000000000 +0100 +++ new/abcm2ps-8.14.9/format.c 2020-06-21 18:03:16.000000000 +0200 @@ -95,7 +95,6 @@ {"measurefirst", &cfmt.measurefirst, FORMAT_I, 0}, {"measurefont", &cfmt.font_tb[MEASUREFONT], FORMAT_F, 2}, {"measurenb", &cfmt.measurenb, FORMAT_I, 0}, - {"micronewps", &cfmt.micronewps, FORMAT_B, 0}, {"musicfont", &cfmt.musicfont, FORMAT_S, 1}, {"musicspace", &cfmt.musicspace, FORMAT_U, 0}, {"notespacingfactor", &cfmt.notespacingfactor, FORMAT_R, 1}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.7/music.c new/abcm2ps-8.14.9/music.c --- old/abcm2ps-8.14.7/music.c 2020-02-19 14:00:51.000000000 +0100 +++ new/abcm2ps-8.14.9/music.c 2020-06-21 18:03:16.000000000 +0200 @@ -3330,6 +3330,9 @@ // if bar already, keep it in sequence voice = p_voice - voice_tb; + bar_start = p_voice->bar_start; + p_voice->bar_start = 0; + if (last_s && last_s->voice == voice && last_s->type == BAR) { p_voice->last_sym = last_s; @@ -3337,10 +3340,8 @@ continue; } - bar_start = p_voice->bar_start; if (!bar_start) continue; - p_voice->bar_start = 0; if (cursys->voice[voice].range < 0 || cursys->voice[voice].second diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.7/parse.c new/abcm2ps-8.14.9/parse.c --- old/abcm2ps-8.14.7/parse.c 2020-02-19 14:00:51.000000000 +0100 +++ new/abcm2ps-8.14.9/parse.c 2020-06-21 18:03:16.000000000 +0200 @@ -5430,6 +5430,26 @@ return s; } break; + case 'M': + if (strcmp(w, "MIDI") == 0 + && strncmp(p, "temperamentequal", 16) == 0) { + int n; + + if (cfmt.nedo) { + error(1, s, "%%%%MIDI temperamentequal redefined"); + return s; + } + p += 16; + while (isspace((unsigned char) *p)) + p++; + n = atoi(p); + if (n < 7 || n > 53) { + error(1, s, "Bad value in %%%%MIDI temperamentequal"); + return s; + } + cfmt.nedo = n; + } + break; case 'n': if (strcmp(w, "newpage") == 0) { if (epsf || !in_fname)
