Hello community,
here is the log from the commit of package dpic for openSUSE:Factory checked in at 2012-06-26 15:17:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dpic (Old)
and /work/SRC/openSUSE:Factory/.dpic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dpic", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/dpic/dpic.changes 2012-06-13 13:10:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dpic.new/dpic.changes 2012-06-26 15:17:15.000000000 +0200
@@ -0,0 +1,5 @@
+Sun Jun 24 19:58:29 UTC 2012 - dmitry@roshchin.org
+- update to version 2012.06.20
+ * Give line attributes the same effect for pgf and pstricks ouput
+
+-------------------------------------------------------------------
Old:
----
dpic-2012.05.29.tar.gz
New:
----
dpic-2012.06.20.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dpic.spec ++++++
--- /var/tmp/diff_new_pack.s1so8y/_old 2012-06-26 15:17:17.000000000 +0200
+++ /var/tmp/diff_new_pack.s1so8y/_new 2012-06-26 15:17:17.000000000 +0200
@@ -21,7 +21,7 @@
Summary: Pic language processor
License: BSD-2-Clause
Group: Productivity/Publishing/Other
-Version: 2012.05.29
+Version: 2012.06.20
Release: 0
Source0: %name-%{version}.tar.gz
Patch0: makefile.patch
++++++ dpic-2012.05.29.tar.gz -> dpic-2012.06.20.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dpic/CHANGES new/dpic/CHANGES
--- old/dpic/CHANGES 2012-05-29 23:10:55.000000000 +0200
+++ new/dpic/CHANGES 2012-06-20 19:26:03.000000000 +0200
@@ -2,6 +2,7 @@
those shown correspond to changes (usually of documentation) not involving
functionality.
+2012 06 20 Give line attributes the same effect for pgf and pstricks ouput
2012 04 19 Error message for zero second argument to pmod(,)
2012 02 07 Fixed a mishandling of null macro arguments in loops.
2011 12 09 Fix to handle reference to invalid predefined variables gracefully.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dpic/doc/quick.pic new/dpic/doc/quick.pic
--- old/dpic/doc/quick.pic 2012-05-29 23:10:55.000000000 +0200
+++ new/dpic/doc/quick.pic 2012-06-20 19:26:03.000000000 +0200
@@ -1,6 +1,6 @@
.PS # Pic input begins with .PS
-# cct_init Version 7.22: PSTricks m4 macro settings used.
-# gen_init Version 7.22: PSTricks m4 macro settings used.
+# cct_init Version 7.3: PSTricks m4 macro settings used.
+# gen_init Version 7.3: PSTricks m4 macro settings used.
define rpoint__ {
rp_wid = last line.end.x-last line.start.x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dpic/dpic.c new/dpic/dpic.c
--- old/dpic/dpic.c 2012-05-29 23:10:55.000000000 +0200
+++ new/dpic/dpic.c 2012-06-20 19:26:03.000000000 +0200
@@ -57,7 +57,7 @@
/* Some PC versions of p2c crash on Pascal const declarations at low levels.
All consts should be in dp0.x */
-#define Version "dpic version 2012.05.29"
+#define Version "dpic version 2012.06.20"
/* UMBX distmax = 1E25; XBMU */
@@ -681,22 +681,12 @@
Char tabch, nlch, crch, etxch;
/* File names */
-FILE *input, *output, *stderr_;
-/*G asmname G*/
-/*H name H*/
-/*GH 'std_err'; HG*/
-FILE *copyin;
-/*G asmname G*/
-/*H name H*/
-/*GH 'copy_in'; HG*/
+FILE *input, *output, *stderr_; /*G asmname 'std_err'; G*/
+FILE *copyin; /*G asmname 'copy_in'; G*/
FILE *redirect;
-/*G asmname G*/
-/*H name H*/
-/*GH 'redi_rect'; HG*/
+/*G asmname 'redi_rect'; G*/
/*D log: text; D*/
-/*DG asmname GD*/
-/*DH name HD*/
-/*DGH 'log_file'; HGD*/
+/*DG asmname 'log_file'; GD*/
mstring infname; /* name of current input file */
mstring outfnam; /* name of current output file */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dpic/dpic2.c new/dpic/dpic2.c
--- old/dpic/dpic2.c 2012-05-29 23:10:55.000000000 +0200
+++ new/dpic/dpic2.c 2012-06-20 19:26:03.000000000 +0200
@@ -17,7 +17,7 @@
#include
-#define Version "dpic version 2012.05.29"
+#define Version "dpic version 2012.06.20"
/* UMBX distmax = 1E25; XBMU */
@@ -641,22 +641,12 @@
Char tabch, nlch, crch, etxch;
/* File names */
-FILE *input, *output, *stderr_;
-/*G asmname G*/
-/*H name H*/
-/*GH 'std_err'; HG*/
-FILE *copyin;
-/*G asmname G*/
-/*H name H*/
-/*GH 'copy_in'; HG*/
+FILE *input, *output, *stderr_; /*G asmname 'std_err'; G*/
+FILE *copyin; /*G asmname 'copy_in'; G*/
FILE *redirect;
-/*G asmname G*/
-/*H name H*/
-/*GH 'redi_rect'; HG*/
+/*G asmname 'redi_rect'; G*/
/*D log: text; D*/
-/*DG asmname GD*/
-/*DH name HD*/
-/*DGH 'log_file'; HGD*/
+/*DG asmname 'log_file'; GD*/
mstring infname; /* name of current input file */
mstring outfnam; /* name of current output file */
@@ -2838,14 +2828,17 @@
void svgdraw(primitive *node)
{
/* node is always <> nil */
- int lnspec;
+ int lsp;
postype X0, X1, X2;
primitive *tn;
boolean v;
double h, w, lth;
int TEMP;
- lnspec = lspec(node->spec);
+ tn = node;
+ while (tn->son != NULL)
+ tn = tn->son;
+ lsp = lspec(tn->spec);
sshade = node->shadedp;
soutline = node->outlinep;
lth = qenv(node, XLlinethick, node->lthick); /* printobject(node); */
@@ -2866,11 +2859,11 @@
initnesw();
nesw(node);
if (node->ptype == XBLOCK)
- v = drawn(node, lnspec, -1.0);
+ v = drawn(node, lsp, -1.0);
else
- v = drawn(node, lnspec, node->UU.Ubox.boxfill);
+ v = drawn(node, lsp, node->UU.Ubox.boxfill);
if (v) {
- svgfilloptions(node, lnspec, false);
+ svgfilloptions(node, lsp, false);
svgcoord("x", "y", node->aat.xpos - fabs(node->UU.Ubox.boxwidth) / 2,
node->aat.ypos + fabs(node->UU.Ubox.boxheight) / 2);
if (node->UU.Ubox.boxradius > 0.0) {
@@ -2885,8 +2878,8 @@
break;
case XLellipse:
- if (drawn(node, lnspec, node->UU.Uellipse.efill)) {
- svgfilloptions(node, lnspec, false);
+ if (drawn(node, lsp, node->UU.Uellipse.efill)) {
+ svgfilloptions(node, lsp, false);
svgcoord("cx", "cy", node->aat.xpos, node->aat.ypos);
svgparam("rx", 0.5 * fabs(node->UU.Uellipse.elwidth));
svgparam("ry", 0.5 * fabs(node->UU.Uellipse.elheight));
@@ -2896,8 +2889,8 @@
break;
case XLcircle:
- if (drawn(node, lnspec, node->UU.Ucircle.cfill)) {
- svgfilloptions(node, lnspec, false);
+ if (drawn(node, lsp, node->UU.Ucircle.cfill)) {
+ svgfilloptions(node, lsp, false);
svgcoord("cx", "cy", node->aat.xpos, node->aat.ypos);
svgparam("r", fabs(node->UU.Ucircle.radius));
svgendpath();
@@ -2906,9 +2899,8 @@
break;
case XLarc:
- if (drawn(node, lnspec, -1.0)) {
+ if (drawn(node, lsp, -1.0)) {
getlinshade(node, &tn, &sshade, &soutline, &vfill, &sfill);
- lnspec = lspec(tn->spec);
lth = qenv(tn, XLlinethick, tn->lthick);
X1 = arcstart(node);
TEMP = ahlex(node->UU.Uline.atype);
@@ -2927,7 +2919,7 @@
node->UU.Uline.endpos.ypos);
}
printf("spec);
lth = qenv(tn, XLlinethick, tn->lthick);
X0 = node->aat;
splineend = tn->UU.Uline.endpos;
@@ -2962,7 +2953,7 @@
node->UU.Uline.lfill);
spltot = primdepth(node);
splcount = spltot;
- svgfilloptions(node, lnspec, false);
+ svgfilloptions(node, lsp, false);
printf(" d=\"M ");
svgwpos(node->aat);
printf("\n C ");
@@ -3027,10 +3018,9 @@
case XLline:
case XLarrow:
case XLmove:
- if (drawn(node, lnspec, -1.0)) {
+ if (drawn(node, lsp, -1.0)) {
if (!isthen(node)) {
getlinshade(node, &tn, &sshade, &soutline, &vfill, &sfill);
- lnspec = lspec(tn->spec);
lth = qenv(tn, XLlinethick, tn->lthick);
TEMP = ahlex(tn->UU.Uline.atype);
if (TEMP == XDOUBLEHEAD || TEMP == XLEFTHEAD)
@@ -3045,13 +3035,13 @@
qenv(tn, XLarrowwid, tn->UU.Uline.width), lth,
node->UU.Uline.lfill);
if (node->son == NULL) {
- svgfilloptions(tn, lnspec, false);
+ svgfilloptions(tn, lsp, false);
svgcoord("x1", "y1", node->aat.xpos, node->aat.ypos);
svgcoord("x2", "y2", node->UU.Uline.endpos.xpos,
node->UU.Uline.endpos.ypos);
svgendpath();
} else {
- svgfilloptions(tn, lnspec, true);
+ svgfilloptions(tn, lsp, true);
printf(" points=\"");
svgwpos(node->aat);
space();
@@ -3476,7 +3466,10 @@
primitive *tn;
int TEMP, TEMP1;
- lsp = lspec(node->spec);
+ tn = node;
+ while (tn->son != NULL)
+ tn = tn->son;
+ lsp = lspec(tn->spec);
sshade = node->shadedp;
lth = qenv(node, XLlinethick, node->lthick); /* printobject(node); */
/*D if debuglevel > 0 then begin write(log,'pstdraw: ');
@@ -4031,7 +4024,10 @@
double x, y, t, r, lth;
int TEMP;
- lsp = lspec(node->spec);
+ tn = node;
+ while (tn->son != NULL)
+ tn = tn->son;
+ lsp = lspec(tn->spec);
lth = qenv(node, XLlinethick, node->lthick);
/*D if debuglevel > 0 then begin write(log,'mfpdraw: ');
snaptype(log,node^.ptype);
@@ -4131,9 +4127,6 @@
}
node->ptype = XLline; /* Do we need this anymore? */
if (splcount > 1) {
- tn = node;
- while (tn->son != NULL)
- tn = tn->son;
lth = qenv(node, XLlinethick, tn->lthick);
if (node->UU.Uline.aradius == mdistmax || splcount > 2)
pprop(node->son->UU.Uline.endpos, &node->son->aat, 1.0, 1.0, 2.0);
@@ -4642,7 +4635,10 @@
primitive *WITH, *WITH1;
int TEMP;
- lsp = lspec(node->spec);
+ tn = node;
+ while (tn->son != NULL)
+ tn = tn->son;
+ lsp = lspec(tn->spec);
lth = qenv(node, XLlinethick, node->lthick);
WITH = node;
switch (WITH->ptype) {
@@ -5297,7 +5293,10 @@
boolean v;
int TEMP;
- lsp = lspec(node->spec);
+ tn = node;
+ while (tn->son != NULL)
+ tn = tn->son;
+ lsp = lspec(tn->spec);
lth = qenv(node, XLlinethick, node->lthick);
switch (node->ptype) {
@@ -5442,9 +5441,6 @@
case XLarrow:
case XLmove:
if (drawn(node, lsp, -1.0)) {
- tn = node;
- while (tn->son != NULL)
- tn = tn->son;
lth = qenv(node, XLlinethick, tn->lthick);
if (!isthen(node)) {
getlinshade(node, &tn, &sshade, &soutline, &vfill, &sfill);
@@ -6041,7 +6037,10 @@
double h, w, x, y, lth, fill;
int TEMP;
- lsp = lspec(node->spec);
+ tn = node;
+ while (tn->son != NULL)
+ tn = tn->son;
+ lsp = lspec(tn->spec);
lth = qenv(node, XLlinethick, node->lthick); /* printobject(node); */
/*D if debuglevel > 0 then begin write(log,'psdraw: ');
snaptype(log,ptype); D*/
@@ -6147,7 +6146,6 @@
if (drawn(node, lsp, -1.0)) {
if (!isthen(node)) { /* first spline */
getlinshade(node, &tn, &sshade, &soutline, &vfill, &sfill);
- lsp = lspec(tn->spec);
lth = qenv(tn, XLlinethick, tn->lthick);
spltot = primdepth(node);
splcount = spltot;
@@ -6230,12 +6228,8 @@
case XLarrow:
case XLmove:
if (drawn(node, lsp, -1.0)) {
- tn = node;
- while (tn->son != NULL)
- tn = tn->son;
if (!isthen(node)) {
getlinshade(node, &tn, &sshade, &soutline, &vfill, &sfill);
- lsp = lspec(tn->spec);
lth = qenv(tn, XLlinethick, tn->lthick);
pssetthick(lth);
pssetcolor(soutline);
@@ -6304,7 +6298,6 @@
pswarc(node->aat, X1, X2, node->UU.Uline.aradius,
node->UU.Uline.endpos.ypos);
pssetthick(lth);
- lsp = lspec(tn->spec);
pslinearfill(node->UU.Uline.lfill, sshade);
pslineopts(lsp, node->lparam, NULL);
psendline(soutline);
@@ -6460,7 +6453,10 @@
postype tmpat, X0, X3;
int TEMP;
- lsp = lspec(node->spec);
+ tn = node;
+ while (tn->son != NULL)
+ tn = tn->son;
+ lsp = lspec(tn->spec);
lth = qenv(node, XLlinethick, node->lthick);
switch (node->ptype) {
@@ -6502,9 +6498,6 @@
case XLline:
case XLarrow:
if (drawn(node, lsp, -1.0)) {
- tn = node;
- while (tn->son != NULL)
- tn = tn->son;
if (!isthen(node)) { /* first segment */
if (drawmode == pict2e)
p2setthick(lth);
@@ -6565,9 +6558,6 @@
case XLspline:
if ((drawmode == pict2e) & drawn(node, lsp, -1.0)) {
if (!isthen(node)) { /* first spline */
- tn = node;
- while (tn->son != NULL)
- tn = tn->son;
spltot = primdepth(node);
splcount = spltot;
tmpat = node->aat;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org