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

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=6
This commit is contained in:
Dr. Werner Fink 2012-04-13 16:41:24 +00:00 committed by Git OBS Bridge
parent e40bce8292
commit 26e7415843
10 changed files with 14843 additions and 11641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source-arraysubs.dif
View File

@ -1,14 +1,3 @@
--- texk/afm2pl/afm2pl.c
+++ texk/afm2pl/afm2pl.c 2009-11-11 07:45:42.783429403 +0000
@@ -2107,7 +2107,7 @@ static void
readargs(int argc, char **argv)
{
register int i;
- int fdims[3];
+ int fdims[5];
/* skip argv[0] and look at the rest. */
argv++;
--- texk/web2c/bibtex.web
+++ texk/web2c/bibtex.web 2009-11-12 11:50:51.699429941 +0000
@@ -4315,9 +4315,9 @@ special markers |quote_next_fn| and |end

841
source-dviutils.dif
View File

@ -9,64 +9,6 @@
[${top_srcdir}/../kpathsea/*.[ch]],
[${top_builddir}/../kpathsea/paths.h])
m4_if(m4_index([ $1 ], [ no-debug ]), [-1],
--- texk/seetexk/scaletfm.c
+++ texk/seetexk/scaletfm.c 2009-08-28 14:13:32.873901460 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/scaletfm.c,v 3.2 89/11/23 16:34:43 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/scaletfm.c,v 3.2 89/11/23 16:34:43 chris Exp $";
#endif
#include "types.h"
@@ -87,6 +87,7 @@ ScaleOneWidth(t, z)
* Scale a set of glyphs [l..h) in font f according to f->f_dvimag
* (that is, set g_tfmwidth from g_rawtfmwidth).
*/
+void
ScaleGlyphs(f, l, h)
register struct font *f;
int l, h;
--- texk/seetexk/rstfont.c
+++ texk/seetexk/rstfont.c 2009-08-28 14:13:32.873901460 +0000
@@ -12,18 +12,22 @@
*/
#ifndef lint
-static char rcsid[] = "$Header$";
+static char rcsid[] __attribute__ ((unused)) = "$Header$";
#endif
+#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <unistd.h>
#include <errno.h>
#include "types.h"
#include "error.h"
#include "font.h"
#include "fio.h"
+extern int FontHasGlyphs();
+
/*
* RST (Imagen's font format) font operations.
*/
@@ -77,12 +81,6 @@ struct rst_details {
*/
#define ftord(f) ((struct rst_details *)(f)->f_details)
-#if !defined( WIN32 ) && !defined( _AMIGA )
-extern errno;
-char *malloc();
-long ftell();
-#endif
-
/*
* Read an RST file.
*/
--- texk/seetexk/search.c
+++ texk/seetexk/search.c 2009-08-28 14:13:32.877901585 +0000
@@ -19,6 +19,7 @@
@ -88,93 +30,6 @@
struct search *
SCreate(unsigned int dsize)
{
--- texk/seetexk/scanpost.c
+++ texk/seetexk/scanpost.c 2009-08-28 14:13:32.873901460 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/local/src/SeeTeX/libtex/RCS/scanpost.c,v 1.2 90/07/10 14:33:23 grunwald Exp Locker: grunwald $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/local/src/SeeTeX/libtex/RCS/scanpost.c,v 1.2 90/07/10 14:33:23 grunwald Exp Locker: grunwald $";
#endif
/*
@@ -20,7 +20,9 @@ static char rcsid[] = "$Header: /usr/loc
#include "gripes.h"
#include "postamble.h"
-ScanPostAmble(f, headerfunc, fontfunc)
+extern int FindPostAmble ();
+
+int ScanPostAmble(f, headerfunc, fontfunc)
register FILE *f;
void (*headerfunc)();
register void (*fontfunc)();
--- texk/seetexk/sdecode.c
+++ texk/seetexk/sdecode.c 2009-08-28 14:13:32.873901460 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/sdecode.c,v 3.4 89/11/06 15:01:07 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/sdecode.c,v 3.4 89/11/06 15:01:07 chris Exp $";
#endif
#include <stdio.h>
@@ -18,6 +18,7 @@ static char rcsid[] = "$Header: /usr/src
#include "types.h"
#include "error.h"
#include "sdecode.h"
+#include "gripes.h"
static char cclass[256]; /* XXX assumes 8-bit char */
#define CCL_SPACE 0x01 /* white space */
@@ -26,7 +27,7 @@ static char cclass[256]; /* XXX assumes
static int sdset; /* flag says whether cclass[] set up */
static void args(), badarg();
-static int scan(struct decode_info *di, char **fmt, ...), scan_i(), scan_d();
+static int scan_i(), scan_d();
extern char *strsave();
@@ -84,6 +85,7 @@ struct decode_info {
char *di_kw; /* the keyword */
int di_bkw; /* true iff keyword is in static buffer */
};
+static int scan(register struct decode_info * di,...);
/*
* `Edit' the text in the buffer in-place.
@@ -398,7 +400,7 @@ args(tp, di)
register struct decode_info *di;
{
char *fmt;
- int n, room, f1;
+ int n = 0, room, f1;
i32 *ip, i[4];
double d[2];
@@ -600,17 +602,14 @@ out:
#else
static int
-scan(va_alist)
- va_dcl
+scan(register struct decode_info * di,...)
{
- register struct decode_info *di;
register char *fmt;
register int c;
char **fmtp;
va_list ap;
- va_start(ap);
- di = va_arg(ap, struct decode_info *);
+ va_start(ap, di);
fmtp = va_arg(ap, char **);
fmt = *fmtp;
while ((c = *fmt++) != 0) {
--- texk/seetexk/a4toa5
+++ texk/seetexk/a4toa5 2010-11-12 11:50:39.552426619 +0000
@@ -0,0 +1,26 @@
@ -204,58 +59,6 @@
+#exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(204mm,-10mm)' $1 $2
+#
+exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2
--- texk/seetexk/bcopy.c
+++ texk/seetexk/bcopy.c 2009-08-28 14:13:32.721901870 +0000
@@ -1,5 +1,6 @@
+#ifndef __GNUC__
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/bcopy.c,v 3.1 89/08/22 21:42:07 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/bcopy.c,v 3.1 89/08/22 21:42:07 chris Exp $";
#endif
/*
@@ -7,13 +8,12 @@ static char rcsid[] = "$Header: /usr/src
* This should be rewritten to be as fast as possible for your
* machine.
*/
-void bcopy(from, to, count)
- register char *from, *to;
+char *bcopy(from, to, count)
+ char *from, *to;
register int count;
{
-
if (from == to)
- return;
+ return from;
if (from > to) {
while (--count >= 0)
*to++ = *from++;
@@ -23,4 +23,6 @@ void bcopy(from, to, count)
while (--count >= 0)
*--to = *--from;
}
+ return from;
}
+#endif
--- texk/seetexk/bzero.c
+++ texk/seetexk/bzero.c 2009-08-28 14:13:32.721901870 +0000
@@ -1,5 +1,5 @@
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/bzero.c,v 3.1 89/08/22 21:42:12 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/bzero.c,v 3.1 89/08/22 21:42:12 chris Exp $";
#endif
/*
@@ -7,7 +7,7 @@ static char rcsid[] = "$Header: /usr/src
* This should be rewritten to be as fast as possible for your
* machine.
*/
-bzero(addr, count)
+void bzero(addr, count)
register char *addr;
register int count;
{
--- texk/seetexk/configure
+++ texk/seetexk/configure 2009-09-04 13:23:18.898401799 +0000
@@ -14169,7 +14169,7 @@ if test "x$with_kpathsea_libdir" != x &&
@ -267,74 +70,6 @@
-e "s,SRC/,$kpse_SRC/,g" \
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
--- texk/seetexk/conv.c
+++ texk/seetexk/conv.c 2009-08-28 14:13:32.721901870 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/conv.c,v 3.1 89/08/22 21:48:01 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/conv.c,v 3.1 89/08/22 21:48:01 chris Exp $";
#endif
/*
--- texk/seetexk/dvi_draw.c
+++ texk/seetexk/dvi_draw.c 2009-08-28 14:13:32.721901870 +0000
@@ -57,11 +57,12 @@
* it's worth it.
*/
-static char *rcsid="$Header: /usr/local/src/Uiuctex/libtex/RCS/dvi_draw.c,v 1.3 88/02/19 17:00:34 grunwald Exp Locker: grunwald $" ;
+static char *rcsid __attribute__ ((unused)) ="$Header: /usr/local/src/Uiuctex/libtex/RCS/dvi_draw.c,v 1.3 88/02/19 17:00:34 grunwald Exp Locker: grunwald $" ;
#include <math.h>
#include <stdio.h>
#include <ctype.h>
+#include <stdlib.h>
#define MAXPOINTS 300 /* Max points in a path */
#define TWOPI (3.14159265359*2.0)
@@ -85,6 +86,7 @@ extern void dot_at(), line_btw(), do_att
extern int dviDPI, currentShrink, shrinkFactor[];
+void draw_ellipse();
/*
* Issue warning/error messages
@@ -160,7 +162,7 @@ int dotted;
int i, numdots, x0, y0, x1, y1;
int cx0, cy0, cx1, cy1;
float inchesperdash;
- double d, spacesize, a, b, dx, dy, milliperdash;
+ double d, spacesize, a, b = 0.0, dx, dy, milliperdash;
if (sscanf(cp, " %f ", &inchesperdash) != 1) {
Warning("illegal format for dotted/dashed line: %s", cp);
@@ -298,13 +300,10 @@ char *cp;
*/
void flush_spline()
{
- int xp, yp, N, lastx=(-1), lasty;
+ int xp, yp, N, lastx=(-1), lasty = -1;
int t1, t2, t3, steps, j;
register int i, w;
-#ifdef lint
- lasty = -1;
-#endif
N = path_len + 1;
xx[0] = xx[1]; yy[0] = yy[1];
xx[N] = xx[N-1]; yy[N] = yy[N-1];
@@ -362,7 +361,7 @@ void blacken_last()
/*
* Draw an ellipse with the indicated center and radices.
*/
-draw_ellipse(xc, yc, xr, yr)
+void draw_ellipse(xc, yc, xr, yr)
int xc, yc, xr, yr;
{
double angle, theta;
--- texk/seetexk/dvibook.c
+++ texk/seetexk/dvibook.c 2009-08-28 14:13:32.721901870 +0000
@@ -27,6 +27,7 @@ extern char *optarg;
@ -429,110 +164,9 @@
pl = (struct pagelist *)malloc(sizeof *pl);
if (pl == NULL)
--- texk/seetexk/dvistate.c
+++ texk/seetexk/dvistate.c 2009-08-28 14:13:32.729901520 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/dvistate.c,v 1.1 89/08/22 21:49:03 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/dvistate.c,v 1.1 89/08/22 21:49:03 chris Exp $";
#endif
/*
@@ -14,6 +14,7 @@ static char rcsid[] = "$Header: /usr/src
*/
#include <stdio.h>
+#include <stdlib.h>
#include "types.h"
#include "conv.h"
#include "dvicodes.h"
@@ -35,10 +36,6 @@ static int s_errs;
static void pre(), post(), fntdef();
-#if !defined( WIN32 ) && !defined( _AMIGA )
-char *malloc();
-#endif
-
/*
* Read through the postamble and the preamble and set up the
* global DVI state. Each font is passed to (*fontfn)().
--- texk/seetexk/dvistuff.c
+++ texk/seetexk/dvistuff.c 2009-08-28 14:13:32.729901520 +0000
@@ -32,17 +32,23 @@
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
#include <ctype.h>
#include "dvistuff.h" /* includes types & fonts */
-static char *rcsid="$Header: /home/reed/grunwald/Iptex/drivers/RCS/dvistuff.c,v 1.17 88/07/07 23:25:32 grunwald Exp Locker: grunwald $" ;
+static char *rcsid __attribute__ ((unused)) ="$Header: /home/reed/grunwald/Iptex/drivers/RCS/dvistuff.c,v 1.17 88/07/07 23:25:32 grunwald Exp Locker: grunwald $" ;
#include "dviclass.h"
#include "dvicodes.h"
#include "postamble.h"
#include "search.h"
#include "fio.h"
+#include "error.h"
+#include "gripes.h"
+
+extern void SkipFontDef();
int dviHH = -1; /* current horizontal position, in DEVs */
int dviVV = -1; /* current vertical position, in DEVs */
@@ -244,7 +250,7 @@ register struct PostAmbleFont *p;
register struct fontinfo *fi;
register struct font *f;
- char *fname;
+ char *fname = NULL;
int def = S_CREATE | S_EXCL;
fi = (struct fontinfo *) SSearch(FontFinder, p->paf_DVIFontIndex,
@@ -573,7 +579,7 @@ dviPreparePage(page)
int page;
{
register int c;
- register i32 p;
+ register i32 p = 0;
int advance;
if (page < 0) {
@@ -1139,7 +1145,7 @@ int shrinkW;
printf("New glyph:\n");
seeGlyph(shrunkRaster, shrunkHeight, shrunkBytesWide);
}
-#endif UNDEF
+#endif /* UNDEF */
ngly = (struct glyph *) malloc(sizeof(struct glyph));
bzero(ngly, sizeof(struct glyph));
@@ -1187,4 +1193,4 @@ int w;
}
-#endif UNDEF
+#endif /* UNDEF */
--- texk/seetexk/dvistuff.h
+++ texk/seetexk/dvistuff.h 2009-08-28 14:13:32.729901520 +0000
@@ -31,7 +31,7 @@
*
*/
-static char *dvistuff_header_rcsid="$Header: /home/reed/grunwald/Iptex/drivers/RCS/dvistuff.h,v 1.11 89/02/15 16:31:56 grunwald Exp $" ;
+static char *dvistuff_header_rcsid __attribute__ ((unused)) ="$Header: /home/reed/grunwald/Iptex/drivers/RCS/dvistuff.h,v 1.11 89/02/15 16:31:56 grunwald Exp $" ;
/*
* Include the following from the CTex distribution
--- texk/seetexk/dvitodvi.c
+++ texk/seetexk/dvitodvi.c 2009-08-28 14:13:32.729901520 +0000
@@ -27,6 +27,7 @@ extern char *optarg;
+++ texk/seetexk/dvitodvi.c 2012-04-13 14:45:18.261443109 +0000
@@ -42,6 +42,7 @@ extern char *optarg;
extern int optind;
#endif
@ -540,7 +174,7 @@
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
@@ -35,6 +36,8 @@ extern int optind;
@@ -50,6 +51,8 @@ extern int optind;
#include "gripes.h"
#include "search.h"
#include <stdio.h>
@ -549,7 +183,7 @@
#include <ctype.h>
#define white(x) ((x) == ' ' || (x) == '\t' || (x) == ',')
@@ -71,6 +74,7 @@ struct fontinfo {
@@ -86,6 +89,7 @@ struct fontinfo {
i32 Width; /* width of page */
i32 Height; /* height of page */
i32 Magnification; /* Magnification of pages */
@ -557,7 +191,7 @@
int Modulo; /* page spec modulo */
struct pagespec *PageSpecs; /* page specification list */
@@ -105,9 +109,6 @@ i32 Count[10]; /* the 10 \count variabl
@@ -122,9 +126,6 @@ i32 Count[10]; /* the 10 \count variabl
/* save some string space: we use this a lot */
char writeerr[] = "error writing DVI file";
@ -567,7 +201,7 @@
static void WriteFont(struct fontinfo *fi);
static void PutFontSelector(i32 index);
@@ -168,6 +169,15 @@ scale(i32 whole, int num, int den, i32 s
@@ -185,6 +186,15 @@ scale(i32 whole, int num, int den, i32 s
return (v) ;
}
@ -583,7 +217,7 @@
struct pagespec {
int reversed, pageno, add;
i32 xoff, yoff;
@@ -275,6 +285,8 @@ parsedimen(char **sp)
@@ -292,6 +302,8 @@ parsedimen(char **sp)
fac = Height;
s++;
}
@ -592,7 +226,7 @@
whole = scale(whole, num, den, fac) ;
*sp = s;
return (neg ? -whole : whole);
@@ -473,9 +485,15 @@ HandlePostAmble(void)
@@ -492,9 +504,15 @@ HandlePostAmble(void)
PutLong(outf, Denominator);
PutLong(outf, DVIMag);
c = GetLong(inf);
@ -610,7 +244,7 @@
c = GetWord(inf)+1;
PutWord(outf, c); /* DVI stack size */
PutWord(outf, NumberOfOutputPages);
@@ -568,7 +586,8 @@ HandlePreAmble(void)
@@ -587,7 +605,8 @@ HandlePreAmble(void)
DVIFileName, DVI_VERSION);
Numerator = GetLong(inf);
Denominator = GetLong(inf);
@ -620,7 +254,7 @@
putbyte(outf, DVI_PRE);
putbyte(outf, DVI_VERSION);
PutLong(outf, Numerator);
@@ -595,6 +614,7 @@ main(int argc, char **argv)
@@ -614,6 +633,7 @@ main(int argc, char **argv)
Width = 0;
Height = 0;
Magnification = 1000;
@ -628,7 +262,7 @@
Modulo = 1;
ProgName = *argv;
@@ -691,12 +711,16 @@ Usage: %s [-q] [-i infile] [-o outfile]
@@ -710,12 +730,16 @@ Usage: %s [-q] [-i infile] [-o outfile]
if (fseek(inf, 16L, 1) == -1)
error(1, -1, "can't seek postamble");
if (Height == 0) /* get height from postamble */
@ -638,7 +272,7 @@
(void) GetLong(inf); /* ignore height */
if (Width == 0) /* get width from postamble */
- Width = GetLong(inf);
+ Width = myscale(GetLong(inf),1000,MyMag);
+ Width = myscale(GetLong(inf),1000,MyMag);
+ else
+ (void) GetLong(inf);
PageSpecs = ParseSpecs(specstring, 1);
@ -646,7 +280,7 @@
+ Width = myscale(Width,MyMag,1000);
HandleDVIFile();
HandlePostAmble();
if (WritingPage)
--- texk/seetexk/error.c
+++ texk/seetexk/error.c 2010-11-12 11:52:47.916425348 +0000
@@ -10,7 +10,12 @@
@ -683,206 +317,6 @@
#if !defined (HAVE_STRERROR) && !defined (strerror)
static char *
strerror (int errnum)
--- texk/seetexk/findpost.c
+++ texk/seetexk/findpost.c 2009-08-28 14:13:32.729901520 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/findpost.c,v 2.3 89/08/22 21:50:11 chris Exp $";
+static char rcsid[] __attribute__ ((unused))= "$Header: /usr/src/local/tex/local/mctex/lib/RCS/findpost.c,v 2.3 89/08/22 21:50:11 chris Exp $";
#endif
/*
@@ -35,7 +35,7 @@ static char rcsid[] = "$Header: /usr/src
long ftell(); /* should be declared in stdio.h */
#endif
-FindPostAmble(f)
+int FindPostAmble(f)
register FILE *f;
{
register long offset;
--- texk/seetexk/font.c
+++ texk/seetexk/font.c 2009-08-28 14:13:32.777901505 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /homes/grunwald/Src/SeeTeX/libtex/RCS/font.c,v 1.2 1992/07/22 16:26:02 grunwald Exp grunwald $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /homes/grunwald/Src/SeeTeX/libtex/RCS/font.c,v 1.2 1992/07/22 16:26:02 grunwald Exp grunwald $";
#endif
/*
@@ -17,13 +17,21 @@ static char rcsid[] = "$Header: /homes/g
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <errno.h>
#include <ctype.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include "types.h"
#include "conv.h"
#include "error.h"
#include "font.h"
+extern int split();
+
/*
* Define the default configuration file.
* Also define the maximum path name length.
@@ -75,8 +83,7 @@ static struct font *getafont(char *nm, i
/*
* Imports.
*/
-extern int errno;
-char *getenv(), *malloc(), *strncpy(), *strsave();
+char *strsave();
/*
* You may get warnings from lint about sprintf(), which is of type
@@ -149,7 +156,7 @@ readconf(char *name)
register FILE *f; /* config file */
register int c; /* char and word counter */
int isenv; /* true => doing `fontenv', not `font' */
- char *env; /* value from getenv() */
+ char *env = NULL; /* value from getenv() */
struct fontconf proto; /* prototype fontconf */
char *v[20]; /* word vector */
char line[BUFSIZ]; /* input line */
@@ -331,7 +338,7 @@ badcf(char *why)
static void
basify(char *s, char *buf, int size)
{
- register char *p, *endp;
+ register char *p, *endp = NULL;
register int n;
for (p = s; *p; p++)
--- texk/seetexk/font_subr.c
+++ texk/seetexk/font_subr.c 2009-08-28 14:13:32.829901219 +0000
@@ -6,23 +6,24 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/font_subr.c,v 2.8 89/10/30 04:08:52 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/font_subr.c,v 2.8 89/10/30 04:08:52 chris Exp $";
#endif
/*
* Subroutines common to all fonts.
*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
#include "types.h"
#include "error.h"
#include "font.h"
static struct glyph *freeglyphs;
-#if !defined( WIN32 ) && !defined( _AMIGA )
-char *malloc();
-extern errno;
-#endif
+extern void ScaleGlyphs(register struct font *f, int l, int h);
+extern void SetRotation(register struct glyph *g, int r);
/*
* Set up the font structures to note that a font has glyphs in
@@ -31,6 +32,7 @@ extern errno;
* SHOULD I ALLOW ADDITIONS TO THE RANGE VIA SUBSEQUENT CALLS TO
* FontHasGlyphs?
*/
+int
FontHasGlyphs(f, low, high)
register struct font *f;
register int low, high;
--- texk/seetexk/gfclass.c
+++ texk/seetexk/gfclass.c 2009-08-28 14:13:32.829901219 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/gfclass.c,v 2.3 89/08/22 21:52:30 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/gfclass.c,v 2.3 89/08/22 21:52:30 chris Exp $";
#endif
/*
--- texk/seetexk/gffont.c
+++ texk/seetexk/gffont.c 2009-08-28 14:13:32.829901219 +0000
@@ -6,12 +6,15 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/gffont.c,v 2.9 89/09/02 17:16:17 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/gffont.c,v 2.9 89/09/02 17:16:17 chris Exp $";
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
#include "types.h"
#include "error.h"
#include "font.h"
@@ -19,6 +22,8 @@ static char rcsid[] = "$Header: /usr/src
#include "gfclass.h"
#include "num.h"
+extern int FontHasGlyphs();
+
/*
* GF font operations.
*
@@ -75,11 +80,6 @@ struct gf_details {
* Get the gf_details from font f.
*/
#define ftogd(f) ((struct gf_details *)(f)->f_details)
-
-#if !defined( WIN32 ) && !defined( _AMIGA )
-extern int errno;
-extern char *malloc();
-#endif
char *copyit();
/*
@@ -394,7 +394,7 @@ drawchar(p, abbrev, globalb, gfname)
register i32 m; /* m register (column) */
register char *colp; /* pointer to byte corresponding to m */
register int c; /* temporary */
- register i32 i; /* temporary */
+ register i32 i = 0; /* temporary */
register int black; /* true when paint_switch==black */
register i32 n; /* n register (row) */
int stride; /* multiplier to convert linear to 2d array */
@@ -794,7 +794,7 @@ gf_getgly(f, l, h)
register i32 c;
register int i;
register i32 thisboc;
- int abbrev;
+ int abbrev = 0;
struct gf_details *gd = ftogd(f);
/*
@@ -926,8 +926,8 @@ gf_rasterise(f, l, h)
struct font *f;
int l, h;
{
-
panic("gf_rasterise(%s, %d, %d)", f->f_path, l, h);
+ /* NOTREACHED */
}
/*
--- texk/seetexk/gripes.h
+++ texk/seetexk/gripes.h 2010-11-12 11:55:39.148426060 +0000
@@ -13,16 +13,17 @@ extern const char *DVIFileName;
@ -1079,122 +513,6 @@
+endif
+
+exit 0
--- texk/seetexk/pkfont.c
+++ texk/seetexk/pkfont.c 2009-08-28 14:13:32.873901460 +0000
@@ -6,17 +6,22 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/pkfont.c,v 2.10 89/08/22 21:54:49 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/pkfont.c,v 2.10 89/08/22 21:54:49 chris Exp $";
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
#include "types.h"
#include "error.h"
#include "font.h"
#include "num.h"
+extern int FontHasGlyphs();
+
/*
* PK font operations.
*
@@ -127,11 +132,6 @@ struct pk_details {
static int scan_characters();
-#if !defined( WIN32 ) && !defined( _AMIGA )
-extern int errno;
-char *malloc();
-#endif
-
/*
* PK subroutines.
*/
--- texk/seetexk/pxlfont.c
+++ texk/seetexk/pxlfont.c 2009-08-28 14:13:32.873901460 +0000
@@ -6,18 +6,22 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/pxlfont.c,v 2.5 89/08/22 21:55:34 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/pxlfont.c,v 2.5 89/08/22 21:55:34 chris Exp $";
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <unistd.h>
#include <errno.h>
#include "types.h"
#include "error.h"
#include "font.h"
#include "fio.h"
+extern int FontHasGlyphs();
+
/*
* PXL font operations.
*/
@@ -63,11 +67,6 @@ struct pxl_details {
*/
#define ftopd(f) ((struct pxl_details *) (f)->f_details)
-extern errno;
-#ifndef KPATHSEA
-char *malloc();
-#endif
-
/*
* Read a PXL file.
*/
--- texk/seetexk/rotate.c
+++ texk/seetexk/rotate.c 2009-08-28 14:13:32.873901460 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/rotate.c,v 2.4 89/08/22 21:56:05 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/rotate.c,v 2.4 89/08/22 21:56:05 chris Exp $";
#endif
/*
@@ -16,17 +16,14 @@ static char rcsid[] = "$Header: /usr/src
* from being rotated of course!).
*/
+#include <stdlib.h>
+#include <errno.h>
#include "types.h"
#include "error.h"
#include "font.h"
static void RotateClockwise();
-#if !defined( WIN32 ) && !defined( _AMIGA )
-extern int errno;
-char *malloc();
-#endif
-
/*
* Rounding, but by powers of two only.
*/
@@ -131,7 +128,7 @@ RotateClockwise(glyph)
* the old raster, can discard the original i and j.
*/
{
- register int mapj, c, k, mapi;
+ register int mapj, c = 0, k, mapi;
mapi = oheight;
owidth *= nplus;
--- texk/seetexk/seek.c
+++ texk/seetexk/seek.c 2009-08-28 14:13:32.877901585 +0000
@@ -32,6 +32,10 @@
@ -1222,68 +540,6 @@
/*
* Make and return a version of `f' on which fseek works (unconditionally).
--- texk/seetexk/skip.c
+++ texk/seetexk/skip.c 2009-08-28 14:13:32.877901585 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/skip.c,v 3.1 89/08/22 21:45:13 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/skip.c,v 3.1 89/08/22 21:45:13 chris Exp $";
#endif
#include <stdio.h>
@@ -16,7 +16,7 @@ static char rcsid[] = "$Header: /usr/src
/*
* Skip a font definition. The font number has already been consumed.
*/
-SkipFontDef(fp)
+void SkipFontDef(fp)
register FILE *fp;
{
register int i;
--- texk/seetexk/split.c
+++ texk/seetexk/split.c 2009-08-28 14:13:32.881901811 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/split.c,v 3.1 89/08/22 21:59:36 chris Exp $";
+static char rcsid[] __attribute__((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/split.c,v 3.1 89/08/22 21:59:36 chris Exp $";
#endif
#include <ctype.h>
@@ -44,7 +44,7 @@ split(s, w, nw)
register int c;
register char *canon = s;
register int wleft = nw;
- enum lexstate state, prebkstate;
+ enum lexstate state, prebkstate = S_BLANK;
/*
* Start out in the `blank' state (outside a word). Handle
--- texk/seetexk/strsave.c
+++ texk/seetexk/strsave.c 2009-08-28 14:13:32.905901116 +0000
@@ -9,13 +9,14 @@
* Save a string in managed memory.
*/
-#if !defined( WIN32 ) && !defined( _AMIGA )
-char *malloc(), *realloc();
-extern int errno;
-#endif
-
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
#include "types.h" /* for bcopy */
#include "error.h"
+#ifndef bcopy
+#define bcopy(from, to, len) memmove(to, from, len)
+#endif
char *
strsave(s)
--- texk/seetexk/tempfile.c
+++ texk/seetexk/tempfile.c 2009-08-28 14:13:32.905901116 +0000
@@ -10,6 +10,7 @@
@ -1305,77 +561,6 @@
#endif
#include "tempfile.h"
--- texk/seetexk/tfm.c
+++ texk/seetexk/tfm.c 2009-08-28 14:13:32.913901063 +0000
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/tfm.c,v 3.1 89/08/22 22:00:12 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/tfm.c,v 3.1 89/08/22 22:00:12 chris Exp $";
#endif
/*
@@ -16,17 +16,15 @@ static char rcsid[] = "$Header: /usr/src
* finish
*/
+#include <stdlib.h>
#include <stdio.h>
+#include <stdlib.h>
#include "types.h"
#include "fio.h"
#include "tfm.h"
static int trd_header(), trd_ci(), trd_fix();
-#if !defined( WIN32 ) && !defined( _AMIGA )
-char *malloc();
-#endif
-
#define ALLOC(n, type) ((type *)malloc((unsigned)((n) * sizeof(type))))
int
--- texk/seetexk/tfmfont.c
+++ texk/seetexk/tfmfont.c 2009-08-28 14:13:32.913901063 +0000
@@ -6,16 +6,24 @@
*/
#ifndef lint
-static char rcsid[] = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/tfmfont.c,v 3.4 89/11/29 02:29:58 chris Exp $";
+static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/src/local/tex/local/mctex/lib/RCS/tfmfont.c,v 3.4 89/11/29 02:29:58 chris Exp $";
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
#include "types.h"
#include "conv.h"
#include "font.h"
#include "tfm.h"
+#include "error.h"
+#include "gripes.h"
+
+extern int FontHasGlyphs();
+extern int readtfmfile();
/*
* TFM font operations. This defines three fonts:
@@ -63,11 +71,6 @@ struct tfm_details {
static int do_read();
-#if !defined( WIN32 ) && !defined( _AMIGA )
-extern int errno;
-char *malloc();
-#endif
-
/*
* Read a Box font.
*/
--- texk/seetexk/types.h
+++ texk/seetexk/types.h 2009-08-28 14:13:32.921901032 +0000
@@ -43,8 +43,9 @@

9936
source-luatex.dif
View File

File diff suppressed because it is too large Load Diff

165
source-overflow.dif
View File

@ -1,168 +1,15 @@
--- texk/web2c/synctexdir/synctex-e-rec.ch0 (revision 23678)
+++ texk/web2c/synctexdir/synctex-e-rec.ch0 (revision 23688)
@@ -82,21 +82,11 @@
link(prev_p):=p;
--- texk/web2c/eptexdir/eptex.ech
+++ texk/web2c/eptexdir/eptex.ech 2012-04-13 17:22:36.025657059 +0200
@@ -305,6 +305,12 @@ othercases goto next_p
words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
@z
-@x etex.ch l.4126
- if is_char_node(p) then r:=get_avail
- else case type(p) of
+@x etex.ch l.4186
hlist_node,vlist_node: begin r:=get_node(box_node_size);
- mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
- end;
@y
- if is_char_node(p) then r:=get_avail
- else case type(p) of
hlist_node,vlist_node: begin r:=get_node(box_node_size);
@<Copy the box {\sl Sync\TeX} information@>;
- mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
- end;
@z
@x synctex-e-mem.ch0 l.100
--- texk/web2c/eptexdir/eptex.ech (revision 23678)
+++ texk/web2c/eptexdir/eptex.ech 2011-12-12 09:46:29.391146557 +0000
@@ -283,6 +283,18 @@ disp_node: begin
othercases goto next_p
@z
+@x e-pTeX: just_copy
+ hlist_node,vlist_node: begin r:=get_node(box_node_size);
+ mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
+ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
+@y
+ dir_node,hlist_node,vlist_node: begin r:=get_node(box_node_size);
+ mem[r+7]:=mem[p+7]; mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5];
+ {copy the last three words}
+ add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
+ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
+@z
+
@x e-pTeX: ifcsname l.28620
buffer[m]:=info(p) mod @'400; incr(m); p:=link(p);
@y
--- texk/web2c/xetexdir/xetex.ch (revision 23186)
+++ texk/web2c/xetexdir/xetex.ch (revision 24314)
@@ -328,7 +328,7 @@ for i:=@'177 to @'377 do xchr[i]:=i;
{Initialize enc\TeX\ data.}
for i:=0 to 255 do mubyte_read[i]:=null;
for i:=0 to 255 do mubyte_write[i]:=0;
-for i:=0 to 128 do mubyte_cswrite[i]:=null;
+for i:=0 to 127 do mubyte_cswrite[i]:=null;
mubyte_keep := 0; mubyte_start := false;
write_noexpanding := false; cs_converting := false;
special_printing := false; message_printing := false;
--- texk/web2c/enctex.ch (revision 23186)
+++ texk/web2c/enctex.ch (revision 24314)
@@ -42,14 +42,14 @@ for i:=@'177 to @'377 do xchr[i]:=i;
{Initialize enc\TeX\ data.}
for i:=0 to 255 do mubyte_read[i]:=null;
for i:=0 to 255 do mubyte_write[i]:=0;
-for i:=0 to 128 do mubyte_cswrite[i]:=null;
+for i:=0 to 127 do mubyte_cswrite[i]:=null;
mubyte_keep := 0; mubyte_start := false;
write_noexpanding := false; cs_converting := false;
special_printing := false; message_printing := false;
no_convert := false; active_noconvert := false;
@z
-@x [5.59] l.1508FIXME -- enc\TeX\ modifications of |print|.
+@x [5.59] l.1508 FIXME -- enc\TeX\ modifications of |print|.
else begin if selector>pseudo then
begin print_char(s); return; {internal strings are not expanded}
end;
--- texk/web2c/ptexdir/ptex-base.ch 2011/08/18 10:21:01
+++ texk/web2c/ptexdir/ptex-base.ch 2011/08/18 13:52:11
@@ -46,6 +46,7 @@
% (31/12/2010) AK Bug fix and accent Kanji by Hironori Kitagawa.
% (19/01/2011) PB Let \lastkern etc act through disp node.
% (15/04/2011) PB pTeX p3.2 Add \ifdbox and \ifddir
+% (2011-08-18) PB Bug fix by Hironori Kitagawa.
%
@x [1.2] l.200 - pTeX:
@d banner==TeX_banner
@@ -5848,6 +5849,9 @@
var @!jc:KANJI_code; {temporary register for KANJI}
@!sp,@!mp,@!ep:pointer;
begin@/
+if f=null_font then
+ begin get_jfm_pos:=kchar_type(null_font)(0); return;
+ end;
jc:=toDVI(kcode);
sp:=1; { start position }
ep:=font_num_ext[f]-1; { end position }
@@ -6677,11 +6681,13 @@
goto main_loop_j+3;
@#
main_loop_j+1: space_factor:=1000;
- fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l;
- link(tail):=main_p; tail:=main_p; last_jchr:=tail;
- fast_get_avail(main_p); info(main_p):=KANJI(cur_chr);
- link(tail):=main_p; tail:=main_p;
- cx:=cur_chr; @<Insert kinsoku penalty@>;
+ if main_f<>null_font then
+ begin fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l;
+ link(tail):=main_p; tail:=main_p; last_jchr:=tail;
+ fast_get_avail(main_p); info(main_p):=KANJI(cur_chr);
+ link(tail):=main_p; tail:=main_p;
+ cx:=cur_chr; @<Insert kinsoku penalty@>;
+ end;
ins_kp:=false;
again_2:
get_next;
@@ -6717,7 +6723,10 @@
@#
main_loop_j+3:
if ins_kp=true then @<Insert |pre_break_penalty| of |cur_chr|@>;
- @<Look ahead for glue or kerning@>;
+ if main_f<>null_font then
+ begin @<Look ahead for glue or kerning@>;
+ end
+ else inhibit_glue_flag:=false;
if ins_kp=false then begin { Kanji -> Kanji }
goto main_loop_j+1;
end else if ins_kp=true then begin { Kanji -> Ascii }
--- texk/dvipsk/dospecial.c 2010-05-10 17:47:35.000000000 +0200
+++ texk/dvipsk/dospecial.c 2011-10-19 14:29:46.323146222 +0200
@@ -112,7 +112,7 @@ static void
fgetboundingbox(char *f, float *llx_p, float *lly_p, float *urx_p, float *ury_p)
{
FILE *fp;
- char buf[BUFSIZ];
+ char buf[BUFSIZ+1];
fp = search(figpath, f, READ);
if (fp == 0)
--- texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c 2010-04-04 15:55:46.000000000 +0200
+++ texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c 2011-10-20 10:14:41.851646143 +0200
@@ -385,7 +385,7 @@ return;
wrapper->top = io;
}
-static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp) {
+static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp, const size_t bsize) {
_IO *io = wrapper->top, *iop;
int wasstopped;
@@ -396,7 +396,7 @@ static int ioescapestopped(IO *wrapper,
free(io);
if ( wasstopped ) {
wrapper->top = iop;
- if ( sp<(int)(sizeof(stack)/sizeof(stack[0])) ) {
+ if ( sp<(int)bsize ) {
stack[sp].type = ps_bool;
stack[sp++].u.tf = true;
}
@@ -1609,7 +1609,7 @@ static void _InterpretPS(IO *wrapper, En
}
break;
case pt_stop:
- sp = ioescapestopped(wrapper,stack,sp);
+ sp = ioescapestopped(wrapper,stack,sp,sizeof(stack)/sizeof(stack[0]));
break;
case pt_load:
if ( sp>=1 && stack[sp-1].type==ps_lit ) {

132
source-poppler.dif
View File

@ -1,53 +1,9 @@
--- texk/web2c/xetexdir/XeTeX_ext.c
+++ texk/web2c/xetexdir/XeTeX_ext.c 2009-09-04 08:40:24.000000000 +0000
@@ -39,15 +39,15 @@ authorization from the copyright holders
#include <kpathsea/config.h>
#ifdef XETEX_OTHER
-#ifdef POPPLER_VERSION
-#define xpdfVersion POPPLER_VERSION
-#define xpdfString "poppler"
-#include "poppler-config.h"
-#else
-#define xpdfString "xpdf"
-#include "xpdf/config.h"
-#endif
-#include "png.h"
+# ifdef POPPLER_VERSION
+# define xpdfVersion POPPLER_VERSION
+# define xpdfString "poppler"
+# include <poppler-config.h>
+# else
+# define xpdfString "xpdf"
+# include "xpdf/config.h"
+# endif
+# include "png.h"
#endif
#include "zlib.h"
--- texk/web2c/xetexdir/pdfimage.cpp
+++ texk/web2c/xetexdir/pdfimage.cpp 2009-09-04 08:44:54.000000000 +0000
@@ -33,19 +33,27 @@ authorization from the copyright holders
#include "pdfimage.h"
+++ texk/web2c/xetexdir/pdfimage.cpp 2012-04-13 16:52:54.939126587 +0200
@@ -38,9 +38,18 @@ authorization from the copyright holders
#include <goo/gmem.h>
#include <goo/gfile.h>
#ifdef POPPLER_VERSION
-#include <dirent.h>
-#include <poppler-config.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
-#define GString GooString
+# include <dirent.h>
+# include <poppler-config.h>
+# include <goo/GooString.h>
+# include <goo/gmem.h>
+# include <goo/gfile.h>
+# define GString GooString
#else
-#include "goo/GString.h"
+# include "goo/GString.h"
#endif
-
-#include "PDFDoc.h"
-#include "Catalog.h"
-#include "Page.h"
@ -134,47 +90,30 @@
#define AUTHOR NULL
#define PROGRAM_HELP PDFTEXHELP
--- texk/web2c/pdftexdir/pdftoepdf.cc
+++ texk/web2c/pdftexdir/pdftoepdf.cc 2010-11-12 12:15:38.000000000 +0000
@@ -21,44 +21,41 @@ with this program. If not, see <http://
+++ texk/web2c/pdftexdir/pdftoepdf.cc 2012-04-13 16:56:57.780022236 +0200
@@ -21,7 +21,6 @@ with this program. If not, see <http://
conflicting with the definition for Pascal's boolean as 'int'
in <kpathsea/types.h>.
*/
-#define boolean MINGW32_boolean
-
#include <stdlib.h>
#include <math.h>
#include <stddef.h>
#include <stdio.h>
@@ -30,6 +29,10 @@ with this program. If not, see <http://
#include <string.h>
#include <ctype.h>
-
+extern "C" {
+#include <config.h>
+}
+
#ifdef POPPLER_VERSION
-#include <dirent.h>
-#include <poppler-config.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
-#define GString GooString
+# include <dirent.h>
+# include <poppler-config.h>
+# include <goo/GooString.h>
+# include <goo/gmem.h>
+# include <goo/gfile.h>
+# define GString GooString
#else
-#include <aconf.h>
-#include <GString.h>
-#include <gmem.h>
-#include <gfile.h>
-#include <assert.h>
+# include <aconf.h>
+# include <GString.h>
+# include <gmem.h>
+# include <gfile.h>
#include <dirent.h>
#include <poppler-config.h>
@@ -44,21 +47,18 @@ with this program. If not, see <http://
#include <gfile.h>
#endif
#include <assert.h>
-
-#include "Object.h"
-#include "Stream.h"
@ -190,7 +129,6 @@
-#include "Error.h"
-
-#undef boolean
+#include <assert.h>
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
@ -207,42 +145,27 @@
// This file is mostly C and not very much C++; it's just used to interface
// the functions of xpdf, which happens to be written in C++.
--- texk/web2c/pdftexdir/pdftosrc.cc
+++ texk/web2c/pdftexdir/pdftosrc.cc 2009-09-04 08:56:10.000000000 +0000
@@ -22,33 +22,35 @@ with this program. If not, see <http://
#include <stdio.h>
+++ texk/web2c/pdftexdir/pdftosrc.cc 2012-04-13 16:59:10.136510522 +0200
@@ -23,6 +23,10 @@ with this program. If not, see <http://
#include <string.h>
#include <ctype.h>
-
+extern "C" {
+#include <config.h>
+}
+
#ifdef POPPLER_VERSION
-#define GString GooString
-#define xpdfVersion POPPLER_VERSION
-#include <dirent.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
+# define GString GooString
+# define xpdfVersion POPPLER_VERSION
+# include <dirent.h>
+# include <goo/GooString.h>
+# include <goo/gmem.h>
+# include <goo/gfile.h>
#else
-#include <aconf.h>
-#include <assert.h>
-#include <GString.h>
-#include <gmem.h>
-#include <gfile.h>
+# include <aconf.h>
+# include <GString.h>
+# include <gmem.h>
+# include <gfile.h>
#define GString GooString
#define xpdfVersion POPPLER_VERSION
@@ -37,20 +41,20 @@ with this program. If not, see <http://
#include <gfile.h>
#endif
#include <assert.h>
-
-#include "Object.h"
-#include "Stream.h"
-#include "Lexer.h"
-#include "Parser.h"
-#include "Array.h"
-#include "Dict.h"
-#include "XRef.h"
@ -252,9 +175,10 @@
-#include "PDFDoc.h"
-#include "GlobalParams.h"
-#include "Error.h"
+#include <assert.h>
+#include <Object.h>
+#include <Stream.h>
+#include <Lexer.h>
+#include <Parser.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>

38
source-warns.dif
View File

@ -1,5 +1,5 @@
--- libs/icu/icu-4.6/i18n/decNumber.h
+++ libs/icu/icu-4.6/i18n/decNumber.h 2010-11-16 10:35:02.000000000 +0000
--- libs/icu/icu-49.1/i18n/decNumber.h
+++ libs/icu/icu-49.1/i18n/decNumber.h 2010-11-16 10:35:02.000000000 +0000
@@ -54,26 +54,30 @@
/* For ICU, use one digit per byte, to make it easier to emulate the
* old DigitList interface on top of a decNumber
@ -40,21 +40,22 @@
/* The number of units needed is ceil(DECNUMDIGITS/DECDPUN) */
#define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN)
--- libs/icu/icu-4.6/tools/pkgdata/pkgdata.cpp
+++ libs/icu/icu-4.6/tools/pkgdata/pkgdata.cpp 2010-11-16 10:43:55.000000000 +0000
@@ -1741,8 +1741,8 @@ static void loadLists(UPKGOptions *o, UE
/* #1 try the same path where pkgdata was called from. */
--- libs/icu/icu-49.1/tools/pkgdata/pkgdata.cpp
+++ libs/icu/icu-49.1/tools/pkgdata/pkgdata.cpp 2012-04-13 17:09:26.690772599 +0200
@@ -1917,9 +1917,9 @@ static void loadLists(UPKGOptions *o, UE
findDirname(progname, cmdBuf, 1024, &status);
if(U_SUCCESS(status)) {
- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
if (cmdBuf[0] != 0) {
- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
+ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, strlen(U_FILE_SEP_STRING));
}
- uprv_strncat(cmdBuf, cmd, 1024);
+ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, strlen(U_FILE_SEP_STRING));
+ uprv_strncat(cmdBuf, cmd, strlen(cmd));
if(verbose) {
fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
--- libs/teckit/TECkit-2.5.1/source/Compiler.cpp
+++ libs/teckit/TECkit-2.5.1/source/Compiler.cpp 2009-08-28 15:16:33.000000000 +0000
--- libs/teckit/TECkit-2.5.3/source/Compiler.cpp
+++ libs/teckit/TECkit-2.5.3/source/Compiler.cpp 2009-08-28 15:16:33.000000000 +0000
@@ -1451,13 +1451,16 @@ Compiler::Compiler(const char* txt, UInt
if (dest != 0) {
int result = compress2(dest + 8, &destLen, compiledTable, compiledSize, Z_BEST_COMPRESSION);
@ -240,20 +241,3 @@
}
else {
power = 10.0;
--- texk/ps2pkm/type1.c
+++ texk/ps2pkm/type1.c 2009-08-28 15:16:33.000000000 +0000
@@ -110,11 +110,11 @@ typedef struct xobject xobject;
static DOUBLE tmpx; /* Store macro argument in tmpx to avoid re-evaluation */
static LONG tmpi; /* Store converted value in tmpi to avoid re-evaluation */
-#define FABS(x) (((tmpx = (x)) < 0.0) ? -tmpx : tmpx)
+#define FABS(x) ({ tmpx = (x); (tmpx < 0.0) ? -tmpx : tmpx; })
-#define CEIL(x) (((tmpi = (LONG) (tmpx = (x))) < tmpx) ? ++tmpi : tmpi)
+#define CEIL(x) ({ tmpi = (LONG) (tmpx = (x)); (tmpi < tmpx) ? ++tmpi : tmpi; })
-#define FLOOR(x) (((tmpi = (LONG) (tmpx = (x))) > tmpx) ? --tmpi : tmpi)
+#define FLOOR(x) ({ tmpi = (LONG) (tmpx = (x)); (tmpi > tmpx) ? --tmpi : tmpi; })
#define ROUND(x) FLOOR((x) + 0.5)

67
source.dif
View File

@ -1,5 +1,5 @@
--- libs/icu/icu-4.6/common/Makefile.in
+++ libs/icu/icu-4.6/common/Makefile.in 2011-12-09 11:43:35.443147133 +0000
--- libs/icu/icu-49.1/common/Makefile.in
+++ libs/icu/icu-49.1/common/Makefile.in 2011-12-09 11:43:35.443147133 +0000
@@ -66,7 +66,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION @DEFS@
LDFLAGS += $(LDFLAGSICUUC)
@ -93,15 +93,18 @@
if (val ~ /\$SELFAUTO/) {
# Replace all semicolons with colons in the SELFAUTO paths we're keeping.
--- texk/kpathsea/db.c
+++ texk/kpathsea/db.c 2010-11-12 17:04:26.000000000 +0000
@@ -94,12 +94,21 @@ db_build (kpathsea kpse, hash_table_type
+++ texk/kpathsea/db.c 2012-04-13 17:32:17.831769704 +0200
@@ -89,7 +89,8 @@ db_build (kpathsea kpse, hash_table_type
unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */
string top_dir = (string)xmalloc (len + 1);
string cur_dir = NULL; /* First thing in ls-R might be a filename. */
- FILE *db_file = fopen (db_filename, FOPEN_R_MODE);
+ struct stat statdb;
+ FILE *db_file;
#if defined(WIN32)
string pp;
#endif
@@ -97,7 +98,15 @@ db_build (kpathsea kpse, hash_table_type
strncpy (top_dir, db_filename, len);
top_dir[len] = 0;
@ -332,21 +335,21 @@
done
$verbose && echo "$progname: Done." >&2
--- texk/kpathsea/progname.c
+++ texk/kpathsea/progname.c 2011-12-07 11:56:54.567647087 +0000
@@ -612,9 +612,9 @@ kpathsea_set_program_name (kpathsea kpse
+++ texk/kpathsea/progname.c 2012-04-13 17:34:49.108319823 +0200
@@ -665,9 +665,9 @@ kpathsea_set_program_name (kpathsea kpse
/* SELFAUTODIR is actually the parent of the invocation directory,
and SELFAUTOPARENT the grandparent. This is how teTeX did it. */
kpathsea_xputenv (kpse, "SELFAUTOLOC", sdir);
kpathsea_xputenv (kpse, "SELFAUTOLOC", fix_selfdir (sdir));
- sdir_parent = xdirname (sdir);
+ sdir_parent = xstrdup ("/usr/lib");
kpathsea_xputenv (kpse, "SELFAUTODIR", sdir_parent);
+ sdir_parent = xdirname ("/usr/lib");
kpathsea_xputenv (kpse, "SELFAUTODIR", fix_selfdir (sdir_parent));
- sdir_grandparent = xdirname (sdir_parent);
+ sdir_grandparent = xstrdup ("/usr/share");
kpathsea_xputenv (kpse, "SELFAUTOPARENT", sdir_grandparent);
+ sdir_grandparent = xdirname ("/usr/lib/texmf");
kpathsea_xputenv (kpse, "SELFAUTOPARENT", fix_selfdir (sdir_grandparent));
#if defined(WIN32) || defined(__MINGW32__) || defined(__CYGWIN__)
#if defined(WIN32) || defined(__CYGWIN__)
--- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2011-09-14 09:42:47.752427040 +0000
+++ texk/kpathsea/texmf.cnf 2012-04-13 17:40:30.545560342 +0200
@@ -53,31 +53,34 @@ TEXMFROOT = $SELFAUTOPARENT
% The tree containing runtime files related to the specific
@ -475,7 +478,7 @@
% LuaTeX.
TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
@@ -223,18 +225,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
@@ -229,18 +231,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic}//
% jadetex.
@ -500,7 +503,7 @@
% Earlier entries override later ones, so put this generic one last.
TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
@@ -253,13 +255,13 @@ MPINPUTS = .;$TEXMF/metapost//
@@ -259,13 +261,13 @@ MPINPUTS = .;$TEXMF/metapost//
% We repeat the same definition three times because of the way fmtutil
% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
% will not be found.
@ -518,7 +521,7 @@
MFPOOL = ${TEXPOOL}
MPPOOL = ${TEXPOOL}
@@ -287,7 +289,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
@@ -293,7 +295,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
GLYPHFONTS = .;$TEXMF/fonts
% A place to puth everything that doesn't fit the other font categories.
@ -527,7 +530,7 @@
% font name map files. This isn't just fonts/map// because ConTeXt
% wants support for having files with the same name in the different
@@ -365,8 +367,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
@@ -375,8 +377,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
% For xdvi to find mime.types and .mailcap, if they do not exist in
% ~. These are single directories, not paths.
% (But the default mime.types, at least, may well suffice.)
@ -536,9 +539,9 @@
+MIMELIBDIR = /etc
+MAILCAPLIBDIR = /etc
% Default settings for fontconfig library, used by Windows versions of
% xetex/xdvipdfmx. On Unixish systems, fontconfig ignores this.
@@ -442,7 +444,8 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
% Default settings for the fontconfig library as used by the Windows
% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores
@@ -463,7 +465,8 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
%
% For security reasons, it is better not to include . in this path.
%
@ -548,7 +551,7 @@
% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
% expansions from binaries linked against an earlier version of the
@@ -621,9 +624,9 @@ BIBTEX_CSFILE = 88591lat.csf
@@ -642,9 +645,9 @@ BIBTEX_CSFILE = 88591lat.csf
% For some xy-pic samples, you may need as much as 700000 words of memory.
% For the vast majority of documents, 60000 or less will do.
%
@ -561,7 +564,7 @@
% ConTeXt needs lots of memory.
extra_mem_top.context = 2000000
@@ -707,3 +710,33 @@ max_strings.pbibtex = 35307
@@ -728,3 +731,33 @@ max_strings.pbibtex = 35307
line_length.gftype = 500
max_rows.gftype = 8191
max_cols.gftype = 8191
@ -681,7 +684,7 @@
- return octal & 0xff;
-}
--- texk/tetex/fmtutil
+++ texk/tetex/fmtutil 2010-11-12 17:22:52.000000000 +0000
+++ texk/tetex/fmtutil 2012-04-13 17:37:18.912864213 +0200
@@ -160,7 +160,7 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15
@ -691,16 +694,16 @@
|| abort "could not create directory \`$tmpdir'"
}
@@ -419,7 +419,7 @@ main()
need_find_hyphenfile=false
cfgparam=
cfgmaint=
- tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
+ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$RANDOM
@@ -422,7 +422,7 @@ main()
verboseFlag=true
noAbortFlag=false
# eradicate double slashes to avoid kpathsea expansion.
- tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ | sed s,//,/,g`
+ tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$RANDOM | sed s,//,/,g`
@@ -743,6 +743,7 @@ run_initex()
# mktexfmtMode: if called as mktexfmt, set to true. Will echo the
# first generated filename after successful generation to stdout then
@@ -744,6 +744,7 @@ run_initex()
*) prgswitch=-progname=$format;;
esac
@ -708,7 +711,7 @@
rm -f $fmtfile
# Check for infinite recursion before running the iniTeX:
@@ -756,6 +757,12 @@ run_initex()
@@ -757,6 +758,12 @@ run_initex()
mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop

3
texlive-20110705-source.tar.xz
View File

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

3
texlive-20120413-source.tar.xz Normal file
View File

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

15288
texlive.spec
View File

File diff suppressed because it is too large Load Diff