xdvi-commits — Copies of cvs messages.

[Xdvi-commits] xdvi ft.c, 1.2, 1.3 popups.c, 1.26, 1.27 special.c, 1.36, 1.37 xdvi.c, 1.55, 1.56

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvi
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22948

Modified Files:
	ft.c popups.c special.c xdvi.c 
Log Message:
Avoid undefined behavior when char is signed (TeX Live r34310)


Index: popups.c
===================================================================
RCS file: /cvsroot/xdvi/xdvi/popups.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- popups.c	24 May 2016 04:55:24 -0000	1.26
+++ popups.c	26 Jun 2016 00:06:34 -0000	1.27
@@ -1,6 +1,6 @@
 /*========================================================================*\
 
-Copyright (c) 2001-2004  Paul Vojta
+Copyright (c) 2001-2016  Paul Vojta
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -28,11 +28,13 @@
  */
 
 #include "xdvi.h"
-#include <ctype.h>
 #include <errno.h>
 #include <signal.h>
 #include <sys/stat.h>
 
+#include <ctype.h>
+#define xisdigit(arg)	isdigit((unsigned char) (arg))
+
 /* Xlib and Xutil are already included */
 
 #include <X11/Xatom.h>
@@ -1912,7 +1914,7 @@
 	    Widget		f1label, f1cmd1, f1cmd2;
 	    Widget		f3label;
 	    Widget		f4label;
-	    Widget		f5chk, f5label;
+	    Widget		f5chk;
 	    Widget		f6ok, f6cancel;
 	    static XtTranslations form_xlats, form_xlats2;
 	    XtTranslations	xlats;
@@ -2134,7 +2136,7 @@
 	      NULL);
 	    XtAddCallback(f5chk, XtNcallback, cb_file_hidechk, NULL);
 
