| 1 |
--- dvipsk-p1.7a.patch.orig 2005-10-17 17:03:56.000000000 +0900
|
| 2 |
+++ dvipsk-p1.7a.patch 2007-08-16 14:51:19.000000000 +0900
|
| 3 |
@@ -1236,37 +1236,30 @@
|
| 4 |
}
|
| 5 |
|
| 6 |
diff -Nur dvipsk.orig/dvips.c dvipsk/dvips.c
|
| 7 |
---- dvipsk.orig/dvips.c Sun Jan 30 22:17:21 2005
|
| 8 |
-+++ dvipsk/dvips.c Thu Mar 3 11:11:55 2005
|
| 9 |
-@@ -44,12 +44,18 @@
|
| 10 |
- #include descrip
|
| 11 |
- #endif
|
| 12 |
+--- dvipsk.orig/dvips.c 2007-08-16 14:39:44.000000000 +0900
|
| 13 |
++++ dvipsk/dvips.c 2007-08-16 14:44:03.000000000 +0900
|
| 14 |
+@@ -45,6 +45,12 @@
|
| 15 |
+ #define DEFRES (600)
|
| 16 |
#endif
|
| 17 |
+
|
| 18 |
+#ifdef __APPLE__ /* for Mac OS X, T. Uchiyama */
|
| 19 |
+#include <sys/types.h>
|
| 20 |
+#include <sys/time.h>
|
| 21 |
+#include <sys/resource.h>
|
| 22 |
+#endif
|
| 23 |
++
|
| 24 |
/*
|
| 25 |
* First we define some globals.
|
| 26 |
*/
|
| 27 |
- #ifdef VMS
|
| 28 |
- static char ofnme[252],infnme[252],pap[40],thh[20];
|
| 29 |
- #endif
|
| 30 |
+@@ -55,6 +61,7 @@
|
| 31 |
+ /* PS fonts fully downloaded as headers */
|
| 32 |
+ char *downloadedpsnames[DOWNLOADEDPSSIZE];
|
| 33 |
+
|
| 34 |
+Boolean SJIS ; /* KANJI code */
|
| 35 |
+ int unused_top_of_psnames ; /* unused top number of downloadedpsnames[#] */
|
| 36 |
fontdesctype *fonthead ; /* list of all fonts mentioned so far */
|
| 37 |
fontdesctype *curfnt ; /* the currently selected font */
|
| 38 |
- sectiontype *sections ; /* sections to process document in */
|
| 39 |
-@@ -64,7 +70,7 @@
|
| 40 |
- Boolean cropmarks ; /* add cropmarks? */
|
| 41 |
- Boolean abspage = 0 ; /* are page numbers absolute? */
|
| 42 |
- Boolean tryepsf = 0 ; /* should we try to make it espf? */
|
| 43 |
--Boolean secure = 0 ; /* make safe for suid */
|
| 44 |
-+Boolean secure = 1 ; /* make safe for suid */
|
| 45 |
- int collatedcopies = 1 ; /* how many collated copies? */
|
| 46 |
- int sectioncopies = 1 ; /* how many times to repeat each section? */
|
| 47 |
- integer pagecopies = 1 ; /* how many times to repeat each page? */
|
| 48 |
-@@ -186,6 +192,7 @@
|
| 49 |
+@@ -194,6 +201,7 @@
|
| 50 |
char xdig[256]; /* table for reading hexadecimal digits */
|
| 51 |
char banner[] = BANNER ; /* our startup message */
|
| 52 |
char banner2[] = BANNER2 ; /* our second startup message */
|
| 53 |
@@ -1274,7 +1267,7 @@
|
| 54 |
Boolean noenv = 0 ; /* ignore PRINTER envir variable? */
|
| 55 |
Boolean dopprescan = 0 ; /* do we do a scan before the prescan? */
|
| 56 |
extern int dontmakefont ;
|
| 57 |
-@@ -284,6 +291,7 @@
|
| 58 |
+@@ -292,6 +300,7 @@
|
| 59 |
#else
|
| 60 |
" Z* Compress bitmap fonts ",
|
| 61 |
#endif
|
| 62 |
@@ -1282,7 +1275,7 @@
|
| 63 |
/* "- Interactive query of options", */
|
| 64 |
" # = number f = file s = string * = suffix, `0' to turn off ",
|
| 65 |
" c = comma-separated dimension pair (e.g., 3.2in,-32.1cm) ",
|
| 66 |
-@@ -294,16 +302,21 @@
|
| 67 |
+@@ -302,16 +311,21 @@
|
| 68 |
{
|
| 69 |
char **p;
|
| 70 |
FILE *f = status == 0 ? stdout : stderr;
|
| 71 |
@@ -1302,30 +1295,31 @@
|
| 72 |
+*/
|
| 73 |
+ fputs ("Email bug reports to www-ptex@ascii.co.jp.\n", f);
|
| 74 |
}
|
| 75 |
- /*
|
| 76 |
- * This error routine prints an error message; if the first
|
| 77 |
-@@ -440,6 +453,7 @@
|
| 78 |
- for (s="abcdef"; *s!=0; s++)
|
| 79 |
- xdig[(int)*s] = i++;
|
| 80 |
+
|
| 81 |
+ void
|
| 82 |
+@@ -461,6 +475,7 @@
|
| 83 |
+ for(i=0 ; i < DOWNLOADEDPSSIZE; i++)
|
| 84 |
+ downloadedpsnames[i] = NULL;
|
| 85 |
morestrings() ;
|
| 86 |
+ SJIS = 0;
|
| 87 |
maxpages = 100000 ;
|
| 88 |
numcopies = 1 ;
|
| 89 |
iname = fulliname = strings ;
|
| 90 |
-@@ -552,6 +566,12 @@
|
| 91 |
- int firstext = -1 ;
|
| 92 |
+@@ -574,6 +589,13 @@
|
| 93 |
#endif
|
| 94 |
- register sectiontype *sects ;
|
| 95 |
+ sectiontype *sects ;
|
| 96 |
+
|
| 97 |
+#ifdef __APPLE__ /* for Mac OS X, T. Uchiyama */
|
| 98 |
+ struct rlimit rl;
|
| 99 |
+ getrlimit(RLIMIT_STACK, &rl);
|
| 100 |
+ rl.rlim_cur = 2048 * 1024;
|
| 101 |
+ setrlimit(RLIMIT_STACK, &rl);
|
| 102 |
+#endif
|
| 103 |
-
|
| 104 |
++
|
| 105 |
#ifdef KPATHSEA
|
| 106 |
kpse_set_program_name (argv[0], "dvips");
|
| 107 |
-@@ -618,12 +638,12 @@
|
| 108 |
+ kpse_set_program_enabled (kpse_pk_format, MAKE_TEX_PK_BY_DEFAULT, kpse_src_compile);
|
| 109 |
+@@ -639,12 +661,12 @@
|
| 110 |
exit (0);
|
| 111 |
}
|
| 112 |
if (argc == 2 && strncmp(argv[1], "-?", 2) == 0) {
|
| 113 |
@@ -1340,8 +1334,8 @@
|
| 114 |
exit(0);
|
| 115 |
}
|
| 116 |
}
|
| 117 |
-@@ -747,10 +767,13 @@
|
| 118 |
- secure = (*p != '0') ;
|
| 119 |
+@@ -790,10 +812,13 @@
|
| 120 |
+ secure_option = 1 ; /* Never used */
|
| 121 |
break ;
|
| 122 |
case 'S':
|
| 123 |
- if (*p == 0 && argv[i+1])
|
| 124 |
@@ -1358,7 +1352,7 @@
|
| 125 |
break ;
|
| 126 |
case 'm' :
|
| 127 |
if (STREQ (p, "ode") && argv[i+1]) {
|
| 128 |
-@@ -892,7 +915,7 @@
|
| 129 |
+@@ -935,7 +960,7 @@
|
| 130 |
paperfmt = p ;
|
| 131 |
break ;
|
| 132 |
case 'v':
|
| 133 |
@@ -1367,7 +1361,7 @@
|
| 134 |
exit (0);
|
| 135 |
break;
|
| 136 |
case 'x' : case 'y' :
|
| 137 |
-@@ -1070,7 +1093,7 @@
|
| 138 |
+@@ -1113,7 +1138,7 @@
|
| 139 |
}
|
| 140 |
papsizes = (struct papsiz *)revlist((void *)papsizes) ;
|
| 141 |
if (queryoptions != 0) { /* get new options */
|
| 142 |
@@ -1376,38 +1370,40 @@
|
| 143 |
help(1) ;
|
| 144 |
queryargs();
|
| 145 |
if (qargc == 1)
|
| 146 |
-@@ -1108,7 +1131,7 @@
|
| 147 |
- getpsinfo((char *)NULL) ;
|
| 148 |
+@@ -1152,11 +1177,11 @@
|
| 149 |
revpslists() ;
|
| 150 |
- if (!quiet)
|
| 151 |
-- (void)fprintf(stderr, "%s %s\n", banner, banner2) ;
|
| 152 |
-+ (void)fprintf(stderr, "%s\n%s\n", banner, banner2) ;
|
| 153 |
+ if (dvips_debug_flag) {
|
| 154 |
+ if (!quiet)
|
| 155 |
+- (void)fprintf(stderr, "\n%s %s\n", banner, banner2) ;
|
| 156 |
++ (void)fprintf(stderr, "\n%s\n%s\n", banner, banner2) ;
|
| 157 |
+ prettycolumn = 0 ;
|
| 158 |
+ } else {
|
| 159 |
+ if (!quiet)
|
| 160 |
+- (void)fprintf(stderr, "%s %s\n", banner, banner2) ;
|
| 161 |
++ (void)fprintf(stderr, "%s\n%s\n", banner, banner2) ;
|
| 162 |
+ }
|
| 163 |
if (*iname) {
|
| 164 |
dvifile = fopen(iname, READBIN) ;
|
| 165 |
- /*
|
| 166 |
diff -Nur dvipsk.orig/dvips.h dvipsk/dvips.h
|
| 167 |
---- dvipsk.orig/dvips.h Sun Jan 30 22:17:15 2005
|
| 168 |
-+++ dvipsk/dvips.h Mon Oct 17 16:57:18 2005
|
| 169 |
-@@ -10,10 +10,15 @@
|
| 170 |
- */
|
| 171 |
-
|
| 172 |
+--- dvipsk.orig/dvips.h 2007-08-16 14:39:44.000000000 +0900
|
| 173 |
++++ dvipsk/dvips.h 2007-08-16 14:49:19.000000000 +0900
|
| 174 |
+@@ -7,9 +7,12 @@
|
| 175 |
/* This file is the header for dvips's global data structures. */
|
| 176 |
-+#define CREATIONDATE
|
| 177 |
-+
|
| 178 |
-+#define MAX_CODE 65536
|
| 179 |
|
| 180 |
+ #define CREATIONDATE
|
| 181 |
++#define MAX_CODE 65536
|
| 182 |
#define BANNER \
|
| 183 |
--"This is dvips(k) 5.95a Copyright 2005 Radical Eye Software"
|
| 184 |
+-"This is dvips(k) 5.96.1 Copyright 2007 Radical Eye Software"
|
| 185 |
-#define BANNER2 "(www.radicaleye.com)"
|
| 186 |
+"This is dvips(k) p1.7a Copyright 2005 ASCII Corp.(www-ptex@ascii.co.jp)"
|
| 187 |
+#define BANNER2 \
|
| 188 |
-+"based on dvips(k) 5.95a Copyright 2005 Radical Eye Software (www.radicaleye.com)"
|
| 189 |
++"This is dvips(k) 5.96.1 Copyright 2007 Radical Eye Software (www.radicaleye.com)"
|
| 190 |
+#define WEBURL "(www.radicaleye.com)"
|
| 191 |
#ifdef KPATHSEA
|
| 192 |
#include "config.h"
|
| 193 |
#include "debug.h"
|
| 194 |
-@@ -60,9 +65,9 @@
|
| 195 |
- #define STRINGSIZE (200000) /* maximum total chars in strings in program */
|
| 196 |
+@@ -56,9 +59,9 @@
|
| 197 |
+ #define STRINGSIZE (200000) /* maximum total chars in strings in program */
|
| 198 |
#define RASTERCHUNK (8192) /* size of chunk of raster */
|
| 199 |
#define MINCHUNK (240) /* minimum size char to get own raster */
|
| 200 |
-#define STACKSIZE (350) /* maximum stack size for dvi files */
|
| 201 |
@@ -1417,9 +1413,9 @@
|
| 202 |
+#define MAXFRAME (50) /* maximum depth of virtual font recursion */
|
| 203 |
+#define MAXFONTHD (1024) /* number of unique names of included fonts */
|
| 204 |
#define STDOUTSIZE (75) /* width of a standard output line */
|
| 205 |
+ #define DOWNLOADEDPSSIZE (1000) /* max number of downloaded fonts to check */
|
| 206 |
/*
|
| 207 |
- * Other constants, which define printer-dependent stuff.
|
| 208 |
-@@ -166,7 +171,7 @@
|
| 209 |
+@@ -163,7 +166,7 @@
|
| 210 |
* psfile. It can be 0, PREVPAGE, THISPAGE, or EXISTS.
|
| 211 |
*/
|
| 212 |
typedef struct tfd {
|
| 213 |
@@ -1428,7 +1424,7 @@
|
| 214 |
halfword dpi, loadeddpi ;
|
| 215 |
halfword alreadyscaled ;
|
| 216 |
halfword psname ;
|
| 217 |
-@@ -181,6 +186,7 @@
|
| 218 |
+@@ -178,6 +181,7 @@
|
| 219 |
struct tfd *nextsize;
|
| 220 |
char *scalename;
|
| 221 |
chardesctype *chardesc ;
|
Parent Directory
| 
Revision Log