Hello community, here is the log from the commit of package abcm2ps for openSUSE:Factory checked in at 2019-03-13 09:13:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abcm2ps (Old) and /work/SRC/openSUSE:Factory/.abcm2ps.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "abcm2ps" Wed Mar 13 09:13:23 2019 rev:4 rq:684233 version:8.14.3 Changes: -------- --- /work/SRC/openSUSE:Factory/abcm2ps/abcm2ps.changes 2018-12-28 12:34:25.308001172 +0100 +++ /work/SRC/openSUSE:Factory/.abcm2ps.new.28833/abcm2ps.changes 2019-03-13 09:13:30.443397404 +0100 @@ -1,0 +2,8 @@ +Mon Mar 11 11:51:53 UTC 2019 - mvet...@suse.com + +- Update to 8.14.3: + * erroneous double '8va's on a same staff when set on combined notes/rests + * don't put two '8va's on the same staff + * loss of %%sep since previous version + +------------------------------------------------------------------- Old: ---- v8.14.2.tar.gz New: ---- v8.14.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abcm2ps.spec ++++++ --- /var/tmp/diff_new_pack.soPzz3/_old 2019-03-13 09:13:33.895397047 +0100 +++ /var/tmp/diff_new_pack.soPzz3/_new 2019-03-13 09:13:33.899397046 +0100 @@ -1,7 +1,7 @@ # # spec file for package abcm2ps # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2007 by Edgar Aichinger # # All modifications and additions to the file contributed by third parties @@ -13,12 +13,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: abcm2ps -Version: 8.14.2 +Version: 8.14.3 Release: 0 Summary: A program to typeset abc tunes into Postscript License: GPL-2.0-or-later @@ -31,10 +31,10 @@ Source3: deco-marks.fmt Source4: renaissance.fmt Source5: thinlines.fmt +BuildRequires: pkgconfig # for rst2man BuildRequires: python3-docutils # for rendering non-latin characters in Postscript output -BuildRequires: pkg-config BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(pangocairo) ++++++ v8.14.2.tar.gz -> v8.14.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.2/abcm2ps.h new/abcm2ps-8.14.3/abcm2ps.h --- old/abcm2ps-8.14.2/abcm2ps.h 2018-12-18 16:18:26.000000000 +0100 +++ new/abcm2ps-8.14.3/abcm2ps.h 2019-03-10 12:07:39.000000000 +0100 @@ -312,6 +312,7 @@ #define S_SHIFTUNISON_2 0x04000000 /* %%shiftunison 2 */ #define S_NEW_SY 0x08000000 /* staff system change (%%staves) */ #define S_RBSTART 0x10000000 // start of repeat bracket +#define S_OTTAVA 0x20000000 // ottava decoration (start or stop) struct posit_s posit; /* positions / directions */ signed char stem; /* 1 / -1 for stem up / down */ signed char combine; /* voice combine */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.2/configure new/abcm2ps-8.14.3/configure --- old/abcm2ps-8.14.2/configure 2018-12-18 16:18:26.000000000 +0100 +++ new/abcm2ps-8.14.3/configure 2019-03-10 12:07:39.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # (automatic update) -VERSION=8.14.2 -VDATE=2018-12-18 +VERSION=8.14.3 +VDATE=2019-03-10 CC=gcc CFLAGS="-g -O2 -Wall -pipe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.2/deco.c new/abcm2ps-8.14.3/deco.c --- old/abcm2ps-8.14.2/deco.c 2018-12-18 16:18:26.000000000 +0100 +++ new/abcm2ps-8.14.3/deco.c 2019-03-10 12:07:39.000000000 +0100 @@ -592,6 +592,21 @@ return; s2 = de->s; + // only one ottava per staff + if (s2->sflags & S_OTTAVA) { + struct deco_elt *de2; + + for (de2 = de->next; de2; de2 = de2->next) { + if (de2->t == de->t + && de2->s->time == s2->time + && de2->s->staff == s2->staff) { + de2->s->sflags &= ~S_OTTAVA; + de2->t = 0; + } + } + s2->sflags &= ~S_OTTAVA; + } + // if (de->start) { /* deco start */ s = de->start->s; x = s->x; @@ -673,7 +688,7 @@ float x, yc, stafft, staffb, w; int up, inv; - // don't treat here the long decorations + // don't treat here the start of long decorations if (de->flags & DE_LDST) return; if (de->start) { @@ -1146,6 +1161,7 @@ || dd->name[2] == 'b') curvoice->ottava = 0; } + s->sflags |= S_OTTAVA; } continue; case 32: /* invisible */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.2/parse.c new/abcm2ps-8.14.3/parse.c --- old/abcm2ps-8.14.2/parse.c 2018-12-18 16:18:26.000000000 +0100 +++ new/abcm2ps-8.14.3/parse.c 2019-03-10 12:07:39.000000000 +0100 @@ -5158,16 +5158,17 @@ static struct SYMBOL *process_pscomment(struct SYMBOL *s) { char w[32], *p, *q; - int lock, voice; + int voice; float h1; + int lock = 0; p = s->text + 2; /* skip '%%' */ q = p + strlen(p) - 5; - if (q < p) - return s; - lock = strncmp(q, " lock", 5) == 0; - if (lock) - *q = '\0'; + if (q > p + && strncmp(q, " lock", 5) == 0) { + lock = 1; + *q = '\0'; + } p = get_str(w, p, sizeof w); if (s->state == ABC_S_HEAD && !check_header(s)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.2/subs.c new/abcm2ps-8.14.3/subs.c --- old/abcm2ps-8.14.2/subs.c 2018-12-18 16:18:26.000000000 +0100 +++ new/abcm2ps-8.14.3/subs.c 2019-03-10 12:07:39.000000000 +0100 @@ -566,7 +566,7 @@ wi /= 2; // w = (float) wi / PG_SCALE; w = (float) wi / PANGO_SCALE; - a2b("-%.1f 0 RM ", w); + a2b(" -%.1f 0 RM", w); break; } pg_line_output(line);