-	    f5label = XtVaCreateManagedWidget("hidlabel", labelWidgetClass,
+	    (void) XtVaCreateManagedWidget("hidlabel", labelWidgetClass,
 	      form,
 	      XtNlabel, "Show hidden files and directories",
 	      XtNborderWidth, 0,
@@ -3660,8 +3662,8 @@
 #endif
 	p = s;
 	if (*p == '-') ++p;
-	if (!isdigit(*p)) return 0;
-	do ++p; while (isdigit(*p));
+	if (!xisdigit(*p)) return 0;
+	do ++p; while (xisdigit(*p));
 	if (*p != '\0') return 0;
 
 #if XAW

Index: ft.c
===================================================================
RCS file: /cvsroot/xdvi/xdvi/ft.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ft.c	24 May 2016 04:55:24 -0000	1.2
+++ ft.c	26 Jun 2016 00:06:34 -0000	1.3
@@ -1,6 +1,6 @@
 /*========================================================================*\
 
-Copyright (c) 2013  Paul Vojta
+Copyright (c) 2013-2016  Paul Vojta
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -29,7 +29,10 @@
 #include "xdvi.h"
 
 #include <math.h>
+
 #include <ctype.h>
+#define xisdigit(arg)	isdigit((unsigned char) (arg))
+#define xisspace(arg)	isspace((unsigned char) (arg))
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -212,39 +215,39 @@
 	double	y	= 0.0;
 
 	for (;;) {
-	    while (isspace(*str)) ++str;
+	    while (xisspace(*str)) ++str;
 	    if (*str == '\0')
 		break;
 
-	    if (isdigit(*str) || *str == '.' || *str == '-') {
+	    if (xisdigit(*str) || *str == '.' || *str == '-') {
 		double	arg	= strtod(str, (char **) &str);
 
-		while (isspace(*str)) ++str;
+		while (xisspace(*str)) ++str;
 
 		if (memcmp(str, "ObliqueSlant", 12) == 0
-		  && (isspace(str[12]) || str[12] == '\0')) {
+		  && (xisspace(str[12]) || str[12] == '\0')) {
 		    arg = -tan(arg);
 		    str += 12;
-		    while (isspace(*str)) ++str;
+		    while (xisspace(*str)) ++str;
 		}
 
 		if (memcmp(str, "SlantFont", 9) == 0
-		  && (isspace(str[9]) || str[9] == '\0')) {
+		  && (xisspace(str[9]) || str[9] == '\0')) {
 		    y += arg;
 		    str += 9;
 		}
 		else if (memcmp(str, "ExtendFont", 10) == 0
-		  && (isspace(str[10]) || str[10] == '\0')) {
+		  && (xisspace(str[10]) || str[10] == '\0')) {
 		    x *= arg;
 		    str += 10;
 		}
 		else return False;
 	    }
 	    else {	/* other characters; presume encoding name */
-		while (!isspace(*str) && *str != '\0') ++str;
-		while (isspace(*str)) ++str;
+		while (!xisspace(*str) && *str != '\0') ++str;
+		while (xisspace(*str)) ++str;
 		if (memcmp(str, "ReEncodeFont", 12) == 0
-		  && (isspace(str[12]) || str[12] == '\0'))
+		  && (xisspace(str[12]) || str[12] == '\0'))
 		    str += 12;
 		else
 		    return False;

Index: xdvi.c
===================================================================
RCS file: /cvsroot/xdvi/xdvi/xdvi.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- xdvi.c	9 Jan 2015 01:36:23 -0000	1.55
+++ xdvi.c	26 Jun 2016 00:06:34 -0000	1.56
@@ -1,6 +1,6 @@
 /*========================================================================*\
 
-Copyright (c) 1990-2014  Paul Vojta
+Copyright (c) 1990-2016  Paul Vojta
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -83,7 +83,9 @@
 #endif
 
 #include <math.h>	/* sometimes includes atof() */
+
 #include <ctype.h>
+#define xisdigit(arg)	isdigit((unsigned char) (arg))
 
 #if NeedVarargsPrototypes		/* this is for usage() */
 #include <stdarg.h>
@@ -2207,7 +2209,6 @@
 {
 	_Xconst char		*p = *pp;
 	_Xconst char		*p1;
-	Bool			exclusive = False;
 	LateBindingsPtr		latep = NULL;
 	int			nlate;
 
@@ -2234,7 +2235,7 @@
 	}
 	else {
 	    if (*p == '!') {
-		exclusive = True;
+		/* exclusive = True; */
 		do {
 		    ++p;
 		} while (*p == ' ' || *p == '\t');
@@ -2789,7 +2790,7 @@
 	if (resource.progname != NULL)
 	    prog = resource.progname;
 	if (resource.debug_arg != NULL)
-	    debug = isdigit(*resource.debug_arg) ? atoi(resource.debug_arg)
+	    debug = xisdigit(*resource.debug_arg) ? atoi(resource.debug_arg)
 		: DBG_ALL;
 
 	readconfig();
@@ -2853,7 +2854,7 @@
 
 #if !EXTRA_APP_DEFAULTS
 	if (resource.debug_arg != NULL)
-	    debug = isdigit(*resource.debug_arg) ? atoi(resource.debug_arg)
+	    debug = xisdigit(*resource.debug_arg) ? atoi(resource.debug_arg)
 		: DBG_ALL;
 #endif
 

Index: special.c
===================================================================
RCS file: /cvsroot/xdvi/xdvi/special.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- special.c	15 Feb 2015 04:17:57 -0000	1.36
+++ special.c	26 Jun 2016 00:06:34 -0000	1.37
@@ -1,6 +1,6 @@
 /*========================================================================*\
 
-Copyright (c) 1990-2015  Paul Vojta
+Copyright (c) 1990-2016  Paul Vojta
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -56,7 +56,11 @@
 #include "xdvi.h"
 
 #include <math.h>
+
 #include <ctype.h>
+#define xisdigit(arg)	isdigit((unsigned char) (arg))
+#define xisalpha(arg)	isalpha((unsigned char) (arg))
+#define xisspace(arg)	isspace((unsigned char) (arg))
 
 extern	char	*strtok ARGS((char *, _Xconst char *));
 extern	double	floor ARGS((double));
@@ -819,8 +823,8 @@
 	bbox_angle = 0;
 	p = strstr(PostScript_cmd, "rotate");
 	if (p != NULL) {
-	    while (*p != '\0' && !isdigit(*p)) --p;
-	    while (*p != '\0' && isdigit(*p)) --p;
+	    while (*p != '\0' && !xisdigit(*p)) --p;
+	    while (*p != '\0' && xisdigit(*p)) --p;
 	    if (*p != '+' && *p != '-') ++p;
 	    sscanf(p, "%d neg rotate", &bbox_angle);
 	}
@@ -1243,8 +1247,8 @@
 	    psfig_begun = True;
 	} else if (strncmp(cp, " plotfile ", 10) == 0) {
 	    cp += 10;
-	    while (isspace(*cp)) cp++;
-	    for (filename = cp; !isspace(*cp); ++cp);
+	    while (xisspace(*cp)) cp++;
+	    for (filename = cp; !xisspace(*cp); ++cp);
 	    *cp = '\0';
 #if	PS
 	    if (currwin.win == mane.win) send_ps_file(filename, &search_fig);
@@ -1326,9 +1330,9 @@
 	    ++filename;
 	}
 	else
-	    while (*cp != '\0' && !isspace(*cp)) ++cp;
+	    while (*cp != '\0' && !xisspace(*cp)) ++cp;
 	if (*cp != '\0') *cp++ = '\0';
-	while (isspace(*cp)) ++cp;
+	while (xisspace(*cp)) ++cp;
 	len = strlen(cp) + NKEYS + 30;
 	if (buflen < len) {
 	    if (buflen != 0) free(buffer);
@@ -1341,7 +1345,7 @@
 	    char *p1 = cp;
 	    int keyno;
 
-	    while (*p1 != '=' && !isspace(*p1) && *p1 != '\0') ++p1;
+	    while (*p1 != '=' && !xisspace(*p1) && *p1 != '\0') ++p1;
 	    for (keyno = 0;; ++keyno) {
 		if (keyno >= NKEYS) {
 		    if (warn_spec_now)
@@ -1352,17 +1356,17 @@
 		}
 		if (memcmp(cp, keytab[keyno], p1 - cp) == 0) {
 		    if (keyno >= N_ARGLESS_KEYS) {
-			while (isspace(*p1)) ++p1;
+			while (xisspace(*p1)) ++p1;
 			if (*p1 == '=') {
 			    ++p1;
-			    while (isspace(*p1)) ++p1;
+			    while (xisspace(*p1)) ++p1;
 			}
 			if (keyno < N_ARGLESS_KEYS + 6) {
 			    keyval[keyno - N_ARGLESS_KEYS] = atof(p1);
 			    flags |= (1 << (keyno - N_ARGLESS_KEYS));
 			}
 			*q++ = ' ';
-			while (!isspace(*p1) && *p1 != '\0') *q++ = *p1++;
+			while (!xisspace(*p1) && *p1 != '\0') *q++ = *p1++;
 		    }
 		    *q++ = ' ';
 		    *q++ = '@';
@@ -1372,8 +1376,8 @@
 		}
 	    }
 	    cp = p1;
-	    while (!isspace(*cp) && *cp != '\0') ++cp;
-	    while (isspace(*cp)) ++cp;
+	    while (!xisspace(*cp) && *cp != '\0') ++cp;
+	    while (xisspace(*cp)) ++cp;
 	}
 	Strcpy(q, " @setspecial\n");
 
@@ -1640,7 +1644,7 @@
 	    int len;
 
 	    len = 0;
-	    while (isalpha(cp[len]))
+	    while (xisalpha(cp[len]))
 		++len;	/* get length of color name */
 	    do {
 		struct dvipscolor *dp;
@@ -1964,7 +1968,7 @@
 	p0 = cp;
 	while ((*cp >= '0' && *cp <= '9') || *cp == '.') ++cp;
 	p1 = cp;
-	while (isspace(*cp)) ++cp;
+	while (xisspace(*cp)) ++cp;
 	if (*cp >= 'a' && *cp <= 'z' && cp[1] >= 'a' && cp[1] <= 'z') {
 	    /* if units are present */
 	    if (p1 - p0 <= XtNumber(scr) - 3) {
@@ -1993,15 +1997,15 @@
 	    return;
 
 	if (*cp == '*') {
-	    do ++cp; while (isspace(*cp));
+	    do ++cp; while (xisspace(*cp));
 	    mag = magnification * .001;
 	}
 	    
 	w = myatopix(&cp) * mag + 0.5;
 
-	while (isspace(*cp)) ++cp;
+	while (xisspace(*cp)) ++cp;
 	if (*cp == ',')
-	    do ++cp; while (isspace(*cp));
+	    do ++cp; while (xisspace(*cp));
 
 	h = myatopix(&cp) * mag + 0.5;
 
@@ -2044,9 +2048,9 @@
 endofcommand(cp)
 	char	*cp;
 {
-	while (isspace(*cp)) ++cp;
+	while (xisspace(*cp)) ++cp;
 	if (*cp != '=') return NULL;
-	do ++cp; while (isspace(*cp));
+	do ++cp; while (xisspace(*cp));
 	return cp;
 }
 
@@ -2062,12 +2066,12 @@
 	    Printf("          `%s'\n", cp);
 
 	/* Skip white space */
-	while (isspace(*cp)) ++cp;
+	while (xisspace(*cp)) ++cp;
 
 	/* Ignore initial "xdvi:" */
 	if (memcmp(cp, "xdvi:", 5) == 0) {
 	    cp += 5;
-	    while (isspace(*cp)) ++cp;
+	    while (xisspace(*cp)) ++cp;
 	}
 
 	/* PostScript specials */
@@ -2147,7 +2151,7 @@
 	/* tpic specials */
 
 	if (*cp >= 'a' && *cp <= 'z' && cp[1] >= 'a' && cp[1] <= 'z' &&
-		(isspace(cp[2]) || cp[2] == '\0')) {
+		(xisspace(cp[2]) || cp[2] == '\0')) {
 	    switch (CMD(*cp, cp[1])) {
 		case CMD('p','n'): set_pen_size(cp + 2); return;
 		case CMD('f','p'): flush_path(); return;
@@ -2182,12 +2186,12 @@
 	    Printf("Scanning special `%s'.\n", cp);
 
 	/* Skip white space */
-	while (isspace(*cp)) ++cp;
+	while (xisspace(*cp)) ++cp;
 
 	/* Ignore initial "xdvi:" */
 	if (memcmp(cp, "xdvi:", 5) == 0) {
 	    cp += 5;
-	    while (isspace(*cp)) ++cp;
+	    while (xisspace(*cp)) ++cp;
 	}
 
 #if PS
@@ -2246,12 +2250,12 @@
 	_Xconst char	*p;
 
 	/* Skip white space */
-	while (isspace(*cp)) ++cp;
+	while (xisspace(*cp)) ++cp;
 
 	/* Ignore initial "xdvi:" */
 	if (memcmp(cp, "xdvi:", 5) == 0) {
 	    cp += 5;
-	    while (isspace(*cp)) ++cp;
+	    while (xisspace(*cp)) ++cp;
 	}
 
 	if (memicmp(cp, "psfile", 6) == 0
@@ -2267,33 +2271,33 @@
 		while (*p != '\0' && *p != c);
 	    }
 	    else
-		while (*p != '\0' && !isspace(*p)) ++p;
-	    while (isspace(*p)) ++p;
+		while (*p != '\0' && !xisspace(*p)) ++p;
+	    while (xisspace(*p)) ++p;
 	    while (*p != '\0') {
 		_Xconst char *p1 = p;
 		int keyno;
 
-		while (*p1 != '=' && !isspace(*p1) && *p1 != '\0') ++p1;
+		while (*p1 != '=' && !xisspace(*p1) && *p1 != '\0') ++p1;
 		for (keyno = 0; keyno < NKEYS; ++keyno) {
 		    if (memcmp(p, keytab[keyno], p1 - p) == 0) {
 			if (keyno >= N_ARGLESS_KEYS) {
-			    while (isspace(*p1)) ++p1;
+			    while (xisspace(*p1)) ++p1;
 			    if (*p1 == '=') {
 				++p1;
-				while (isspace(*p1)) ++p1;
+				while (xisspace(*p1)) ++p1;
 			    }
 			    if (keyno < N_ARGLESS_KEYS + 6) {
 				keyval[keyno - N_ARGLESS_KEYS] = atof(p1);
 				flags |= (1 << (keyno - N_ARGLESS_KEYS));
 			    }
-			    while (!isspace(*p1) && *p1 != '\0') ++p1;
+			    while (!xisspace(*p1) && *p1 != '\0') ++p1;
 			}
 			break;
 		    }
 		}
 		p = p1;
-		while (!isspace(*p) && *p != '\0') ++p;
-		while (isspace(*p)) ++p;
+		while (!xisspace(*p) && *p != '\0') ++p;
+		while (xisspace(*p)) ++p;
 	    }
 
 	    if ((flags & 0x30) == 0x30

[Xdvi-commits] xdvi ft.c, 1.1, 1.2 popups.c, 1.25, 1.26 xdvi.h, 1.62, 1.63

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvi
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28189

Modified Files:
	ft.c popups.c xdvi.h 
Log Message:
xdvi.h, ft.c, popups.c: Eliminate some compiler warnings.


Index: ft.c
===================================================================
RCS file: /cvsroot/xdvi/xdvi/ft.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ft.c	7 May 2013 19:14:29 -0000	1.1
+++ ft.c	24 May 2016 04:55:24 -0000	1.2
@@ -29,6 +29,7 @@
 #include "xdvi.h"
 
 #include <math.h>
+#include <ctype.h>
 
 #include <ft2build.h>
 #include FT_FREETYPE_H

Index: popups.c
===================================================================
RCS file: /cvsroot/xdvi/xdvi/popups.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- popups.c	18 May 2012 20:11:44 -0000	1.25
+++ popups.c	24 May 2016 04:55:24 -0000	1.26
@@ -4371,6 +4371,7 @@
 
 static void
 dvips_ended(status)
+	int	status;
 {
 	char	*str;
 	int	ms;

Index: xdvi.h
===================================================================
RCS file: /cvsroot/xdvi/xdvi/xdvi.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- xdvi.h	9 Jan 2015 01:36:23 -0000	1.62
+++ xdvi.h	24 May 2016 04:55:24 -0000	1.63
@@ -46,6 +46,7 @@
 #define	_XOPEN_SOURCE	600
 #define	_XOPEN_SOURCE_EXTENDED	1
 #define	__EXTENSIONS__	1	/* needed to get struct timeval on SunOS 5.5 */
+#define	_DEFAULT_SOURCE	1	/* this will eventually replace the next two */
 #define	_SVID_SOURCE	1	/* needed to get S_IFLNK in glibc */
 #define	_BSD_SOURCE	1	/* needed to get F_SETOWN in glibc-2.1.3 */
 #endif
@@ -69,6 +70,12 @@
 # define FUNCPROTO (-1)
 #endif
 
+#if HAVE_VASPRINTF
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	/* Needed to get prototype for vasprintf() */
+# endif
+#endif
+
 #if STDC_HEADERS
 # include <stddef.h>
 # include <stdlib.h>

[Xdvi-commits] xdvik/texk/xdvik CHANGES, 1.131, 1.132 configure, 1.132, 1.133 configure.ac, 1.10, 1.11 version.h, 1.363, 1.364

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/texk/xdvik
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18675/texk/xdvik

Modified Files:
	CHANGES configure configure.ac version.h 
Log Message:
Release Version 22.87.03.


Index: configure
===================================================================
RCS file: /cvsroot/xdvi/xdvik/texk/xdvik/configure,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- configure	26 Mar 2016 06:29:10 -0000	1.132
+++ configure	2 Apr 2016 19:16:49 -0000	1.133
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xdvik 22.87.
+# Generated by GNU Autoconf 2.69 for xdvik 22.87.03.
 #
 # Report bugs to <te...@tu...>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='xdvik'
 PACKAGE_TARNAME='xdvik'
-PACKAGE_VERSION='22.87'
-PACKAGE_STRING='xdvik 22.87'
+PACKAGE_VERSION='22.87.03'
+PACKAGE_STRING='xdvik 22.87.03'
 PACKAGE_BUGREPORT='te...@tu...'
 PACKAGE_URL=''
 
@@ -1388,7 +1388,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xdvik 22.87 to adapt to many kinds of systems.
+\`configure' configures xdvik 22.87.03 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1463,7 +1463,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xdvik 22.87:";;
+     short | recursive ) echo "Configuration of xdvik 22.87.03:";;
    esac
   cat <<\_ACEOF
 
@@ -1618,7 +1618,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xdvik configure 22.87
+xdvik configure 22.87.03
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2457,7 +2457,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xdvik $as_me 22.87, which was
+It was created by xdvik $as_me 22.87.03, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8142,7 +8142,7 @@
 
 # Define the identity of the package.
  PACKAGE='xdvik'
- VERSION='22.87'
+ VERSION='22.87.03'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17748,7 +17748,7 @@
 Report bugs to <bug...@gn...>."
 
 lt_cl_version="\
-xdvik config.lt 22.87
+xdvik config.lt 22.87.03
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -19108,7 +19108,7 @@
 _ACEOF
 
 
-XDVIK_VERSION=22.87
+XDVIK_VERSION=22.87.03
 
 
 ac_config_files="$ac_config_files Makefile tests/Makefile"
@@ -19659,7 +19659,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xdvik $as_me 22.87, which was
+This file was extended by xdvik $as_me 22.87.03, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19725,7 +19725,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xdvik config.status 22.87
+xdvik config.status 22.87.03
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/xdvi/xdvik/texk/xdvik/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure.ac	22 Mar 2016 02:19:45 -0000	1.10
+++ configure.ac	2 Apr 2016 19:16:49 -0000	1.11
@@ -6,7 +6,7 @@
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([xdvik_version], [22.87])
+m4_define([xdvik_version], [22.87.03])
 AC_INIT([xdvik], xdvik_version, [te...@tu...])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([xdvi.c])

Index: version.h
===================================================================
RCS file: /cvsroot/xdvi/xdvik/texk/xdvik/version.h,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -d -r1.363 -r1.364
--- version.h	13 Apr 2014 03:58:39 -0000	1.363
+++ version.h	2 Apr 2016 19:16:49 -0000	1.364
@@ -2,7 +2,7 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-#define XDVI_VERSION "22.87"
+#define XDVI_VERSION "22.87.03"
 
 #ifdef MOTIF
 #define XDVI_GUI "(Motif toolkit)"

Index: CHANGES
===================================================================
RCS file: /cvsroot/xdvi/xdvik/texk/xdvik/CHANGES,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- CHANGES	1 Apr 2016 07:09:25 -0000	1.131
+++ CHANGES	2 Apr 2016 19:16:49 -0000	1.132
@@ -9,7 +9,7 @@
 may contain undetected bugs. Such versions shouldn't be used
 by distributors.
 
-   * 22.87.02 CVS17 (2016-03-25):
+   * 22.87.03 (2016-04-02):
 	+ incorporated changes in xdvik itself from the TeX Live version:
 	  m4/xdvi-check-iconv.m4: Somewhat improved logic.
 	  many places: avoided compiler warnings and cleaned up including of

[Xdvi-commits] xdvik/texk/xdvik CHANGES, 1.130, 1.131 events.c, 1.416, 1.417 special.c, 1.159, 1.160 special.h, 1.24, 1.25

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/texk/xdvik
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26450

Modified Files:
	CHANGES events.c special.c special.h 
Log Message:
Internal changes in handling of PostScript specials.


Index: events.c
===================================================================
RCS file: /cvsroot/xdvi/xdvik/texk/xdvik/events.c,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -d -r1.416 -r1.417
--- events.c	14 Feb 2016 06:20:27 -0000	1.416
+++ events.c	1 Apr 2016 07:09:25 -0000	1.417
@@ -1,6 +1,6 @@
 /*======================================================================*\
 
-Copyright (c) 1990-2015  Paul Vojta and others
+Copyright (c) 1990-2016  Paul Vojta and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -5162,7 +5162,7 @@
     }
 
 #if PS
-    ps_destroy();
+    ps_destroy_nofree();
 #endif
 
     /* loop through child processes */
@@ -6222,8 +6222,6 @@
 				      True,
 #endif
 				      &errflag)) {
-#if PS
-			ps_clear_cache();
 #if PS_GS
 			if (resource.gs_alpha) {
 			    /* restart gs so that user has a method for fixing GS artifacts with gs_alpha
@@ -6231,7 +6229,6 @@
 			    ps_destroy();
 			}
 #endif
-#endif
 			statusline_info(STATUS_SHORT, "File reloaded.");
 		    }
 		    /* 		    else { */

Index: CHANGES
===================================================================
RCS file: /cvsroot/xdvi/xdvik/texk/xdvik/CHANGES,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- CHANGES	26 Mar 2016 06:29:10 -0000	1.130
+++ CHANGES	1 Apr 2016 07:09:25 -0000	1.131
@@ -30,7 +30,7 @@
 	+ dvi-draw.c:  Fixed bug #398 (crashed with message "currinf.set_char_p
 	  is not a registered routine!" during scanning (string searches
 	  or source specials))
-	+ many places:  Update from TeX Live:
+	+ many places:  Update from TeX Live, as of 2016-03-18:
 	  Disable smooth scrolling by default for native TeX Live builds
 	  Change handling of subdirectory squeeze (when cross compiling)
 	  Avoid undefined behaviour when char is signed
@@ -39,6 +39,8 @@
 	  Minor changes to avoid some compiler warnings
 	  psheader.txt: Remove psfig macros due to copyright issues
 	  Pulled in updated libraries, etc.
+	  Removed outdated copies of the freetype2 library
+	+ Internal changes in handling of PostScript file inclusion
 
    * 22.87 (2014-04-12):
 	+ ft.c: Avoid a compiler warning.

Index: special.c
===================================================================
RCS file: /cvsroot/xdvi/xdvik/texk/xdvik/special.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- special.c	29 Dec 2015 00:17:34 -0000	1.159
+++ special.c	1 Apr 2016 07:09:25 -0000	1.160
@@ -1,6 +1,6 @@
 /*========================================================================*\
 
-Copyright (c) 1990-2015  Paul Vojta
+Copyright (c) 1990-2016  Paul Vojta and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -946,102 +946,120 @@
 }
 
 
-struct tickrec {
-    struct tickrec *next;
-    int pageno;
-    char *command;
+/*
+ *	Mechanism to keep track of included PS files.
+ */
+
+struct avl_psinfo {
+    AVL_COMMON;
+    char *fullpath;
     char *tempname;
+    dev_t ps_dev;
+    ino_t ps_ino;
+    time_t ps_mtime;
+    Boolean is_new;	/* set if previous use failed because of !allow_shell */
 };
 
-static struct tickrec *tickhead = NULL;	/* head of linked list of */
-/* cached information */
-static int nticks = 0;	/* number of records total */
+static struct avl_psinfo *psinfo_head = NULL;
 
-#ifndef	TICKCACHESIZE
-#define	TICKCACHESIZE	3
-#endif
 
 /*
- *	cachetick() - returns:
- *		NULL		error;
- *		fp == NULL	string was not in cache, fd = file
- *		fp != NULL	string was in cache, fp = cached file
+ *	ps_clear_cache() resets the cache to the empty state.
  */
 
-static struct tickrec *
-cachetick(const char *filename, kpse_file_format_type pathinfo, FILE **fp, int *fdp)
+static void
+clear_psinfo_node(struct avl_psinfo *psinfp)
 {
-    struct tickrec **linkp;
-    struct tickrec *tikp;
-    struct tickrec **freerecp;
+    if (psinfp->fullpath != NULL) {
+	free(psinfp->fullpath);
+	psinfp->fullpath = NULL;
+    }
+    if (psinfp->tempname != NULL) {
+	if (unlink(psinfp->tempname) < 0)
+	    perror(psinfp->tempname);
+	free(psinfp->tempname);
+	psinfp->tempname = NULL;
+    }
+}
 
-    linkp = &tickhead;
-    freerecp = NULL;
-    for (;;) {	/* see if we have it already */
-	tikp = *linkp;
-	if (tikp == NULL) {	/* if end of list */
-	    int fd;
+static void
+clear_psinfo_tree(struct avl_psinfo *psinfp)
+{
+    if (psinfp == NULL)
+	return;
 
-	    if (nticks >= TICKCACHESIZE && freerecp != NULL) {
-		tikp = *freerecp;
-		*freerecp = tikp->next;
-		free(tikp->command);
-		unlink(tikp->tempname);
-		/* reuse tikp and tikp->tempname */
-	    }
-	    else {
-		tikp = xmalloc(sizeof(struct tickrec));
-		tikp->tempname = NULL;
-		++nticks;
-	    }
-	    fd = xdvi_temp_fd(&tikp->tempname);
-	    if (fd == -1) {
-		perror("Cannot create temporary file");
-		free(tikp->tempname);
-		free(tikp);
-		return NULL;
-	    }
-	    tikp->command = xstrdup(filename);
-	    *fp = NULL;
-	    *fdp = fd;
-	    break;
-	}
-	if (strcmp(filename, tikp->command) == 0) {	/* found it */
-	    *linkp = tikp->next;	/* unlink it */
-	    *fp = XFOPEN(tikp->tempname, OPEN_MODE);
-	    if (*fp == NULL) {
-		perror(tikp->tempname);
-		free(tikp->tempname);
-		free(tikp->command);
-		free(tikp);
-		return NULL;
-	    }
-	    break;
-	}
-	if (tikp->pageno != current_page)
-	    freerecp = linkp;
-	linkp = &tikp->next;
-    }
-    tikp->next = tickhead;	/* link it in */
-    tickhead = tikp;
-    tikp->pageno = pathinfo != kpse_tex_ps_header_format ? current_page : -1;
-    return tikp;
+    clear_psinfo_tree((struct avl_psinfo *) psinfp->left);
+    clear_psinfo_tree((struct avl_psinfo *) psinfp->right);
+    free((char *) psinfp->key);
+    clear_psinfo_node(psinfp);
+    free(psinfp);
 }
 
-void
+static void
 ps_clear_cache(void)
 {
-    struct tickrec *tikp;
+    clear_psinfo_tree(psinfo_head);
+    psinfo_head = NULL;
+}
 
-    while (tickhead != NULL) {
-	tikp = tickhead;
-	tickhead = tickhead->next;
-	free(tikp->command);
-	unlink(tikp->tempname);
-	free((char *)tikp->tempname);
-	free(tikp);
+
+/*
+ *	ps_clear_cache_nofree() does the same thing as ps_clear_cache(), but
+ *	without ever calling free().  This is because it may be called
+ *	following a segmentation fault, in which case the heap may be corrupted.
+ */
+
+static void
+clear_psinfo_node_nofree(struct avl_psinfo *psinfp)
+{
+    if (psinfp->fullpath != NULL) {
+	psinfp->fullpath = NULL;
     }
-    nticks = 0;
+    if (psinfp->tempname != NULL) {
+	if (unlink(psinfp->tempname) < 0)
+	    perror(psinfp->tempname);
+	psinfp->tempname = NULL;
+    }
+}
+
+static void
+clear_psinfo_tree_nofree(struct avl_psinfo *psinfp)
+{
+    if (psinfp == NULL)
+	return;
+
+    clear_psinfo_tree_nofree((struct avl_psinfo *) psinfp->left);
+    clear_psinfo_tree_nofree((struct avl_psinfo *) psinfp->right);
+    clear_psinfo_node_nofree(psinfp);
+}
+
+static void
+ps_clear_cache_nofree(void)
+{
+    clear_psinfo_tree_nofree(psinfo_head);
+    psinfo_head = NULL;
+}
+
+
+/*
+ *	ps_new_tempfile() - Opens a new temporary file.
+ *		Returns the fd, or -1 if an error occurred.
+ */
+
+static int
+ps_new_tempfile(struct avl_psinfo *psinfp)
+{
+    int fd;
+
+    fd = xdvi_temp_fd(&psinfp->tempname);
+    if (fd == -1) {
+	XDVI_ERROR((stderr,
+	  "Cannot create temporary file for PostScript figure file: %s",
+	  strerror(errno)));
+	free(psinfp->tempname);
+	psinfp->tempname = NULL;
+    }
+    return fd;
 }
 
 #ifndef	UNCOMPRESS
@@ -1080,16 +1098,17 @@
 	    this = NULL;	/* prevent freeing it twice */
 	}
 	else {
-	    struct tickrec *tikp = (struct tickrec *)this->data;
-	    FILE *f = XFOPEN(tikp->tempname, OPEN_MODE);
-	    fprintf(stderr, "FILE: %s\n", tikp->tempname);
+	    struct avl_psinfo *psinfp = (struct avl_psinfo *) this->data;
+	    FILE *f = XFOPEN(psinfp->tempname, OPEN_MODE);
+
+	    fprintf(stderr, "FILE: %s\n", psinfp->tempname);
 	    if (f == NULL) {
-		perror(tikp->tempname);
+		perror(psinfp->tempname);
 	    }
 	    else {
-		fprintf(stderr, "sending file: %s, %p\n", tikp->tempname, (void *)f);
+		fprintf(stderr, "sending file: %s, %p\n", psinfp->tempname, (void *)f);
 		/* There's no point in invoking
-		   psp.drawfile(tikp->tempname, f);
+		   psp.drawfile(psinfp->tempname, f);
 		   here, since usually it will be already too late (draw_part() which
 		   had called us via applicationDoSpecial() will already have terminated).
 		   So instead, we just close the file and force a redraw of the entire page.
@@ -1131,8 +1150,8 @@
     int fd;
     static const char *argv[] = { NULL, "-c", NULL, NULL };
     char *bufp = NULL;
-    struct tickrec *volatile tikp;
     size_t len;
+    struct avl_psinfo *volatile psinfp;
     char magic1, magic2, magic3;
     static Boolean warned_about_shellescape = False;
     static size_t ffline_len = 0;
@@ -1143,7 +1162,18 @@
 	return;
     }
 
+    len = strlen(filename);
+    psinfp = (struct avl_psinfo *) avladd(filename, len,
+      (struct avl **) &psinfo_head, sizeof(struct avl_psinfo));
+
+    if (psinfp->key == filename) {	/* if new record */
+	psinfp->is_new = True;
+	psinfp->key = xmemdup(filename, len + 1);
+	psinfp->fullpath = psinfp->tempname = NULL;
+    }
+
     if (filename[0] == '`') {
+	/* To test this code, use \special{psfile="`cat file.ps"} */
 	if (!resource.allow_shell) {
 	    if (!warned_about_shellescape) {
 		choice_dialog_sized(globals.widgets.top_level,
@@ -1187,114 +1217,195 @@
 	    return;
 	}
 
-	tikp = cachetick(filename, pathinfo, &f, &fd);
-	if (tikp == NULL)	/* if error */
-	    return;
-	if (f == NULL) {
+	if (!psinfp->is_new) {	/* if we already have it */
+	    if (psinfp->tempname == NULL) {	/* if previously known error */
+		draw_bbox();
+		return;
+	    }
+	    f = XFOPEN(psinfp->tempname, OPEN_MODE);
+	    if (f == NULL) {
+		perror(psinfp->tempname);
+		/* WARN1(XmDIALOG_ERROR,
+		  "Cannot open temporary PostScript file:\n%s",
+		  psinfp->tempname); */
+		clear_psinfo_node(psinfp);
+		draw_bbox();
+		return;
+	    }
+	    psp.drawfile(psinfp->tempname, f);
+	}
+	else {	/* it is new */
 	    char *argv[4];
-	    /* if not cached, need to create.
-	       Fork so that we can collect the process' error messages. */
 
-	    /* FIXME: Insecure - this is a /tmp race; shouldn't close(fd), just re-use it */
+	    psinfp->is_new = False;
+
+	    /* Create the file (it wasn't cached).
+	       Fork so that we can collect the process's error messages. */
+
+	    fd = ps_new_tempfile(psinfp);
+	    if (fd == -1) {	/* if error */
+		draw_bbox();
+		return;
+	    }
+
+	    /* FIXME: Insecure - this is a /tmp race;
+	       shouldn't close(fd), just re-use it */
 	    close(fd);
 
-	    len = strlen(filename) + strlen(tikp->tempname) + (4 - 1);
+	    len = strlen(filename) + strlen(psinfp->tempname) + (4 - 1);
 	    if (len > ffline_len) {
 		ffline_len += FFLINE_STEP;
 		ffline = xrealloc(ffline, ffline_len);
 	    }
 	    
-	    sprintf(ffline, "%s > %s", filename + 1, tikp->tempname);
+	    sprintf(ffline, "%s > %s", filename + 1, psinfp->tempname);
 	    argv[0] = "/bin/sh";
 	    argv[1] = "-c";
 	    argv[2] = ffline;
 	    argv[3] = NULL;
 	    fork_process("/bin/sh", False, globals.dvi_file.dirname,
-	      try_open_tempname, tikp, -SIGKILL, argv);
-	}
-	else {
-	    bufp = tikp->tempname;
-	    psp.drawfile(bufp, f);
+	      try_open_tempname, psinfp, -SIGKILL, argv);
 	}
     }
-    else {
+    else {	/* not shell escape */
 	char *expanded_filename = NULL;
 	struct stat statbuf;
-	expanded_filename = find_file(filename, &statbuf, pathinfo);
 
-	if (expanded_filename == NULL &&
-	    (pathinfo == kpse_enc_format || pathinfo == kpse_type1_format)) {
-	    /* in this case, we also kpathsea-search in the `old' place for
-	       backwards compatibility: kpse_tex_ps_header_format (see comment
-	       for load_vector(), dvi-draw.c for details) */
-	    expanded_filename = kpse_find_file(filename, kpse_tex_ps_header_format, True);
-	}
-	if (expanded_filename == NULL) {
-	    expanded_filename = kpse_find_file(filename, kpse_program_text_format, True);
-	}
-	if (expanded_filename == NULL) { /* still no success, complain */
-	    /* FIXME: this warning may be overwritten by warning about raw PS specials,
-	       so additinally dump to stderr. TODO: make statusline printing respect
-	       more important messages. */
-	    XDVI_WARNING((stderr, "Could not find graphics file \"%s\"", filename));
-	    statusline_info(STATUS_MEDIUM, "Warning: Could not find graphics file \"%s\"",
-			     filename);
-	    draw_bbox();
-	    return;
+	if (psinfp->fullpath != NULL) {	/* if existing rec., no error */
+	    /* Check file modification time */
+	    if (stat(psinfp->fullpath, &statbuf) != 0) {
+		perror(psinfp->fullpath);
+		if (psinfp->ps_mtime != 0) {
+		    clear_psinfo_node(psinfp);
+		    psinfp->is_new = True;
+		}
+	    }
+	    else {
+		if (psinfp->ps_dev != statbuf.st_dev
+		  || psinfp->ps_ino != statbuf.st_ino
+		  || psinfp->ps_mtime != statbuf.st_mtime) {
+		    clear_psinfo_node(psinfp);
+		    psinfp->is_new = True;
+		}
+	    }
 	}
-	if (globals.debug & DBG_OPEN)
-	    printf("%s:%d: |%s| expanded to |%s|\n", __FILE__, __LINE__, filename, expanded_filename);
 
-	/* may need to adjust ffline_len, ffline */
-	while (strlen(expanded_filename) + 1 > ffline_len) {
-	    ffline_len += FFLINE_STEP;
-	    ffline = xrealloc(ffline, ffline_len);
-	}
-	strcpy(ffline, expanded_filename);
-	bufp = ffline;
-	f = XFOPEN(expanded_filename, OPEN_MODE);
-	if (f == NULL) {
-	    XDVI_WARNING((stderr, "Could not open graphics file \"%s\": %s", expanded_filename, strerror(errno)));
-	    statusline_info(STATUS_MEDIUM, "Warning: Could not open graphics file \"%s\": %s",
-			     expanded_filename, strerror(errno));
-	    free(expanded_filename);
-	    draw_bbox();
-	    return;
+	if (!psinfp->is_new) {
+	    bufp = psinfp->tempname;
+	    if (bufp == NULL) {
+		bufp = psinfp->fullpath;
+		if (bufp == NULL) {		/* if error already noted */
+		    draw_bbox();
+		    return;
+		}
+	    }
+	    f = XFOPEN(bufp, OPEN_MODE);
+	    if (f == NULL) {
+		XDVI_WARNING((stderr, "Could not find graphics or temporary file \"%s\"",
+			      bufp));
+		statusline_info(STATUS_MEDIUM, "Warning: Could not find graphics or temporary file \"%s\"",
+				bufp);
+		clear_psinfo_node(psinfp);
+		draw_bbox();
+		return;
+	    }
 	}
-	free(expanded_filename);
+	else {	/* node is new */
+	    psinfp->is_new = False;
 
-	/* check for compressed files */
-	len = strlen(filename);
-	magic1 = '\037';
-	magic3 = '\0';
-	if ((len > 2 && strcmp(filename + len - 2, ".Z") == 0
-	     && (argv[0] = UNCOMPRESS, magic2 = '\235', True))
-	    || (len > 3 && strcmp(filename + len - 3, ".gz") == 0
-		&& (argv[0] = GUNZIP, magic2 = '\213', True))
-	    || (len > 4 && strcmp(filename + len - 4, ".bz2") == 0
-		&& (argv[0] = BUNZIP2, magic1 = 'B', magic2 = 'Z',
-		    magic3 = 'h', True))) {
-	    if (getc(f) != magic1 || (char)getc(f) != magic2
-		|| (magic3 != '\0' && getc(f) != magic3)) {
-		rewind(f);
+	    expanded_filename = find_file(filename, &statbuf, pathinfo);
+
+	    if (expanded_filename == NULL &&
+		(pathinfo == kpse_enc_format || pathinfo == kpse_type1_format))
+	    {
+		/* in this case, we also kpathsea-search in the `old' place for
+		   backwards compatibility: kpse_tex_ps_header_format
+		   (see comment for load_vector(), dvi-draw.c for details) */
+		expanded_filename = kpse_find_file(filename,
+					kpse_tex_ps_header_format, True);
+	    }
+	    if (expanded_filename == NULL) {
+		expanded_filename = kpse_find_file(filename,
+					kpse_program_text_format, True);
+	    }
+	    if (expanded_filename == NULL) { /* still no success, complain */
+		/* FIXME: this warning may be overwritten by warning about raw
+		   PS specials, so additinally dump to stderr.
+		   TODO: make statusline printing respect more important
+		   messages. */
+		XDVI_WARNING((stderr, "Could not find graphics file \"%s\"",
+			      filename));
+		statusline_info(STATUS_MEDIUM,
+			         "Warning: Could not find graphics file \"%s\"",
+				 filename);
+		draw_bbox();
+		return;
+	    }
+	    if (globals.debug & DBG_OPEN)
+		printf("%s:%d: |%s| expanded to |%s|\n", __FILE__, __LINE__,
+		       filename, expanded_filename);
+
+	    f = XFOPEN(expanded_filename, OPEN_MODE);
+	    if (f == NULL) {
+		XDVI_WARNING((stderr, "Could not open graphics file \"%s\": %s",
+			      expanded_filename, strerror(errno)));
+		statusline_info(STATUS_MEDIUM,
+			"Warning: Could not open graphics file \"%s\": %s",
+			expanded_filename, strerror(errno));
+		free(expanded_filename);
+		draw_bbox();
+		return;
+	    }
+
+	    bufp = psinfp->fullpath = expanded_filename;
+
+	    if (fstat(fileno(f), &statbuf) == 0) {	/* get mod. time */
+		psinfp->ps_dev = statbuf.st_dev;
+		psinfp->ps_ino = statbuf.st_ino;
+		psinfp->ps_mtime = statbuf.st_mtime;
 	    }
 	    else {
-		fclose(f);
+		perror(bufp);
+		psinfp->ps_dev = 0;
+		psinfp->ps_ino = 0;
+		psinfp->ps_mtime = 0;
+	    }
 
-		tikp = cachetick(filename, pathinfo, &f, &fd);
-		if (tikp == NULL)	/* if error */
-		    return;
-		if (f == NULL) {	/* if not cached, need to create */
+	    /* check for compressed files */
+
+	    len = strlen(filename);
+	    magic1 = '\037';
+	    magic3 = '\0';
+	    if ((len > 2 && strcmp(filename + len - 2, ".Z") == 0
+		 && (argv[0] = UNCOMPRESS, magic2 = '\235', True))
+		|| (len > 3 && strcmp(filename + len - 3, ".gz") == 0
+		    && (argv[0] = GUNZIP, magic2 = '\213', True))
+		|| (len > 4 && strcmp(filename + len - 4, ".bz2") == 0
+		    && (argv[0] = BUNZIP2, magic1 = 'B', magic2 = 'Z',
+			magic3 = 'h', True))) {
+		if (getc(f) != magic1 || (char)getc(f) != magic2
+		    || (magic3 != '\0' && getc(f) != magic3)) {
+		    rewind(f);
+		}
+		else {
 		    pid_t pid;
 		    int status;
 
+		    fclose(f);
+
+		    fd = ps_new_tempfile(psinfp);
+		    if (fd == -1) {	/* if error */
+			clear_psinfo_node(psinfp);
+			return;
+		    }
 		    argv[2] = bufp;
 		    fflush(stderr);	/* avoid double flushing */
 		    pid = vfork();
 		    if (pid == 0) {	/* if child */
 			(void)dup2(fd, 1);
 			(void)execvp(argv[0], (char **)argv);
-			XDVI_ERROR((stderr, "Execvp of %s failed: %s", argv[0], strerror(errno)));
+			XDVI_ERROR((stderr, "Execvp of %s failed: %s", argv[0],
+				    strerror(errno)));
 			_exit(EXIT_FAILURE);
 		    }
 		    (void)close(fd);
@@ -1323,13 +1434,14 @@
 			perror("[xdvik] waitpid");
 			return;
 		    }
-		    f = XFOPEN(tikp->tempname, OPEN_MODE);
+		    f = XFOPEN(psinfp->tempname, OPEN_MODE);
 		    if (f == NULL) {
-			perror(tikp->tempname);
+			perror(psinfp->tempname);
+			draw_bbox();
 			return;
 		    }
+		    bufp = psinfp->tempname;
 		}
-		bufp = tikp->tempname;
 	    }
 	}
 	/* Success! */
@@ -1341,25 +1453,31 @@
 void
 ps_destroy(void)
 {
-    struct tickrec	*tikp;
-
     /* Note:  old NeXT systems (at least) lack atexit/on_exit.  */
     psp.destroy();
-    for (tikp = tickhead; tikp != NULL; tikp = tikp->next)
-	if (unlink(tikp->tempname) < 0)
-	    perror(tikp->tempname);
+    ps_clear_cache();
 }
 
+
+/*
+ *	Same as above, but refrains from calling free() (may be called
+ *	following a seg fault).
+ */
+
+void
+ps_destroy_nofree(void)
+{
+    psp.destroy();
+    ps_clear_cache_nofree();
+}
+
+
 #endif	/* PS */
 
 
 void
 init_prescan(void)
 {
-#if PS
-    struct tickrec	*tikp;
-#endif
-
     scanned_page = scanned_page_reset = resource.prescan ? -1 : total_pages + 1;
 #if PS
     scanned_page_ps = scanned_page_ps_bak = scanned_page;
@@ -1373,8 +1491,7 @@
     if (resource.postscript == 0)
 	scanned_page_ps = total_pages + 1;
 
-    for (tikp = tickhead; tikp != NULL; tikp = tikp->next)
-	tikp->pageno = -1;
+    ps_clear_cache();
     psp.newdoc();
 #endif
 

Index: special.h
===================================================================
RCS file: /cvsroot/xdvi/xdvik/texk/xdvik/special.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- special.h	17 Apr 2014 07:12:07 -0000	1.24
+++ special.h	1 Apr 2016 07:09:25 -0000	1.25
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2004 the xdvik development team
+ * Copyright (c) 2002-2016 the xdvik development team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -44,8 +44,8 @@
     void (*newdoc)	(void);
 };
 
-extern void ps_clear_cache(void);
 extern void ps_destroy(void);
+extern void ps_destroy_nofree(void);
 extern void drawbegin_none(int, int, const char *);
 extern void draw_bbox(void);
 extern void display_bboxes(void);

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/src/type42 Jamfile, 1.1, NONE module.mk, 1.1, NONE rules.mk, 1.1, NONE t42drivr.c, 1.1, NONE t42drivr.h, 1.1, NONE t42error.h, 1.1, NONE t42objs.c, 1.1, NONE t42objs.h, 1.1, NONE t42parse.c, 1.1, NONE t42parse.h, 1.1, NONE t42types.h, 1.1, NONE type42.c, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/src/type42
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/src/type42

Removed Files:
	Jamfile module.mk rules.mk t42drivr.c t42drivr.h t42error.h 
	t42objs.c t42objs.h t42parse.c t42parse.h t42types.h type42.c 
Log Message:
Removing old versions of the freetype2 library.


--- t42error.h DELETED ---

--- rules.mk DELETED ---

--- Jamfile DELETED ---

--- module.mk DELETED ---

--- t42objs.h DELETED ---

--- t42parse.c DELETED ---

--- t42drivr.h DELETED ---

--- t42objs.c DELETED ---

--- t42types.h DELETED ---

--- type42.c DELETED ---

--- t42drivr.c DELETED ---

--- t42parse.h DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/src/smooth Jamfile, 1.1, NONE ftgrays.c, 1.1, NONE ftgrays.h, 1.1, NONE ftsmerrs.h, 1.1, NONE ftsmooth.c, 1.1, NONE ftsmooth.h, 1.1, NONE ftspic.c, 1.1, NONE ftspic.h, 1.1, NONE module.mk, 1.1, NONE rules.mk, 1.1, NONE smooth.c, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/src/smooth
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/src/smooth

Removed Files:
	Jamfile ftgrays.c ftgrays.h ftsmerrs.h ftsmooth.c ftsmooth.h 
	ftspic.c ftspic.h module.mk rules.mk smooth.c 
Log Message:
Removing old versions of the freetype2 library.


--- rules.mk DELETED ---

--- ftgrays.c DELETED ---

--- ftspic.h DELETED ---

--- Jamfile DELETED ---

--- ftgrays.h DELETED ---

--- ftspic.c DELETED ---

--- module.mk DELETED ---

--- ftsmooth.h DELETED ---

--- smooth.c DELETED ---

--- ftsmerrs.h DELETED ---

--- ftsmooth.c DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/src/psaux Jamfile, 1.1, NONE afmparse.c, 1.1, NONE afmparse.h, 1.1, NONE module.mk, 1.1, NONE psaux.c, 1.1, NONE psauxerr.h, 1.1, NONE psauxmod.c, 1.1, NONE psauxmod.h, 1.1, NONE psconv.c, 1.1, NONE psconv.h, 1.1, NONE psobjs.c, 1.1, NONE psobjs.h, 1.1, NONE rules.mk, 1.1, NONE t1cmap.c, 1.1, NONE t1cmap.h, 1.1, NONE t1decode.c, 1.1, NONE t1decode.h, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/src/psaux
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/src/psaux

Removed Files:
	Jamfile afmparse.c afmparse.h module.mk psaux.c psauxerr.h 
	psauxmod.c psauxmod.h psconv.c psconv.h psobjs.c psobjs.h 
	rules.mk t1cmap.c t1cmap.h t1decode.c t1decode.h 
Log Message:
Removing old versions of the freetype2 library.


--- psobjs.c DELETED ---

--- rules.mk DELETED ---

--- t1cmap.h DELETED ---

--- Jamfile DELETED ---

--- psauxmod.c DELETED ---

--- psconv.h DELETED ---

--- psauxerr.h DELETED ---

--- psobjs.h DELETED ---

--- psconv.c DELETED ---

--- psauxmod.h DELETED ---

--- t1cmap.c DELETED ---

--- t1decode.c DELETED ---

--- afmparse.h DELETED ---

--- module.mk DELETED ---

--- afmparse.c DELETED ---

--- psaux.c DELETED ---

--- t1decode.h DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/src/lzw Jamfile, 1.1, NONE ftlzw.c, 1.1, NONE ftzopen.c, 1.1, NONE ftzopen.h, 1.1, NONE rules.mk, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/src/lzw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/src/lzw

Removed Files:
	Jamfile ftlzw.c ftzopen.c ftzopen.h rules.mk 
Log Message:
Removing old versions of the freetype2 library.


--- ftzopen.c DELETED ---

--- rules.mk DELETED ---

--- ftzopen.h DELETED ---

--- ftlzw.c DELETED ---

--- Jamfile DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/src/gxvalid Jamfile, 1.1, NONE README, 1.1, NONE gxvalid.c, 1.1, NONE gxvalid.h, 1.1, NONE gxvbsln.c, 1.1, NONE gxvcommn.c, 1.1, NONE gxvcommn.h, 1.1, NONE gxverror.h, 1.1, NONE gxvfeat.c, 1.1, NONE gxvfeat.h, 1.1, NONE gxvfgen.c, 1.1, NONE gxvjust.c, 1.1, NONE gxvkern.c, 1.1, NONE gxvlcar.c, 1.1, NONE gxvmod.c, 1.1, NONE gxvmod.h, 1.1, NONE gxvmort.c, 1.1, NONE gxvmort.h, 1.1, NONE gxvmort0.c, 1.1, NONE gxvmort1.c, 1.1, NONE gxvmort2.c, 1.1, NONE gxvmort4.c, 1.1, NONE gxvmort5.c, 1.1, NONE gxvmorx.c, 1.1, NONE gxvmorx.h, 1.1, NONE gxvmorx0.c, 1.1, NONE gxvmorx1.c, 1.1, NONE gxvmorx2.c, 1.1, NONE gxvmorx4.c, 1.1, NONE gxvmorx5.c, 1.1, NONE gxvopbd.c, 1.1, NONE gxvprop.c, 1.1, NONE gxvtrak.c, 1.1, NONE module.mk, 1.1, NONE rules.mk, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/src/gxvalid
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/src/gxvalid

Removed Files:
	Jamfile README gxvalid.c gxvalid.h gxvbsln.c gxvcommn.c 
	gxvcommn.h gxverror.h gxvfeat.c gxvfeat.h gxvfgen.c gxvjust.c 
	gxvkern.c gxvlcar.c gxvmod.c gxvmod.h gxvmort.c gxvmort.h 
	gxvmort0.c gxvmort1.c gxvmort2.c gxvmort4.c gxvmort5.c 
	gxvmorx.c gxvmorx.h gxvmorx0.c gxvmorx1.c gxvmorx2.c 
	gxvmorx4.c gxvmorx5.c gxvopbd.c gxvprop.c gxvtrak.c module.mk 
	rules.mk 
Log Message:
Removing old versions of the freetype2 library.


--- gxvmort1.c DELETED ---

--- gxvcommn.c DELETED ---

--- gxvmorx5.c DELETED ---

--- gxvcommn.h DELETED ---

--- gxvalid.h DELETED ---

--- gxvjust.c DELETED ---

--- gxvfgen.c DELETED ---

--- gxvprop.c DELETED ---

--- gxvbsln.c DELETED ---

--- gxvmorx2.c DELETED ---

--- gxvmort2.c DELETED ---

--- gxvopbd.c DELETED ---

--- gxvtrak.c DELETED ---

--- gxverror.h DELETED ---

--- gxvmorx0.c DELETED ---

--- gxvmorx4.c DELETED ---

--- gxvmorx1.c DELETED ---

--- README DELETED ---

--- gxvmod.h DELETED ---

--- rules.mk DELETED ---

--- gxvmort.h DELETED ---

--- gxvmod.c DELETED ---

--- module.mk DELETED ---

--- gxvmort4.c DELETED ---

--- gxvmorx.c DELETED ---

--- gxvmort0.c DELETED ---

--- gxvmort5.c DELETED ---

--- gxvmorx.h DELETED ---

--- gxvmort.c DELETED ---

--- gxvkern.c DELETED ---

--- Jamfile DELETED ---

--- gxvfeat.c DELETED ---

--- gxvfeat.h DELETED ---

--- gxvalid.c DELETED ---

--- gxvlcar.c DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/src/bdf Jamfile, 1.1, NONE README, 1.1, NONE bdf.c, 1.1, NONE bdf.h, 1.1, NONE bdfdrivr.c, 1.1, NONE bdfdrivr.h, 1.1, NONE bdferror.h, 1.1, NONE bdflib.c, 1.1, NONE module.mk, 1.1, NONE rules.mk, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/src/bdf
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/src/bdf

Removed Files:
	Jamfile README bdf.c bdf.h bdfdrivr.c bdfdrivr.h bdferror.h 
	bdflib.c module.mk rules.mk 
Log Message:
Removing old versions of the freetype2 library.


--- rules.mk DELETED ---

--- Jamfile DELETED ---

--- bdf.h DELETED ---

--- bdflib.c DELETED ---

--- bdferror.h DELETED ---

--- bdf.c DELETED ---

--- module.mk DELETED ---

--- bdfdrivr.c DELETED ---

--- README DELETED ---

--- bdfdrivr.h DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/include/internal/services svbdf.h, 1.1, NONE svcid.h, 1.1, NONE svgldict.h, 1.1, NONE svgxval.h, 1.1, NONE svkern.h, 1.1, NONE svmm.h, 1.1, NONE svotval.h, 1.1, NONE svpfr.h, 1.1, NONE svpostnm.h, 1.1, NONE svprop.h, 1.1, NONE svpscmap.h, 1.1, NONE svpsinfo.h, 1.1, NONE svsfnt.h, 1.1, NONE svttcmap.h, 1.1, NONE svtteng.h, 1.1, NONE svttglyf.h, 1.1, NONE svwinfnt.h, 1.1, NONE svxf86nm.h, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/include/internal/services
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/include/internal/services

Removed Files:
	svbdf.h svcid.h svgldict.h svgxval.h svkern.h svmm.h svotval.h 
	svpfr.h svpostnm.h svprop.h svpscmap.h svpsinfo.h svsfnt.h 
	svttcmap.h svtteng.h svttglyf.h svwinfnt.h svxf86nm.h 
Log Message:
Removing old versions of the freetype2 library.


--- svsfnt.h DELETED ---

--- svxf86nm.h DELETED ---

--- svpscmap.h DELETED ---

--- svpsinfo.h DELETED ---

--- svgxval.h DELETED ---

--- svbdf.h DELETED ---

--- svttcmap.h DELETED ---

--- svkern.h DELETED ---

--- svpostnm.h DELETED ---

--- svwinfnt.h DELETED ---

--- svtteng.h DELETED ---

--- svcid.h DELETED ---

--- svmm.h DELETED ---

--- svotval.h DELETED ---

--- svprop.h DELETED ---

--- svpfr.h DELETED ---

--- svgldict.h DELETED ---

--- svttglyf.h DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/include freetype.h, 1.1, NONE ft2build.h, 1.1, NONE ftadvanc.h, 1.1, NONE ftautoh.h, 1.1, NONE ftbbox.h, 1.1, NONE ftbdf.h, 1.1, NONE ftbitmap.h, 1.1, NONE ftbzip2.h, 1.1, NONE ftcache.h, 1.1, NONE ftcffdrv.h, 1.1, NONE ftchapters.h, 1.1, NONE ftcid.h, 1.1, NONE fterrdef.h, 1.1, NONE fterrors.h, 1.1, NONE ftgasp.h, 1.1, NONE ftglyph.h, 1.1, NONE ftgxval.h, 1.1, NONE ftgzip.h, 1.1, NONE ftimage.h, 1.1, NONE ftincrem.h, 1.1, NONE ftlcdfil.h, 1.1, NONE ftlist.h, 1.1, NONE ftlzw.h, 1.1, NONE ftmac.h, 1.1, NONE ftmm.h, 1.1, NONE ftmodapi.h, 1.1, NONE ftmoderr.h, 1.1, NONE ftotval.h, 1.1, NONE ftoutln.h, 1.1, NONE ftpfr.h, 1.1, NONE ftrender.h, 1.1, NONE ftsizes.h, 1.1, NONE ftsnames.h, 1.1, NONE ftstroke.h, 1.1, NONE ftsynth.h, 1.1, NONE ftsystem.h, 1.1, NONE fttrigon.h, 1.1, NONE ftttdrv.h, 1.1, NONE fttypes.h, 1.1, NONE ftwinfnt.h, 1.1, NONE ftxf86.h, 1.1, NONE t1tables.h, 1.1, NONE ttnameid.h, 1.1, NONE tttables.h, 1.1, NONE tttags.h, 1.1, NONE ttunpat.h, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/include
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/include

Removed Files:
	freetype.h ft2build.h ftadvanc.h ftautoh.h ftbbox.h ftbdf.h 
	ftbitmap.h ftbzip2.h ftcache.h ftcffdrv.h ftchapters.h ftcid.h 
	fterrdef.h fterrors.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h 
	ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmac.h 
	ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h ftpfr.h 
	ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h 
	ftsystem.h fttrigon.h ftttdrv.h fttypes.h ftwinfnt.h ftxf86.h 
	t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h 
Log Message:
Removing old versions of the freetype2 library.


--- ftincrem.h DELETED ---

--- fterrors.h DELETED ---

--- ftmodapi.h DELETED ---

--- ftpfr.h DELETED ---

--- ttunpat.h DELETED ---

--- tttags.h DELETED ---

--- ftlist.h DELETED ---

--- t1tables.h DELETED ---

--- ftglyph.h DELETED ---

--- fterrdef.h DELETED ---

--- ftttdrv.h DELETED ---

--- ftgxval.h DELETED ---

--- ftsystem.h DELETED ---

--- ftstroke.h DELETED ---

--- ftbbox.h DELETED ---

--- ftmoderr.h DELETED ---

--- ttnameid.h DELETED ---

--- ftoutln.h DELETED ---

--- ftwinfnt.h DELETED ---

--- ftgasp.h DELETED ---

--- ftcffdrv.h DELETED ---

--- freetype.h DELETED ---

--- ftmm.h DELETED ---

--- ftgzip.h DELETED ---

--- ftxf86.h DELETED ---

--- ftrender.h DELETED ---

--- fttrigon.h DELETED ---

--- ftsnames.h DELETED ---

--- ftcache.h DELETED ---

--- ftmac.h DELETED ---

--- ft2build.h DELETED ---

--- ftautoh.h DELETED ---

--- ftlcdfil.h DELETED ---

--- ftlzw.h DELETED ---

--- fttypes.h DELETED ---

--- ftsynth.h DELETED ---

--- ftbzip2.h DELETED ---

--- ftimage.h DELETED ---

--- ftcid.h DELETED ---

--- ftsizes.h DELETED ---

--- ftbdf.h DELETED ---

--- ftotval.h DELETED ---

--- ftchapters.h DELETED ---

--- ftbitmap.h DELETED ---

--- tttables.h DELETED ---

--- ftadvanc.h DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/docs/reference README, 1.1, NONE ft2-auto_hinter.html, 1.1, NONE ft2-base_interface.html, 1.1, NONE ft2-basic_types.html, 1.1, NONE ft2-bdf_fonts.html, 1.1, NONE ft2-bitmap_handling.html, 1.1, NONE ft2-bzip2.html, 1.1, NONE ft2-cache_subsystem.html, 1.1, NONE ft2-cff_driver.html, 1.1, NONE ft2-cid_fonts.html, 1.1, NONE ft2-computations.html, 1.1, NONE ft2-font_formats.html, 1.1, NONE ft2-gasp_table.html, 1.1, NONE ft2-glyph_management.html, 1.1, NONE ft2-glyph_stroker.html, 1.1, NONE ft2-glyph_variants.html, 1.1, NONE ft2-gx_validation.html, 1.1, NONE ft2-gzip.html, 1.1, NONE ft2-header_file_macros.html, 1.1, NONE ft2-header_inclusion.html, 1.1, NONE ft2-incremental.html, 1.1, NONE ft2-index.html, 1.1, NONE ft2-lcd_filtering.html, 1.1, NONE ft2-list_processing.html, 1.1, NONE ft2-lzw.html, 1.1, NONE ft2-mac_specific.html, 1.1, NONE ft2-module_management.html, 1.1, NONE ft2-multiple_masters.html, 1.1, NONE ft2-ot_validation.html, 1.1, NONE ft2-outline_processing.html, 1.1, NONE ft2-pfr_fonts.html, 1.1, NONE ft2-quick_advance.html, 1.1, NONE ft2-raster.html, 1.1, NONE ft2-sfnt_names.html, 1.1, NONE ft2-sizes_management.html, 1.1, NONE ft2-system_interface.html, 1.1, NONE ft2-toc.html, 1.1, NONE ft2-truetype_engine.html, 1.1, NONE ft2-truetype_tables.html, 1.1, NONE ft2-tt_driver.html, 1.1, NONE ft2-type1_tables.html, 1.1, NONE ft2-user_allocation.html, 1.1, NONE ft2-version.html, 1.1, NONE ft2-winfnt_fonts.html, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/docs/reference
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/docs/reference

Removed Files:
	README ft2-auto_hinter.html ft2-base_interface.html 
	ft2-basic_types.html ft2-bdf_fonts.html 
	ft2-bitmap_handling.html ft2-bzip2.html 
	ft2-cache_subsystem.html ft2-cff_driver.html 
	ft2-cid_fonts.html ft2-computations.html ft2-font_formats.html 
	ft2-gasp_table.html ft2-glyph_management.html 
	ft2-glyph_stroker.html ft2-glyph_variants.html 
	ft2-gx_validation.html ft2-gzip.html 
	ft2-header_file_macros.html ft2-header_inclusion.html 
	ft2-incremental.html ft2-index.html ft2-lcd_filtering.html 
	ft2-list_processing.html ft2-lzw.html ft2-mac_specific.html 
	ft2-module_management.html ft2-multiple_masters.html 
	ft2-ot_validation.html ft2-outline_processing.html 
	ft2-pfr_fonts.html ft2-quick_advance.html ft2-raster.html 
	ft2-sfnt_names.html ft2-sizes_management.html 
	ft2-system_interface.html ft2-toc.html 
	ft2-truetype_engine.html ft2-truetype_tables.html 
	ft2-tt_driver.html ft2-type1_tables.html 
	ft2-user_allocation.html ft2-version.html 
	ft2-winfnt_fonts.html 
Log Message:
Removing old versions of the freetype2 library.


--- ft2-glyph_variants.html DELETED ---

--- ft2-cid_fonts.html DELETED ---

--- ft2-sizes_management.html DELETED ---

--- ft2-truetype_engine.html DELETED ---

--- ft2-bitmap_handling.html DELETED ---

--- ft2-mac_specific.html DELETED ---

--- ft2-sfnt_names.html DELETED ---

--- ft2-ot_validation.html DELETED ---

--- ft2-lcd_filtering.html DELETED ---

--- ft2-bdf_fonts.html DELETED ---

--- ft2-system_interface.html DELETED ---

--- ft2-list_processing.html DELETED ---

--- ft2-lzw.html DELETED ---

--- ft2-raster.html DELETED ---

--- ft2-header_inclusion.html DELETED ---

--- ft2-incremental.html DELETED ---

--- ft2-tt_driver.html DELETED ---

--- ft2-header_file_macros.html DELETED ---

--- ft2-user_allocation.html DELETED ---

--- ft2-computations.html DELETED ---

--- ft2-cff_driver.html DELETED ---

--- ft2-index.html DELETED ---

--- ft2-module_management.html DELETED ---

--- ft2-gx_validation.html DELETED ---

--- ft2-multiple_masters.html DELETED ---

--- ft2-glyph_management.html DELETED ---

--- ft2-basic_types.html DELETED ---

--- README DELETED ---

--- ft2-version.html DELETED ---

--- ft2-font_formats.html DELETED ---

--- ft2-toc.html DELETED ---

--- ft2-pfr_fonts.html DELETED ---

--- ft2-type1_tables.html DELETED ---

--- ft2-quick_advance.html DELETED ---

--- ft2-glyph_stroker.html DELETED ---

--- ft2-base_interface.html DELETED ---

--- ft2-winfnt_fonts.html DELETED ---

--- ft2-cache_subsystem.html DELETED ---

--- ft2-bzip2.html DELETED ---

--- ft2-truetype_tables.html DELETED ---

--- ft2-gasp_table.html DELETED ---

--- ft2-gzip.html DELETED ---

--- ft2-outline_processing.html DELETED ---

--- ft2-auto_hinter.html DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/builds/windows detect.mk, 1.1, NONE ftdebug.c, 1.1, NONE w32-bcc.mk, 1.1, NONE w32-bccd.mk, 1.1, NONE w32-dev.mk, 1.1, NONE w32-gcc.mk, 1.1, NONE w32-icc.mk, 1.1, NONE w32-intl.mk, 1.1, NONE w32-lcc.mk, 1.1, NONE w32-mingw32.mk, 1.1, NONE w32-vcc.mk, 1.1, NONE w32-wat.mk, 1.1, NONE win32-def.mk, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/builds/windows
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/builds/windows

Removed Files:
	detect.mk ftdebug.c w32-bcc.mk w32-bccd.mk w32-dev.mk 
	w32-gcc.mk w32-icc.mk w32-intl.mk w32-lcc.mk w32-mingw32.mk 
	w32-vcc.mk w32-wat.mk win32-def.mk 
Log Message:
Removing old versions of the freetype2 library.


--- win32-def.mk DELETED ---

--- w32-wat.mk DELETED ---

--- w32-gcc.mk DELETED ---

--- detect.mk DELETED ---

--- w32-vcc.mk DELETED ---

--- ftdebug.c DELETED ---

--- w32-icc.mk DELETED ---

--- w32-intl.mk DELETED ---

--- w32-dev.mk DELETED ---

--- w32-bccd.mk DELETED ---

--- w32-lcc.mk DELETED ---

--- w32-mingw32.mk DELETED ---

--- w32-bcc.mk DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/builds/wince ftdebug.c, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/builds/wince
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/builds/wince

Removed Files:
	ftdebug.c 
Log Message:
Removing old versions of the freetype2 library.


--- ftdebug.c DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/builds/mac FreeType.m68k_cfm.make.txt, 1.1, NONE FreeType.m68k_far.make.txt, 1.1, NONE FreeType.ppc_carbon.make.txt, 1.1, NONE FreeType.ppc_classic.make.txt, 1.1, NONE README, 1.1, NONE ascii2mpw.py, 1.1, NONE ftlib.prj.xml, 1.1, NONE ftmac.c, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/builds/mac
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/builds/mac

Removed Files:
	FreeType.m68k_cfm.make.txt FreeType.m68k_far.make.txt 
	FreeType.ppc_carbon.make.txt FreeType.ppc_classic.make.txt 
	README ascii2mpw.py ftlib.prj.xml ftmac.c 
Log Message:
Removing old versions of the freetype2 library.


--- ascii2mpw.py DELETED ---

--- FreeType.ppc_classic.make.txt DELETED ---

--- FreeType.m68k_far.make.txt DELETED ---

--- ftmac.c DELETED ---

--- FreeType.ppc_carbon.make.txt DELETED ---

--- FreeType.m68k_cfm.make.txt DELETED ---

--- README DELETED ---

--- ftlib.prj.xml DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/builds/atari ATARI.H, 1.1, NONE FNames.SIC, 1.1, NONE FREETYPE.PRJ, 1.1, NONE README.TXT, 1.1, NONE deflinejoiner.awk, 1.1, NONE gen-purec-patch.sh, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/builds/atari
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/builds/atari

Removed Files:
	ATARI.H FNames.SIC FREETYPE.PRJ README.TXT deflinejoiner.awk 
	gen-purec-patch.sh 
Log Message:
Removing old versions of the freetype2 library.


--- FNames.SIC DELETED ---

--- ATARI.H DELETED ---

--- FREETYPE.PRJ DELETED ---

--- deflinejoiner.awk DELETED ---

--- gen-purec-patch.sh DELETED ---

--- README.TXT DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.5.3/builds/amiga README, 1.1, NONE makefile, 1.1, NONE makefile.os4, 1.1, NONE smakefile, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.5.3/builds/amiga
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.5.3/builds/amiga

Removed Files:
	README makefile makefile.os4 smakefile 
Log Message:
Removing old versions of the freetype2 library.


--- makefile.os4 DELETED ---

--- README DELETED ---

--- makefile DELETED ---

--- smakefile DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.4.11/src/winfonts Jamfile, 1.1, NONE fnterrs.h, 1.1, NONE module.mk, 1.1, NONE rules.mk, 1.1, NONE winfnt.c, 1.1, NONE winfnt.h, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.4.11/src/winfonts
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.4.11/src/winfonts

Removed Files:
	Jamfile fnterrs.h module.mk rules.mk winfnt.c winfnt.h 
Log Message:
Removing old versions of the freetype2 library.


--- rules.mk DELETED ---

--- Jamfile DELETED ---

--- fnterrs.h DELETED ---

--- winfnt.h DELETED ---

--- module.mk DELETED ---

--- winfnt.c DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.4.11/src/type42 Jamfile, 1.1, NONE module.mk, 1.1, NONE rules.mk, 1.1, NONE t42drivr.c, 1.1, NONE t42drivr.h, 1.1, NONE t42error.h, 1.1, NONE t42objs.c, 1.1, NONE t42objs.h, 1.1, NONE t42parse.c, 1.1, NONE t42parse.h, 1.1, NONE t42types.h, 1.1, NONE type42.c, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.4.11/src/type42
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.4.11/src/type42

Removed Files:
	Jamfile module.mk rules.mk t42drivr.c t42drivr.h t42error.h 
	t42objs.c t42objs.h t42parse.c t42parse.h t42types.h type42.c 
Log Message:
Removing old versions of the freetype2 library.


--- t42error.h DELETED ---

--- rules.mk DELETED ---

--- Jamfile DELETED ---

--- module.mk DELETED ---

--- t42objs.h DELETED ---

--- t42parse.c DELETED ---

--- t42drivr.h DELETED ---

--- t42objs.c DELETED ---

--- t42types.h DELETED ---

--- type42.c DELETED ---

--- t42drivr.c DELETED ---

--- t42parse.h DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.4.11/src/tools/docmaker content.py, 1.1, NONE docbeauty.py, 1.1, NONE docmaker.py, 1.1, NONE formatter.py, 1.1, NONE sources.py, 1.1, NONE tohtml.py, 1.1, NONE utils.py, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.4.11/src/tools/docmaker
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.4.11/src/tools/docmaker

Removed Files:
	content.py docbeauty.py docmaker.py formatter.py sources.py 
	tohtml.py utils.py 
Log Message:
Removing old versions of the freetype2 library.


--- content.py DELETED ---

--- docbeauty.py DELETED ---

--- docmaker.py DELETED ---

--- sources.py DELETED ---

--- tohtml.py DELETED ---

--- utils.py DELETED ---

--- formatter.py DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.4.11/src/psnames Jamfile, 1.1, NONE module.mk, 1.1, NONE psmodule.c, 1.1, NONE psmodule.h, 1.1, NONE psnamerr.h, 1.1, NONE psnames.c, 1.1, NONE pspic.c, 1.1, NONE pspic.h, 1.1, NONE pstables.h, 1.1, NONE rules.mk, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.4.11/src/psnames
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.4.11/src/psnames

Removed Files:
	Jamfile module.mk psmodule.c psmodule.h psnamerr.h psnames.c 
	pspic.c pspic.h pstables.h rules.mk 
Log Message:
Removing old versions of the freetype2 library.


--- rules.mk DELETED ---

--- psmodule.c DELETED ---

--- Jamfile DELETED ---

--- pspic.c DELETED ---

--- pspic.h DELETED ---

--- psmodule.h DELETED ---

--- pstables.h DELETED ---

--- psnamerr.h DELETED ---

--- module.mk DELETED ---

--- psnames.c DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.4.11/src/pfr Jamfile, 1.1, NONE module.mk, 1.1, NONE pfr.c, 1.1, NONE pfrcmap.c, 1.1, NONE pfrcmap.h, 1.1, NONE pfrdrivr.c, 1.1, NONE pfrdrivr.h, 1.1, NONE pfrerror.h, 1.1, NONE pfrgload.c, 1.1, NONE pfrgload.h, 1.1, NONE pfrload.c, 1.1, NONE pfrload.h, 1.1, NONE pfrobjs.c, 1.1, NONE pfrobjs.h, 1.1, NONE pfrsbit.c, 1.1, NONE pfrsbit.h, 1.1, NONE pfrtypes.h, 1.1, NONE rules.mk, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.4.11/src/pfr
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.4.11/src/pfr

Removed Files:
	Jamfile module.mk pfr.c pfrcmap.c pfrcmap.h pfrdrivr.c 
	pfrdrivr.h pfrerror.h pfrgload.c pfrgload.h pfrload.c 
	pfrload.h pfrobjs.c pfrobjs.h pfrsbit.c pfrsbit.h pfrtypes.h 
	rules.mk 
Log Message:
Removing old versions of the freetype2 library.


--- pfrdrivr.c DELETED ---

--- rules.mk DELETED ---

--- Jamfile DELETED ---

--- pfrobjs.h DELETED ---

--- pfrgload.h DELETED ---

--- pfr.c DELETED ---

--- module.mk DELETED ---

--- pfrdrivr.h DELETED ---

--- pfrgload.c DELETED ---

--- pfrobjs.c DELETED ---

--- pfrtypes.h DELETED ---

--- pfrcmap.h DELETED ---

--- pfrsbit.c DELETED ---

--- pfrload.h DELETED ---

--- pfrerror.h DELETED ---

--- pfrcmap.c DELETED ---

--- pfrload.c DELETED ---

--- pfrsbit.h DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.4.11/src/gxvalid Jamfile, 1.1, NONE README, 1.1, NONE gxvalid.c, 1.1, NONE gxvalid.h, 1.1, NONE gxvbsln.c, 1.1, NONE gxvcommn.c, 1.1, NONE gxvcommn.h, 1.1, NONE gxverror.h, 1.1, NONE gxvfeat.c, 1.1, NONE gxvfeat.h, 1.1, NONE gxvfgen.c, 1.1, NONE gxvjust.c, 1.1, NONE gxvkern.c, 1.1, NONE gxvlcar.c, 1.1, NONE gxvmod.c, 1.1, NONE gxvmod.h, 1.1, NONE gxvmort.c, 1.1, NONE gxvmort.h, 1.1, NONE gxvmort0.c, 1.1, NONE gxvmort1.c, 1.1, NONE gxvmort2.c, 1.1, NONE gxvmort4.c, 1.1, NONE gxvmort5.c, 1.1, NONE gxvmorx.c, 1.1, NONE gxvmorx.h, 1.1, NONE gxvmorx0.c, 1.1, NONE gxvmorx1.c, 1.1, NONE gxvmorx2.c, 1.1, NONE gxvmorx4.c, 1.1, NONE gxvmorx5.c, 1.1, NONE gxvopbd.c, 1.1, NONE gxvprop.c, 1.1, NONE gxvtrak.c, 1.1, NONE module.mk, 1.1, NONE rules.mk, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.4.11/src/gxvalid
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.4.11/src/gxvalid

Removed Files:
	Jamfile README gxvalid.c gxvalid.h gxvbsln.c gxvcommn.c 
	gxvcommn.h gxverror.h gxvfeat.c gxvfeat.h gxvfgen.c gxvjust.c 
	gxvkern.c gxvlcar.c gxvmod.c gxvmod.h gxvmort.c gxvmort.h 
	gxvmort0.c gxvmort1.c gxvmort2.c gxvmort4.c gxvmort5.c 
	gxvmorx.c gxvmorx.h gxvmorx0.c gxvmorx1.c gxvmorx2.c 
	gxvmorx4.c gxvmorx5.c gxvopbd.c gxvprop.c gxvtrak.c module.mk 
	rules.mk 
Log Message:
Removing old versions of the freetype2 library.


--- gxvmort1.c DELETED ---

--- gxvcommn.c DELETED ---

--- gxvmorx5.c DELETED ---

--- gxvcommn.h DELETED ---

--- gxvalid.h DELETED ---

--- gxvjust.c DELETED ---

--- gxvfgen.c DELETED ---

--- gxvprop.c DELETED ---

--- gxvbsln.c DELETED ---

--- gxvmorx2.c DELETED ---

--- gxvmort2.c DELETED ---

--- gxvopbd.c DELETED ---

--- gxvtrak.c DELETED ---

--- gxverror.h DELETED ---

--- gxvmorx0.c DELETED ---

--- gxvmorx4.c DELETED ---

--- gxvmorx1.c DELETED ---

--- README DELETED ---

--- gxvmod.h DELETED ---

--- rules.mk DELETED ---

--- gxvmort.h DELETED ---

--- gxvmod.c DELETED ---

--- module.mk DELETED ---

--- gxvmort4.c DELETED ---

--- gxvmorx.c DELETED ---

--- gxvmort0.c DELETED ---

--- gxvmort5.c DELETED ---

--- gxvmorx.h DELETED ---

--- gxvmort.c DELETED ---

--- gxvkern.c DELETED ---

--- Jamfile DELETED ---

--- gxvfeat.c DELETED ---

--- gxvfeat.h DELETED ---

--- gxvalid.c DELETED ---

--- gxvlcar.c DELETED ---

[Xdvi-commits] xdvik/libs/freetype2/freetype-2.4.11/src/cff Jamfile, 1.1, NONE cff.c, 1.1, NONE cffcmap.c, 1.1, NONE cffcmap.h, 1.1, NONE cffdrivr.c, 1.1, NONE cffdrivr.h, 1.1, NONE cfferrs.h, 1.1, NONE cffgload.c, 1.1, NONE cffgload.h, 1.1, NONE cffload.c, 1.1, NONE cffload.h, 1.1, NONE cffobjs.c, 1.1, NONE cffobjs.h, 1.1, NONE cffparse.c, 1.1, NONE cffparse.h, 1.1, NONE cffpic.c, 1.1, NONE cffpic.h, 1.1, NONE cfftoken.h, 1.1, NONE cfftypes.h, 1.1, NONE module.mk, 1.1, NONE rules.mk, 1.1, NONE

[Paul V. <vo...@us...>]

Update of /cvsroot/xdvi/xdvik/libs/freetype2/freetype-2.4.11/src/cff
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18609/freetype-2.4.11/src/cff

Removed Files:
	Jamfile cff.c cffcmap.c cffcmap.h cffdrivr.c cffdrivr.h 
	cfferrs.h cffgload.c cffgload.h cffload.c cffload.h cffobjs.c 
	cffobjs.h cffparse.c cffparse.h cffpic.c cffpic.h cfftoken.h 
	cfftypes.h module.mk rules.mk 
Log Message:
Removing old versions of the freetype2 library.


--- rules.mk DELETED ---

--- cfftypes.h DELETED ---

--- cffparse.c DELETED ---

--- cffparse.h DELETED ---

--- cffcmap.c DELETED ---

--- cffdrivr.h DELETED ---

--- cffload.h DELETED ---

--- cffobjs.c DELETED ---

--- cfftoken.h DELETED ---

--- cff.c DELETED ---

--- cfferrs.h DELETED ---

--- cffobjs.h DELETED ---

--- module.mk DELETED ---

--- cffpic.c DELETED ---

--- cffload.c DELETED ---

--- cffgload.c DELETED ---

--- cffcmap.h DELETED ---

--- cffdrivr.c DELETED ---

--- cffpic.h DELETED ---

--- cffgload.h DELETED ---

--- Jamfile DELETED ---