rpm/transfig
SHA256
1
0
Fork 0
forked from pool/transfig
Code Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing/transfig?expand=0&rev=7
This commit is contained in:
Dr. Werner Fink 2009-12-16 10:22:24 +00:00 committed by Git OBS Bridge
parent b67633ffac
commit dfc1093522
7 changed files with 83 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
transfig.3.2.5-binderman.dif Normal file
View File

@ -0,0 +1,10 @@
--- transfig/sys.c
+++ transfig/sys.c 2009-10-09 14:17:09.932073007 +0200
@@ -37,6 +37,7 @@ char *sysls()
i += 1;
c = fgetc(ls);
}
+ pclose(ls);
sysbuf[i] = '\0';
return sysbuf;
}

3
transfig.3.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:91473facbbae71f27facb68da6f23f0caae887ecae525e5dcf7e72c23c90c613
size 313498

23
transfig.3.2.5-cups.dif → transfig.3.2.5a-cups.dif
View File

@ -1,6 +1,6 @@
--- fig2dev/dev/genps.c --- fig2dev/dev/genps.c
+++ fig2dev/dev/genps.c 2008-10-08 15:27:05.095587461 +0200 +++ fig2dev/dev/genps.c 2008-10-08 13:27:05.000000000 +0000
@@ -686,6 +686,8 @@ F_compound *objects; @@ -661,6 +661,8 @@ F_compound *objects;
height = userury-userlly+1; height = userury-userlly+1;
} }
@ -9,7 +9,7 @@
/* only include a pagesize command if PS */ /* only include a pagesize command if PS */
if (!epsflag && !pdfflag) { if (!epsflag && !pdfflag) {
/* add comment for ghostview to recognize the page size */ /* add comment for ghostview to recognize the page size */
@@ -694,6 +696,9 @@ F_compound *objects; @@ -669,6 +671,9 @@ F_compound *objects;
for (i=strlen(psize)-1; i>=0; i--) for (i=strlen(psize)-1; i>=0; i--)
psize[i] = tolower(psize[i]); psize[i] = tolower(psize[i]);
fprintf(tfp, "%%%%DocumentPaperSizes: %s\n",psize); fprintf(tfp, "%%%%DocumentPaperSizes: %s\n",psize);
@ -19,7 +19,7 @@
fprintf(tfp, "%%%%BeginSetup\n"); fprintf(tfp, "%%%%BeginSetup\n");
fprintf(tfp, "[{\n"); fprintf(tfp, "[{\n");
fprintf(tfp, "%%%%BeginFeature: *PageRegion %s\n", papersize); fprintf(tfp, "%%%%BeginFeature: *PageRegion %s\n", papersize);
@@ -711,10 +716,6 @@ F_compound *objects; @@ -686,10 +691,6 @@ F_compound *objects;
} }
@ -30,22 +30,11 @@
/* if the user wants an ASCII preview, route the rest of the eps to a temp file */ /* if the user wants an ASCII preview, route the rest of the eps to a temp file */
if (asciipreview) { if (asciipreview) {
saveofile = tfp; saveofile = tfp;
@@ -753,6 +754,7 @@ F_compound *objects; @@ -729,6 +730,7 @@ F_compound *objects;
fprintf(tfp,"%%%%BeginProlog\n");
if (pats_used) if (pats_used)
fprintf(tfp,"/MyAppDict 100 dict dup begin def\n"); fprintf(tfp,"/MyAppDict 100 dict dup begin def\n");
+ fprintf(tfp, "%%%%BeginProlog\n"); + fprintf(tfp, "%%%%BeginProlog\n");
fprintf(tfp, "%s", BEGIN_PROLOG1); fprintf(tfp, "%s", BEGIN_PROLOG1);
/* define the standard colors */ /* define the standard colors */
genps_std_colors(); genps_std_colors();
@@ -870,8 +872,10 @@ F_compound *objects;
if (multi_page) {
/* reset the matrix for multipage mode */
fprintf(tfp, "initmatrix\n");
+ fprintf(tfp, "%%%%EndProlog\n");
} else {
fprintf(tfp, " %.5f %.5f sc\n", scalex, scaley );
+ fprintf(tfp, "%%%%EndProlog\n");
if (!epsflag) {
fprintf(tfp,"%%%%Page: 1 1\n");
fprintf(tfp, "%%%%BeginPageSetup\n");

54
transfig.3.2.5.dif → transfig.3.2.5a.dif
View File

@ -1,5 +1,5 @@
--- Imakefile --- Imakefile
+++ Imakefile 2006-07-31 19:14:30.000000000 +0200 +++ Imakefile 2006-07-31 17:14:30.000000000 +0000
@@ -1,7 +1,3 @@ @@ -1,7 +1,3 @@
-#ifndef XCOMM -#ifndef XCOMM
-#define XCOMM # -#define XCOMM #
@ -17,7 +17,7 @@
SUBDIRS = fig2dev transfig SUBDIRS = fig2dev transfig
MakeSubdirs($(SUBDIRS)) MakeSubdirs($(SUBDIRS))
--- doc/manual/Makefile --- doc/manual/Makefile
+++ doc/manual/Makefile 2007-07-24 17:30:26.607457000 +0200 +++ doc/manual/Makefile 2007-07-24 15:30:27.000000000 +0000
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
# TransFig makefile # TransFig makefile
# #
@ -45,7 +45,7 @@
+ pdflatex manual.tex + pdflatex manual.tex
+ pdflatex manual.tex + pdflatex manual.tex
--- fig2dev/Imakefile --- fig2dev/Imakefile
+++ fig2dev/Imakefile 2007-07-24 17:04:29.213266000 +0200 +++ fig2dev/Imakefile 2007-07-24 15:04:29.000000000 +0000
@@ -34,7 +34,7 @@ XCOMM ****** @@ -34,7 +34,7 @@ XCOMM ******
XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
XCOMM and installed xfig. XCOMM and installed xfig.
@ -114,7 +114,7 @@
install.all:: install.all::
--- fig2dev/fig2dev.c --- fig2dev/fig2dev.c
+++ fig2dev/fig2dev.c 2007-07-24 17:08:44.764538000 +0200 +++ fig2dev/fig2dev.c 2007-07-24 15:08:45.000000000 +0000
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
#include <sys/types.h> #include <sys/types.h>
#endif #endif
@ -147,7 +147,7 @@
setmode(1,O_BINARY); /* stdout is binary */ setmode(1,O_BINARY); /* stdout is binary */
#endif #endif
--- fig2dev/fig2dev.h --- fig2dev/fig2dev.h
+++ fig2dev/fig2dev.h 2007-07-24 17:09:55.464084000 +0200 +++ fig2dev/fig2dev.h 2007-07-24 15:09:55.000000000 +0000
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#include <sys/file.h> #include <sys/file.h>
#include <signal.h> #include <signal.h>
@ -166,7 +166,7 @@
# else # else
# include <strings.h> # include <strings.h>
--- fig2dev/fig2ps2tex.script --- fig2dev/fig2ps2tex.script
+++ fig2dev/fig2ps2tex.script 2006-07-31 18:26:56.000000000 +0200 +++ fig2dev/fig2ps2tex.script 2006-07-31 16:26:56.000000000 +0000
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
# Fig2ps2tex - generate a TeX file for including a PostScript file # Fig2ps2tex - generate a TeX file for including a PostScript file
# involves calculating the bounding box from fig2ps output # involves calculating the bounding box from fig2ps output
@ -176,7 +176,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 2006-07-31 18:26:56.000000000 +0200 +++ fig2dev/getopt.c 2006-07-31 16:26:56.000000000 +0000
@@ -35,6 +35,7 @@ static char sccsfid[] = "@(#) getopt.c 5 @@ -35,6 +35,7 @@ static char sccsfid[] = "@(#) getopt.c 5
#define EMSG "" #define EMSG ""
#define ENDARGS "--" #define ENDARGS "--"
@ -208,7 +208,7 @@
+} +}
+#endif +#endif
--- fig2dev/dev/genps.c --- fig2dev/dev/genps.c
+++ fig2dev/dev/genps.c 2007-07-24 17:15:35.828409000 +0200 +++ fig2dev/dev/genps.c 2007-07-24 15:15:36.000000000 +0000
@@ -37,6 +37,8 @@ @@ -37,6 +37,8 @@
*/ */
@ -218,7 +218,7 @@
#include "fig2dev.h" #include "fig2dev.h"
#include "object.h" #include "object.h"
#include "bound.h" #include "bound.h"
@@ -809,25 +811,46 @@ F_compound *objects; @@ -772,25 +774,46 @@ 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)) {
@ -271,7 +271,7 @@
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 2008-04-25 16:01:41.639614807 +0200 +++ fig2dev/dev/genpstex.c 2008-04-25 14:01:42.000000000 +0000
@@ -64,10 +64,13 @@ extern void @@ -64,10 +64,13 @@ extern void
genps_spline (), genps_spline (),
genlatex_option (), genlatex_option (),
@ -288,41 +288,25 @@
static char pstex_file[1000] = ""; static char pstex_file[1000] = "";
@@ -85,7 +88,6 @@ void genpstex_t_start(objects)
F_compound *objects;
{
/* Put PostScript Image if any*/
-fprintf(stderr,"here pstex_file[0] = %d\n",pstex_file[0]);
if (pstex_file[0] != '\0') {
fprintf(tfp, "\\begin{picture}(0,0)%%\n");
/* newer includegraphics directive suggested by Stephen Harker 1/13/99 */
@@ -98,7 +100,6 @@ fprintf(stderr,"here pstex_file[0] = %d\
#else
fprintf(tfp, "\\special{psfile=%s}%%\n",pstex_file);
#endif
-fprintf(stderr,"end picture\n");
fprintf(tfp, "\\end{picture}%%\n");
}
genlatex_start(objects);
--- fig2dev/dev/gensvg.c --- fig2dev/dev/gensvg.c
+++ fig2dev/dev/gensvg.c 2007-11-05 15:09:49.134626000 +0100 +++ fig2dev/dev/gensvg.c 2009-12-14 13:29:42.091429154 +0000
@@ -802,9 +802,11 @@ gensvg_text (t) @@ -811,9 +811,11 @@ gensvg_text (t)
x, y, degrees (t->angle)); x, y, degrees (t->angle));
x = y = 0; x = y = 0;
} }
- fprintf (tfp, "<text xml:space=\"preserve\" x=\"%d\" y=\"%d\" stroke=\"#%6.6x\" fill=\"#%6.6x\" font-family=\"%s\" "\ - 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\">", - "font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\">",
- x, y, rgbColorVal (t->color), rgbColorVal (t->color), family[t->font / 4], - x, y, rgbColorVal (t->color), family[t->font / 4],
+ fprintf (tfp, + fprintf (tfp,
+ "<text xml:space=\"preserve\" x=\"%d\" y=\"%d\" stroke=\"#%6.6x\" fill=\"#%6.6x\" font-family=\"%s\" ", + "<text xml:space=\"preserve\" x=\"%d\" y=\"%d\" fill=\"#%6.6x\" font-family=\"%s\" ",
+ x, y, rgbColorVal (t->color), rgbColorVal (t->color), family[t->font / 4]); + x, y, rgbColorVal (t->color), family[t->font / 4]);
+ fprintf (tfp, + fprintf (tfp,
+ "font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\">", + "font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\">",
( (t->font % 2 == 0 || t->font >31) ? "normal" : "italic"), ( (t->font % 2 == 0 || t->font >31) ? "normal" : "italic"),
( (t->font % 4 < 2 || t->font >31) ? "normal" : "bold"), (int) (ceil (t->size * 12 * mag)), ( (t->font % 4 < 2 || t->font >31) ? "normal" : "bold"), (int) (ceil (t->size * 12 * mag)),
anchor[t->type]); anchor[t->type]);
--- transfig/Imakefile --- transfig/Imakefile
+++ transfig/Imakefile 2006-07-31 18:26:56.000000000 +0200 +++ transfig/Imakefile 2006-07-31 16:26:56.000000000 +0000
@@ -32,7 +32,7 @@ XCOMM Uncomment the USELATEX2E flag to u @@ -32,7 +32,7 @@ XCOMM Uncomment the USELATEX2E flag to u
XCOMM \\usepackage{} command for LaTeX2e. XCOMM \\usepackage{} command for LaTeX2e.
XCOMM The default is to use \\documentstyle{} for LaTeX209. XCOMM The default is to use \\documentstyle{} for LaTeX209.
@ -333,7 +317,7 @@
XCOMM ******* DON'T CHANGE ANYTHING BELOW THIS POINT ******* XCOMM ******* DON'T CHANGE ANYTHING BELOW THIS POINT *******
--- transfig/sys.c --- transfig/sys.c
+++ transfig/sys.c 2006-07-31 18:26:56.000000000 +0200 +++ transfig/sys.c 2006-07-31 16:26:56.000000000 +0000
@@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
*/ */
@ -344,7 +328,7 @@
#define MAXSYS 10000 #define MAXSYS 10000
--- transfig/transfig.c --- transfig/transfig.c
+++ transfig/transfig.c 2006-07-31 18:26:56.000000000 +0200 +++ transfig/transfig.c 2006-07-31 16:26:56.000000000 +0000
@@ -25,6 +25,8 @@ @@ -25,6 +25,8 @@
*/ */

3
transfig.3.2.5a.tar.bz2 Normal file
View File

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

39
transfig.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Mon Dec 14 15:05:23 CET 2009 - werner@suse.de
- Update to transfig version 3.2.5a
* 22 new arrowhead types
* HTML map now produces reference to .png file instead of .gif
* CreationDate in pictex output was either wrong or caused segfault
* bugs fixed in SVG Driver:
- blue component of shaded colors was always zero
- line protruding beyond arrowhead on long arrows
- wrong position of back arrowhead on double-headed arrows
- fill patterns either missing or using incorrect linewidth
- lowercase greek phi did not match its X11 counterpart
from Martin Kroeker
* dubious printf(j++,j++) in MP driver
* missing #includes in MP driver
* added !defined(__FreeBSD) to fig2dev.h def for sys_nerr and errno
From Eric Scott
* added -quiet options to giftopnm and ppmtopcs in reading GIF files
From Eric Scott
* Typo in LaTeX driver when generating arc-box. "iut" should be "put"
* extraneous stroke:black in svg header removed along with stroke color
for text, since the text fill color does the whole job
* fig2dev produces more correctly structured PostScript. Files get printed via
CUPS on PostScript printers. When viewing a .ps-file in gv you can go to the
last page and back and to the last page again without getting PostScript errors.
From Ronald Lembcke
* Renamed the macro \SetFigFont to \SetFigFontNFSS if NFSS is #defined to alleviate
some problems. From Roland Rosenfeld.
* Grid in metric mode was incorrectly scaled
* Removes any %EOF or %%EOF from imported EPS pictures before exporting.
Also doesn't add %EOF when importing JPEG file now.
* Missing call to get local time before converting to string in genpictex.c
-------------------------------------------------------------------
Fri Oct 9 14:18:53 CEST 2009 - werner@suse.de
- Yet an other David Binderman bug (bnc#544938)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de

11
transfig.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package transfig (Version 3.2.5) # spec file for package transfig (Version 3.2.5a)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -25,12 +25,13 @@ Group: Productivity/Graphics/Convertors
Provides: transfig.3.2.3d Provides: transfig.3.2.3d
Requires: netpbm ghostscript-library ghostscript-fonts-std Requires: netpbm ghostscript-library ghostscript-fonts-std
AutoReqProv: on AutoReqProv: on
Version: 3.2.5 Version: 3.2.5a
Release: 160 Release: 1
Summary: Graphic Converter Summary: Graphic Converter
Source: transfig.%{version}.tar.bz2 Source: transfig.%{version}.tar.bz2
Patch0: transfig.%{version}.dif Patch0: transfig.3.2.5a.dif
Patch1: transfig.%{version}-cups.dif Patch1: transfig.3.2.5a-cups.dif
Patch2: transfig.3.2.5-binderman.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
%if "%_exec_prefix" == "/usr/X11R6" %if "%_exec_prefix" == "/usr/X11R6"