SHA256
1
0
forked from pool/transfig

Update to 3.2.6a

OBS-URL: https://build.opensuse.org/package/show/Publishing/transfig?expand=0&rev=36
This commit is contained in:
Dr. Werner Fink 2017-02-02 14:06:14 +00:00 committed by Git OBS Bridge
parent 18fff3098c
commit f3339b9ae6
9 changed files with 114 additions and 95 deletions

View File

@ -5,10 +5,12 @@ Origin: http://p3f.gmxhome.de/fig2mpdf/fig2mpdf.html
diff --git a/fig2dev-3.2.6/fig2dev/dev/genpstex.c b/fig2dev-3.2.6/fig2dev/dev/genpstex.c
--- a/fig2dev-3.2.6/fig2dev/dev/genpstex.c
+++ b/fig2dev-3.2.6/fig2dev/dev/genpstex.c diff --git a/fig2dev-3.2.6a/fig2dev/dev/genpstex.c b/fig2dev-3.2.6a/fig2dev/dev/genpstex.c
@@ -68,7 +68,307 @@ extern int genpdf_end(void); /* genpdf --- a/fig2dev-3.2.6a/fig2dev/dev/genpstex.c
+++ b/fig2dev-3.2.6a/fig2dev/dev/genpstex.c
@@ -76,7 +76,307 @@ extern int genpdf_end(void); /* genpdf
extern void genps_grid(float major, float minor); extern void genps_grid(float major, float minor);
static char pstex_file[1000] = ""; static char pstex_file[1000] = "";
@ -316,7 +318,7 @@ diff --git a/fig2dev-3.2.6/fig2dev/dev/genpstex.c b/fig2dev-3.2.6/fig2dev/dev/ge
void void
genpstex_t_option(char opt, char *optarg) genpstex_t_option(char opt, char *optarg)
{ {
@@ -122,6 +422,32 @@ genpstex_option(char opt, char *optarg) @@ -130,6 +430,32 @@ genpstex_option(char opt, char *optarg)
genlatex_option(opt, optarg); genlatex_option(opt, optarg);
} }
@ -349,9 +351,9 @@ diff --git a/fig2dev-3.2.6/fig2dev/dev/genpstex.c b/fig2dev-3.2.6/fig2dev/dev/ge
struct driver dev_pstex_t = { struct driver dev_pstex_t = {
genpstex_t_option, genpstex_t_option,
genpstex_t_start, genpstex_t_start,
diff --git a/fig2dev-3.2.6/fig2dev/drivers.h b/fig2dev-3.2.6/fig2dev/drivers.h diff --git a/fig2dev-3.2.6a/fig2dev/drivers.h b/fig2dev-3.2.6a/fig2dev/drivers.h
--- a/fig2dev-3.2.6/fig2dev/drivers.h --- a/fig2dev-3.2.6a/fig2dev/drivers.h
+++ b/fig2dev-3.2.6/fig2dev/drivers.h +++ b/fig2dev-3.2.6a/fig2dev/drivers.h
@@ -32,8 +32,10 @@ extern struct driver dev_eps; @@ -32,8 +32,10 @@ extern struct driver dev_eps;
extern struct driver dev_pdf; extern struct driver dev_pdf;
extern struct driver dev_pdftex; extern struct driver dev_pdftex;
@ -379,10 +381,10 @@ diff --git a/fig2dev-3.2.6/fig2dev/drivers.h b/fig2dev-3.2.6/fig2dev/drivers.h
{"pstricks", &dev_pstricks}, {"pstricks", &dev_pstricks},
{"ptk", &dev_ptk}, {"ptk", &dev_ptk},
{"shape", &dev_shape}, {"shape", &dev_shape},
diff --git a/fig2dev-3.2.6/fig2dev/fig2dev.c b/fig2dev-3.2.6/fig2dev/fig2dev.c diff --git a/fig2dev-3.2.6a/fig2dev/fig2dev.c b/fig2dev-3.2.6a/fig2dev/fig2dev.c
--- a/fig2dev-3.2.6/fig2dev/fig2dev.c --- a/fig2dev-3.2.6a/fig2dev/fig2dev.c
+++ b/fig2dev-3.2.6/fig2dev/fig2dev.c +++ b/fig2dev-3.2.6a/fig2dev/fig2dev.c
@@ -683,6 +683,18 @@ help_msg(void) @@ -691,6 +691,18 @@ help_msg(void)
#endif /* NFSS */ #endif /* NFSS */
puts(" -p name name of the PostScript file to be overlaid"); puts(" -p name name of the PostScript file to be overlaid");
@ -401,7 +403,7 @@ diff --git a/fig2dev-3.2.6/fig2dev/fig2dev.c b/fig2dev-3.2.6/fig2dev/fig2dev.c
puts("SHAPE (ShapePar driver) Options:"); puts("SHAPE (ShapePar driver) Options:");
puts(" -n name Set basename of the macro"); puts(" -n name Set basename of the macro");
puts(" (e.g. \"face\" gives faceshape and facepar)"); puts(" (e.g. \"face\" gives faceshape and facepar)");
@@ -822,6 +834,12 @@ gendev_objects(F_compound *objects, stru @@ -830,6 +842,12 @@ gendev_objects(F_compound *objects, stru
int rec_comp(struct obj_rec *r1, struct obj_rec *r2) int rec_comp(struct obj_rec *r1, struct obj_rec *r2)
{ {
@ -414,9 +416,9 @@ diff --git a/fig2dev-3.2.6/fig2dev/fig2dev.c b/fig2dev-3.2.6/fig2dev/fig2dev.c
return (r2->depth - r1->depth); return (r2->depth - r1->depth);
} }
diff --git a/fig2dev-3.2.6/fig2mpdf/copyright.txt b/fig2dev-3.2.6/fig2mpdf/copyright.txt diff --git a/fig2dev-3.2.6a/fig2mpdf/copyright.txt b/fig2dev-3.2.6a/fig2mpdf/copyright.txt
--- a/fig2dev-3.2.6/fig2mpdf/copyright.txt --- a/fig2dev-3.2.6a/fig2mpdf/copyright.txt
+++ b/fig2dev-3.2.6/fig2mpdf/copyright.txt +++ b/fig2dev-3.2.6a/fig2mpdf/copyright.txt
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+The following files contain copyright and license info for +The following files contain copyright and license info for
+the code they contain: +the code they contain:
@ -443,9 +445,9 @@ diff --git a/fig2dev-3.2.6/fig2mpdf/copyright.txt b/fig2dev-3.2.6/fig2mpdf/copyr
+ +
+ (Author's note: the license is in the file gpl.txt, which is included + (Author's note: the license is in the file gpl.txt, which is included
+ in the archive.) + in the archive.)
diff --git a/fig2dev-3.2.6/fig2mpdf/fig2mpdf.1 b/fig2dev-3.2.6/fig2mpdf/fig2mpdf.1 diff --git a/fig2dev-3.2.6a/fig2mpdf/fig2mpdf.1 b/fig2dev-3.2.6a/fig2mpdf/fig2mpdf.1
--- a/fig2dev-3.2.6/fig2mpdf/fig2mpdf.1 --- a/fig2dev-3.2.6a/fig2mpdf/fig2mpdf.1
+++ b/fig2dev-3.2.6/fig2mpdf/fig2mpdf.1 +++ b/fig2dev-3.2.6a/fig2mpdf/fig2mpdf.1
@@ -0,0 +1,208 @@ @@ -0,0 +1,208 @@
+.TH fig2mpdf 1 "Jun 2006" "" "Including xfig figures into LaTeX documents" +.TH fig2mpdf 1 "Jun 2006" "" "Including xfig figures into LaTeX documents"
+.SH NAME +.SH NAME
@ -655,9 +657,9 @@ diff --git a/fig2dev-3.2.6/fig2mpdf/fig2mpdf.1 b/fig2dev-3.2.6/fig2mpdf/fig2mpdf
+.IR pdflatex(1) +.IR pdflatex(1)
+.IR latex(1) +.IR latex(1)
+.IR dvips(1) +.IR dvips(1)
diff --git a/fig2dev-3.2.6/fig2mpdf/fig2mpdf b/fig2dev-3.2.6/fig2mpdf/fig2mpdf diff --git a/fig2dev-3.2.6a/fig2mpdf/fig2mpdf b/fig2dev-3.2.6a/fig2mpdf/fig2mpdf
--- a/fig2dev-3.2.6/fig2mpdf/fig2mpdf --- a/fig2dev-3.2.6a/fig2mpdf/fig2mpdf
+++ b/fig2dev-3.2.6/fig2mpdf/fig2mpdf +++ b/fig2dev-3.2.6a/fig2mpdf/fig2mpdf
@@ -0,0 +1,653 @@ @@ -0,0 +1,653 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -1312,9 +1314,9 @@ diff --git a/fig2dev-3.2.6/fig2mpdf/fig2mpdf b/fig2dev-3.2.6/fig2mpdf/fig2mpdf
+} +}
+' -- $* +' -- $*
+ +
diff --git a/fig2dev-3.2.6/man/fig2dev.1.in b/fig2dev-3.2.6/man/fig2dev.1.in diff --git a/fig2dev-3.2.6a/man/fig2dev.1.in b/fig2dev-3.2.6a/man/fig2dev.1.in
--- a/fig2dev-3.2.6/man/fig2dev.1.in --- a/fig2dev-3.2.6a/man/fig2dev.1.in
+++ b/fig2dev-3.2.6/man/fig2dev.1.in +++ b/fig2dev-3.2.6a/man/fig2dev.1.in
@@ -64,8 +64,8 @@ Set the output graphics language. @@ -64,8 +64,8 @@ Set the output graphics language.
Valid languages are Valid languages are
\fBbox, cgm, dxf, epic, eepic, eepicemu, emf, eps, gbx (Gerber beta \fBbox, cgm, dxf, epic, eepic, eepicemu, emf, eps, gbx (Gerber beta
@ -1326,7 +1328,7 @@ diff --git a/fig2dev-3.2.6/man/fig2dev.1.in b/fig2dev-3.2.6/man/fig2dev.1.in
shape (LaTeX shaped paragraphs), sld (AutoCad slide format), svg (beta shape (LaTeX shaped paragraphs), sld (AutoCad slide format), svg (beta
driver), textyl, tiff, tikz, tk (tcl/tk), tpic, xbm and xpm\fR. driver), textyl, tiff, tikz, tk (tcl/tk), tpic, xbm and xpm\fR.
@@ -1148,6 +1148,61 @@ PostScript file generated using @@ -1149,6 +1149,61 @@ PostScript file generated using
.B pstex. .B pstex.
(see above) (see above)
@ -1387,8 +1389,8 @@ diff --git a/fig2dev-3.2.6/man/fig2dev.1.in b/fig2dev-3.2.6/man/fig2dev.1.in
+ +
.TP .TP
.B \-E num .B \-E num
Set encoding for latex text translation (0 no translation, 1 ISO-8859-1, 2 ISO-8859-2) Set encoding for latex text translation
@@ -1540,6 +1595,13 @@ which aren't scaled at all. @@ -1542,6 +1597,13 @@ which aren't scaled at all.
.PP .PP
Rotated text is only supported in the IBM-GL (HP/GL) and PostScript (including eps) Rotated text is only supported in the IBM-GL (HP/GL) and PostScript (including eps)
languages. languages.
@ -1402,7 +1404,7 @@ diff --git a/fig2dev-3.2.6/man/fig2dev.1.in b/fig2dev-3.2.6/man/fig2dev.1.in
.SH COPYRIGHT .SH COPYRIGHT
Copyright (c) 1991 Micah Beck Copyright (c) 1991 Micah Beck
.br .br
@@ -1622,3 +1684,7 @@ Michael Schrick (m_schrick@hotmail.com) @@ -1624,3 +1686,7 @@ Michael Schrick (m_schrick@hotmail.com)
The GBX (Gerber) driver was written by The GBX (Gerber) driver was written by
.br .br
Edward Grace (ej.grace@imperial.ac.uk). Edward Grace (ej.grace@imperial.ac.uk).

View File

@ -6,10 +6,20 @@ Bug-Debian: http://bugs.debian.org/348034
diff --git a/fig2dev-3.2.6/fig2dev/dev/genps.c b/fig2dev-3.2.6/fig2dev/dev/genps.c
--- a/fig2dev-3.2.6/fig2dev/dev/genps.c
+++ b/fig2dev-3.2.6/fig2dev/dev/genps.c diff --git a/fig2dev-3.2.6a/fig2dev/dev/genps.c b/fig2dev-3.2.6a/fig2dev/dev/genps.c
@@ -190,6 +190,31 @@ char *fill_def[NUMPATTERNS] = { --- a/fig2dev-3.2.6a/fig2dev/dev/genps.c
+++ b/fig2dev-3.2.6a/fig2dev/dev/genps.c
@@ -140,7 +140,6 @@ static void convert_xpm_colors(unsigned
static void genps_itp_spline(F_spline *s);
static void genps_ctl_spline(F_spline *s);
-static int removestr(char *buf, char *str, int *len);
#define SHADEVAL(F) 1.0*(F)/(NUMSHADES-1)
#define TINTVAL(F) 1.0*(F-NUMSHADES+1)/NUMTINTS
@@ -204,6 +203,31 @@ char *fill_def[NUMPATTERNS] = {
FILL_PAT21,FILL_PAT22, FILL_PAT21,FILL_PAT22,
}; };
@ -41,7 +51,7 @@ diff --git a/fig2dev-3.2.6/fig2dev/dev/genps.c b/fig2dev-3.2.6/fig2dev/dev/genps
static double scalex, scaley; static double scalex, scaley;
static double origx, origy; static double origx, origy;
static double userorigx, userorigy; static double userorigx, userorigy;
@@ -772,6 +797,10 @@ genps_start(F_compound *objects) @@ -786,6 +810,10 @@ genps_start(F_compound *objects)
/* (rotation and y flipping is done in %%BeginPageSetup area */ /* (rotation and y flipping is done in %%BeginPageSetup area */
if (pats_used) { if (pats_used) {
int i; int i;
@ -52,7 +62,7 @@ diff --git a/fig2dev-3.2.6/fig2dev/dev/genps.c b/fig2dev-3.2.6/fig2dev/dev/genps
/* only define the patterns that are used */ /* only define the patterns that are used */
for (i=0; i<NUMPATTERNS; i++) for (i=0; i<NUMPATTERNS; i++)
if (pattern_used[i]) if (pattern_used[i])
@@ -933,9 +962,6 @@ genps_grid(float major, float minor) @@ -947,9 +975,6 @@ genps_grid(float major, float minor)
fprintf(tfp,"%% Grid\n"); fprintf(tfp,"%% Grid\n");
fprintf(tfp,"0.5 setgray\n"); fprintf(tfp,"0.5 setgray\n");
@ -62,7 +72,7 @@ diff --git a/fig2dev-3.2.6/fig2dev/dev/genps.c b/fig2dev-3.2.6/fig2dev/dev/genps
/* first the vertical lines */ /* first the vertical lines */
fprintf(tfp,"%% Vertical\n"); fprintf(tfp,"%% Vertical\n");
for (x = lx; x <= ux; x += m) { for (x = lx; x <= ux; x += m) {
@@ -984,9 +1010,6 @@ genps_grid(float major, float minor) @@ -998,9 +1023,6 @@ genps_grid(float major, float minor)
} }
draw_gridline(lx, y, ux, y); draw_gridline(lx, y, ux, y);
} }
@ -72,7 +82,7 @@ diff --git a/fig2dev-3.2.6/fig2dev/dev/genps.c b/fig2dev-3.2.6/fig2dev/dev/genps
} }
static void static void
@@ -1276,22 +1299,6 @@ set_linewidth(double w) @@ -1290,22 +1312,6 @@ set_linewidth(double w)
} }
} }
@ -80,7 +90,7 @@ diff --git a/fig2dev-3.2.6/fig2dev/dev/genps.c b/fig2dev-3.2.6/fig2dev/dev/genps
-removestr(char *buf, char *str, int *len) -removestr(char *buf, char *str, int *len)
-{ -{
- int slen = strlen(str)-1; - int slen = strlen(str)-1;
- int i, found=0; - int found=0;
- char *cp = buf; - char *cp = buf;
- -
- while (cp=strstr(buf,str)) { - while (cp=strstr(buf,str)) {
@ -95,7 +105,7 @@ diff --git a/fig2dev-3.2.6/fig2dev/dev/genps.c b/fig2dev-3.2.6/fig2dev/dev/genps
void void
genps_line(F_line *l) genps_line(F_line *l)
{ {
@@ -1672,11 +1679,6 @@ genps_line(F_line *l) @@ -1686,11 +1692,6 @@ genps_line(F_line *l)
/* but flush buffer first */ /* but flush buffer first */
fflush(tfp); fflush(tfp);
while ((len = read(fileno(picf),buf,sizeof(buf))) > 0) { while ((len = read(fileno(picf),buf,sizeof(buf))) > 0) {
@ -107,7 +117,7 @@ diff --git a/fig2dev-3.2.6/fig2dev/dev/genps.c b/fig2dev-3.2.6/fig2dev/dev/genps
write(fileno(tfp),buf,len); write(fileno(tfp),buf,len);
} }
close_picfile(picf,filtype); close_picfile(picf,filtype);
@@ -2408,27 +2410,22 @@ fill_area(int fill, int pen_color, int f @@ -2422,27 +2423,22 @@ fill_area(int fill, int pen_color, int f
else { else {
/* one of the patterns */ /* one of the patterns */
int patnum = fill-NUMSHADES-NUMTINTS+1; int patnum = fill-NUMSHADES-NUMTINTS+1;
@ -143,9 +153,9 @@ diff --git a/fig2dev-3.2.6/fig2dev/dev/genps.c b/fig2dev-3.2.6/fig2dev/dev/genps
} }
} }
diff --git a/fig2dev-3.2.6/fig2dev/dev/psprolog.h b/fig2dev-3.2.6/fig2dev/dev/psprolog.h diff --git a/fig2dev-3.2.6a/fig2dev/dev/psprolog.h b/fig2dev-3.2.6a/fig2dev/dev/psprolog.h
--- a/fig2dev-3.2.6/fig2dev/dev/psprolog.h --- a/fig2dev-3.2.6a/fig2dev/dev/psprolog.h
+++ b/fig2dev-3.2.6/fig2dev/dev/psprolog.h +++ b/fig2dev-3.2.6a/fig2dev/dev/psprolog.h
@@ -39,553 +39,1003 @@ $F2psDict /mtrx matrix put\n\ @@ -39,553 +39,1003 @@ $F2psDict /mtrx matrix put\n\
4 -2 roll mul srgb} bind def\n\ 4 -2 roll mul srgb} bind def\n\
" "

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a3d17eda41d6733af44fd88c18e89e0492b9ef83f05c260f80fd71970eaaec0
size 406288

3
fig2dev-3.2.6a.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5e61a3d9a4f83db4b3199ee82dd54bb65b544369f1e8e38a2606c44cf71667a7
size 507820

View File

@ -1,23 +1,22 @@
--- ---
fig2dev/dev/genps.c | 26 +++++++++++++++++++++++--- fig2dev/dev/genps.c | 26 +++++++++++++++++++++++---
fig2dev/dev/genpstex.c | 8 ++++++-- fig2dev/dev/genpstex.c | 8 ++++++--
fig2dev/dev/gensvg.c | 8 +++++---
fig2dev/fig2ps2tex.csh | 2 +- fig2dev/fig2ps2tex.csh | 2 +-
fig2dev/getopt.c | 10 ++++++++++ fig2dev/getopt.c | 10 ++++++++++
transfig/transfig.c | 2 ++ transfig/transfig.c | 2 ++
6 files changed, 47 insertions(+), 9 deletions(-) 5 files changed, 42 insertions(+), 6 deletions(-)
--- fig2dev/dev/genps.c --- fig2dev/dev/genps.c
+++ fig2dev/dev/genps.c 2016-09-22 12:48:10.157220393 +0000 +++ fig2dev/dev/genps.c 2017-02-02 13:47:11.888588548 +0000
@@ -48,6 +48,7 @@ @@ -56,6 +56,7 @@
#include <pwd.h> #include <pwd.h>
#endif #endif
#include <locale.h> #include <locale.h>
+#include <langinfo.h> +#include <langinfo.h>
#include "bool.h"
#include "pi.h"
/* for the xpm package */ @@ -801,8 +802,9 @@ genps_start(F_compound *objects)
#ifdef HAVE_X11_XPM_H
@@ -787,8 +788,9 @@ genps_start(F_compound *objects)
fprintf(tfp, "%s\n", SPLINE_PS); fprintf(tfp, "%s\n", SPLINE_PS);
#ifdef I18N #ifdef I18N
if (support_i18n && iso_text_exist(objects)) { if (support_i18n && iso_text_exist(objects)) {
@ -28,7 +27,7 @@
FILE *fp; FILE *fp;
libdir = getenv("FIG2DEV_LIBDIR"); libdir = getenv("FIG2DEV_LIBDIR");
#ifdef I18N_DATADIR #ifdef I18N_DATADIR
@@ -796,16 +798,34 @@ genps_start(F_compound *objects) @@ -810,16 +812,34 @@ genps_start(F_compound *objects)
libdir = I18N_DATADIR; libdir = I18N_DATADIR;
#endif #endif
locale = setlocale(LC_CTYPE, NULL); locale = setlocale(LC_CTYPE, NULL);
@ -66,16 +65,16 @@
if (strstr(str, "CompositeRoman")) enable_composite_font = true; if (strstr(str, "CompositeRoman")) enable_composite_font = true;
fputs(str, tfp); fputs(str, tfp);
--- fig2dev/dev/genpstex.c --- fig2dev/dev/genpstex.c
+++ fig2dev/dev/genpstex.c 2016-09-22 12:51:47.193159929 +0000 +++ fig2dev/dev/genpstex.c 2017-02-02 13:47:38.580050694 +0000
@@ -37,6 +37,7 @@ @@ -44,6 +44,7 @@
* Jose Alberto. #include <stdio.h>
*/ #include <string.h>
#include <ctype.h>
+#include <sys/stat.h> +#include <sys/stat.h>
#include "bool.h"
#include "fig2dev.h" #include "fig2dev.h"
#include "object.h" @@ -61,10 +62,13 @@ extern void
#include "texfonts.h"
@@ -53,10 +54,13 @@ extern void
genps_spline(F_spline *s), genps_spline(F_spline *s),
genlatex_option(char opt, char *optarg), genlatex_option(char opt, char *optarg),
genlatex_text(F_text *t), genlatex_text(F_text *t),
@ -91,25 +90,8 @@
extern void genpdf_option(char opt, char *optarg); /* genpdf.c */ extern void genpdf_option(char opt, char *optarg); /* genpdf.c */
extern void genpdf_start(F_compound *objects); /* genpdf.c */ extern void genpdf_start(F_compound *objects); /* genpdf.c */
--- fig2dev/dev/gensvg.c
+++ fig2dev/dev/gensvg.c 2016-09-22 12:54:57.341602013 +0000
@@ -800,9 +800,11 @@ gensvg_text(F_text *t)
x, y, degrees(t->angle));
x = y = 0;
}
- fprintf(tfp, "<text xml:space=\"preserve\" x=\"%d\" y=\"%d\" fill=\"#%6.6x\" font-family=\"%s\" "\
- "font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\">",
- x, y, rgbColorVal(t->color), family[t->font / 4],
+ fprintf(tfp,
+ "<text xml:space=\"preserve\" x=\"%d\" y=\"%d\" fill=\"#%6.6x\" font-family=\"%s\" ",
+ x, y, rgbColorVal(t->color), family[t->font / 4]);
+ fprintf(tfp,
+ "font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\">",
( (t->font % 2 == 0 || t->font >31) ? "normal" : "italic"),
( (t->font % 4 < 2 || t->font >31) ? "normal" : "bold"), (int) (ceil(t->size * 12 * mag)),
anchor[t->type]);
--- fig2dev/fig2ps2tex.csh --- fig2dev/fig2ps2tex.csh
+++ fig2dev/fig2ps2tex.csh 2016-09-22 12:58:21.805775751 +0000 +++ fig2dev/fig2ps2tex.csh 2017-02-02 13:43:20.089154382 +0000
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# #
# 2016-07-07 Thomas Loimer # 2016-07-07 Thomas Loimer
@ -120,7 +102,7 @@
set xsp = `echo "3k $bbox[4] $bbox[2] - 72 / p" | dc` set xsp = `echo "3k $bbox[4] $bbox[2] - 72 / p" | dc`
--- fig2dev/getopt.c --- fig2dev/getopt.c
+++ fig2dev/getopt.c 2016-09-22 13:00:51.710970183 +0000 +++ fig2dev/getopt.c 2017-02-02 13:43:20.089154382 +0000
@@ -45,6 +45,7 @@ static char sccsfid[] = "@(#) getopt.c 5 @@ -45,6 +45,7 @@ static char sccsfid[] = "@(#) getopt.c 5
#define EMSG "" #define EMSG ""
#define ENDARGS "--" #define ENDARGS "--"
@ -143,7 +125,7 @@
+#endif +#endif
+ +
--- transfig/transfig.c --- transfig/transfig.c
+++ transfig/transfig.c 2016-09-22 13:02:04.917599987 +0000 +++ transfig/transfig.c 2017-02-02 13:43:20.089154382 +0000
@@ -26,6 +26,8 @@ @@ -26,6 +26,8 @@
#include <stdio.h> #include <stdio.h>

View File

@ -1,12 +1,12 @@
Index: transfig.3.2.5e/fig2dev/read1_3.c Index: transfig.3.2.5e/fig2dev/read1_3.c
=================================================================== ===================================================================
--- ---
fig2dev-3.2.6/fig2dev/alloc.h | 20 ++++++++++---------- fig2dev-3.2.6a/fig2dev/alloc.h | 20 ++++++++++----------
fig2dev-3.2.6/fig2dev/read1_3.c | 2 ++ fig2dev-3.2.6a/fig2dev/read1_3.c | 2 ++
2 files changed, 12 insertions(+), 10 deletions(-) 2 files changed, 12 insertions(+), 10 deletions(-)
--- fig2dev-3.2.6/fig2dev/alloc.h --- fig2dev-3.2.6a/fig2dev/alloc.h
+++ fig2dev-3.2.6/fig2dev/alloc.h 2016-09-22 13:09:20.789406849 +0000 +++ fig2dev-3.2.6a/fig2dev/alloc.h 2017-02-02 13:53:24.529089166 +0000
@@ -13,15 +13,15 @@ @@ -13,15 +13,15 @@
* notice remain intact. * notice remain intact.
*/ */
@ -33,9 +33,9 @@ Index: transfig.3.2.5e/fig2dev/read1_3.c
+#define Arrow_malloc(z) z = (F_arrow*)calloc(ARROW_SIZE,1) +#define Arrow_malloc(z) z = (F_arrow*)calloc(ARROW_SIZE,1)
extern char Err_mem[]; extern char Err_mem[];
--- fig2dev-3.2.6/fig2dev/read1_3.c --- fig2dev-3.2.6a/fig2dev/read1_3.c
+++ fig2dev-3.2.6/fig2dev/read1_3.c 2016-09-22 13:10:28.012139567 +0000 +++ fig2dev-3.2.6a/fig2dev/read1_3.c 2017-02-02 13:53:24.529089166 +0000
@@ -334,6 +334,7 @@ read_lineobject(FILE *fp) @@ -343,6 +343,7 @@ read_lineobject(FILE *fp)
l->back_arrow = NULL; l->back_arrow = NULL;
l->next = NULL; l->next = NULL;
l->points = Point_malloc(p); l->points = Point_malloc(p);
@ -43,7 +43,7 @@ Index: transfig.3.2.5e/fig2dev/read1_3.c
n = fscanf(fp, " %d %d %d %lf %d %d %d %d %d %d", &t, n = fscanf(fp, " %d %d %d %lf %d %d %d %d %d %d", &t,
&l->style, &l->thickness, &l->style_val, &l->style, &l->thickness, &l->style_val,
&f, &b, &h, &w, &p->x, &p->y); &f, &b, &h, &w, &p->x, &p->y);
@@ -392,6 +393,7 @@ read_splineobject(FILE *fp) @@ -401,6 +402,7 @@ read_splineobject(FILE *fp)
s->controls = NULL; s->controls = NULL;
s->next = NULL; s->next = NULL;
s->points = Point_malloc(p); s->points = Point_malloc(p);

View File

@ -3,8 +3,8 @@
1 file changed, 8 insertions(+), 2 deletions(-) 1 file changed, 8 insertions(+), 2 deletions(-)
--- fig2dev/dev/readeps.c --- fig2dev/dev/readeps.c
+++ fig2dev/dev/readeps.c 2016-09-22 13:08:15.002647120 +0000 +++ fig2dev/dev/readeps.c 2017-02-02 13:52:46.733848874 +0000
@@ -66,16 +66,22 @@ read_eps_pdf(FILE *file, int filetype, F @@ -75,16 +75,22 @@ read_eps_pdf(FILE *file, int filetype, F
while (fgets(buf, 512, file) != NULL) { while (fgets(buf, 512, file) != NULL) {
/* look for /MediaBox for pdf file */ /* look for /MediaBox for pdf file */
if (pdf_flag) { if (pdf_flag) {

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Thu Feb 2 13:44:43 UTC 2017 - werner@suse.de
- Update to fig2dev version 3.2.6a (Patchlevel 6a (January 2017))
NEW FEATURES:
o Distribute transfig.pdf. No need to build it from the TeX sources.
o Enable reproducible build for svg output.
o Set the creator to fig2dev, not to the path by which fig2dev is
invoked.
BUGS FIXED:
Ticket numbers refer to https://sourceforge.net/p/mcj/tickets/#.
o The svg output now produces correct patterns and pie-wege arcs.
Property names instead of style attributes are used. Hollow arrow
heads are really hollow, not filled with white. In the PostScript
output, this might also clip a bit of the filling underneath an arrow.
o tikz output: Re-use \dimen \XFigu if it is already defined. Ticket #3.
o tikz output: A pattern in an object with line width zero and the
stroke color equal to the fill color would produce a white fill.
The tikz output now does not try to be smart and puts a pattern, even
if the result is equal to a solid fill. Ticket #1.
o pict2e output: Standalone tex-files always include color.sty. #2.
o pict2e output: A pattern with stroke color equal to fill color is
rendered as a solid fill.
o Compiles when gnu iconv and standard iconv are present.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 23 12:04:22 UTC 2016 - werner@suse.de Fri Sep 23 12:04:22 UTC 2016 - werner@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package transfig # spec file for package transfig
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -51,13 +51,13 @@ Requires: ghostscript-fonts-std
Requires: ghostscript-library Requires: ghostscript-library
Requires: netpbm Requires: netpbm
Requires: texlive-epstopdf Requires: texlive-epstopdf
Version: 3.2.6 Version: 3.2.6a
Release: 0 Release: 0
Summary: Graphic Converter Summary: Graphic Converter
License: MIT License: MIT
Group: Productivity/Graphics/Convertors Group: Productivity/Graphics/Convertors
Source: http://sourceforge.net/projects/mcj/files/mcj-source/fig2dev-%{version}.tar.xz Source: http://sourceforge.net/projects/mcj/files/mcj-source/fig2dev-%{version}.tar.xz
Patch0: transfig-%{version}.dif Patch0: transfig-3.2.6.dif
Patch2: transfig.3.2.5-binderman.dif Patch2: transfig.3.2.5-binderman.dif
Patch3: transfig.3.2.5d-mediaboxrealnb.dif Patch3: transfig.3.2.5d-mediaboxrealnb.dif
Patch4: transfig-fix-afl.patch Patch4: transfig-fix-afl.patch