diff -C3 -r old/AFM2TFM.C new/AFM2TFM.C *** old/AFM2TFM.C Sun Jan 13 20:41:04 1991 --- new/AFM2TFM.C Tue Jun 25 20:10:22 1991 *************** *** 14,20 **** --- 14,24 ---- #ifdef VMS #include #else + #ifdef AMIGA + #include + #else #include + #endif #endif #endif #include Only in new: amiga diff -C3 -r old/LOADFONT.C new/loadfont.c *** old/LOADFONT.C Sun Jan 13 20:36:38 1991 --- new/loadfont.c Wed Jun 26 00:16:28 1991 *************** *** 134,140 **** --- 134,142 ---- if (pkfile = pksearch(d, name, READBIN, n, fd->dpi)) return(1) ; #ifndef MSDOS + #ifndef AMIGA dontmakefont = 1 ; + #endif #endif } /* diff -C3 -r old/MAKEFONT.C new/makefont.c *** old/MAKEFONT.C Sat Nov 17 21:50:06 1990 --- new/makefont.c Wed Jun 26 00:35:13 1991 *************** *** 7,12 **** --- 7,13 ---- extern int filter ; extern int system() ; extern char *mfmode ; + #ifndef PASTEX /* * Calculate magstep values. */ *************** *** 155,157 **** --- 156,191 ---- (void)fprintf(stderr, "- %s\n", buf) ; (void)system(buf) ; } + + #else /* PASTEX */ + + /* call a ARexx script (name of the script is in the ENV: Variable "CALLMF" */ + /* 26.06.91 Georg Hessmann */ + + #include + + extern int actualdpi; + extern int vactualdpi; + + void + makefont(name, dpi, bdpi) + char *name ; + int dpi, bdpi ; + { + char *tmp, com[200]; + long result = 20; + + tmp = getenv("CALLMF"); + + if (tmp != NULL) { + sprintf(com,"\'%s %s %ld %ld %ld dvips %ld/%s.%ldpk TeX:pk/\'", tmp, + name, dpi, actualdpi, vactualdpi, dpi, name, dpi); + if (! quiet) + (void)fprintf(stderr, "- %s\n", com) ; + + (void)call_rexx(com, &result); + /* ignore the results */ + } + } + + #endif /* PASTEX */ diff -C3 -r old/OUTPUT.C new/output.c *** old/OUTPUT.C Sun Jan 27 03:17:14 1991 --- new/output.c Tue Jun 25 19:28:45 1991 *************** *** 86,91 **** --- 86,92 ---- break ; #ifndef VMS #ifndef MSDOS + #ifndef AMIGA case 2: #ifdef SECURE (void)sprintf(errbuf, "<%s>: Tick filename execution disabled", s) ; *************** *** 96,101 **** --- 97,103 ---- break; #endif #endif + #endif } if (f==NULL) error(errbuf) ; *************** *** 131,141 **** --- 133,145 ---- linepos = 0 ; #ifndef VMS #ifndef MSDOS + #ifndef AMIGA if (infigure == 2) (void)pclose(f) ; else #endif #endif + #endif (void)fclose(f) ; if (!disablecomments) if (infigure) *************** *** 405,410 **** --- 409,417 ---- #ifdef VMS error("! can't open output pipe") ; #else + #ifdef AMIGA + error("! can't open output pipe") ; + #else if ((bitfile=popen(oname+1, "w"))==NULL) error("! couldn't open output pipe") ; else *************** *** 411,416 **** --- 418,424 ---- popened = 1 ; #endif #endif + #endif } else { if ((bitfile=fopen(oname,"w"))==NULL) error("! couldn't open PostScript file") ; *************** *** 505,512 **** --- 513,522 ---- (void)putc(4, bitfile) ; #ifndef MSDOS #ifndef VMS + #ifndef AMIGA if (popened) (void)pclose(bitfile) ; + #endif #endif #endif if (popened == 0) diff -C3 -r old/PATHS.H new/PATHS.H *** old/PATHS.H Mon Nov 05 00:36:50 1990 --- new/PATHS.H Tue Jun 25 19:39:27 1991 *************** *** 42,52 **** --- 42,58 ---- #define PATHSEP ',' #define DIRSEP ':' #else + #ifdef AMIGA + #define READBIN "r" /* AMIGA doesn't care */ + #define PATHSEP ',' + #define DIRSEP '/' + #else #define READBIN "r" /* UNIX doesn't care */ #define PATHSEP ':' #define DIRSEP '/' #endif #endif + #endif extern void error() ; *************** *** 70,75 **** --- 76,91 ---- #define FLIPATH "c:\\texfonts" #define FLINAME "lj_0;lj_h;lj_1;lj_2;lj_3;lj_4;lj_5a;lj_5b;lj_sli" #else + #ifdef AMIGA + #define TFMPATH "TeX:fonts" + #define PKPATH "TeX:pk/%d/%f.%dpk" + #define VFPATH "TeX:vf" + #define HEADERPATH ".,TeX:ps" + #define FIGPATH ".,TeX:macros" + #define CONFIGPATH ".,TeX:config" + #define FLIPATH "TeX:emlib" + #define FLINAME "lj_0;lj_h;lj_1;lj_2;lj_3;lj_4;lj_5a;lj_5b;lj_sli" + #else #ifndef TFMPATH #define TFMPATH "/usr/lib/tex/fonts/tfm" #endif *************** *** 93,98 **** --- 109,115 ---- #endif #ifndef FLINAME #define FLINAME "lj_0:lj_h:lj_1:lj_2:lj_3:lj_4:lj_5a:lj_5b" + #endif #endif #endif #endif diff -C3 -r old/SEARCH.C new/SEARCH.C *** old/SEARCH.C Mon Nov 05 00:36:50 1990 --- new/SEARCH.C Wed Jun 26 01:52:30 1991 *************** *** 13,26 **** --- 13,32 ---- #ifdef VMS #define MAXPATHLEN (256) #else /* ~SYSV */ + #ifdef AMIGA + #define MAXPATHLEN (256) + #else #include /* for MAXPATHLEN */ + #endif /* ~AMIGA */ #endif /* ~SYSV */ #endif #ifndef MSDOS #ifndef VMS + #ifndef AMIGA #include #endif #endif + #endif /* * * We hope MAXPATHLEN is enough -- only rudimentary checking is done! *************** *** 56,61 **** --- 62,75 ---- return(NULL) ; } #endif + #ifdef AMIGA + if (strchr(file, ':')) { /* if full path name */ + if ((fd=fopen(file,mode)) != NULL) + return(fd) ; + else + return(NULL) ; + } + #endif do { /* copy the current directory into fname */ *************** *** 82,87 **** --- 96,104 ---- #ifdef VMS error("! ~username in path???") ; #else + #ifdef AMIGA + error("! ~username in path???") ; + #else struct passwd *pw = getpwnam(fname) ; if (pw) strcpy(fname, pw->pw_dir) ; *************** *** 89,94 **** --- 106,112 ---- error("no such user") ; #endif #endif + #endif } nam = fname + strlen(fname) ; } *************** *** 106,111 **** --- 124,137 ---- #else (void)strcpy(nam,file); /* tack the file on */ #endif + #ifdef AMIGA + if (fname[0] == '.' && fname[1] == DIRSEP) { /* special case "./" */ + int i; + for (i=2; i MAXPATHLEN) error("! overran allocated storage in search()"); *************** *** 154,159 **** --- 180,193 ---- return(NULL) ; } #endif + #ifdef AMIGA + if (strchr(file, ':')) { /* if full path name */ + if ((fd=fopen(file,mode)) != NULL) + return(fd) ; + else + return(NULL) ; + } + #endif do { /* copy the current directory into fname */ nam = fname; *************** *** 179,184 **** --- 213,221 ---- #ifdef VMS error("! ~username in path???") ; #else + #ifdef AMIGA + error("! ~username in path???") ; + #else struct passwd *pw = getpwnam(fname) ; if (pw) strcpy(fname, pw->pw_dir) ; *************** *** 186,191 **** --- 223,229 ---- error("no such user") ; #endif #endif + #endif } nam = fname + strlen(fname) ; } *************** *** 221,226 **** --- 259,273 ---- #endif /* VMS */ *nam = '\0' ; + + #ifdef AMIGA + if (fname[0] == '.' && fname[1] == DIRSEP) { /* special case "./" */ + int i; + for (i=2; i MAXPATHLEN) diff -C3 -r old/STRUCTURES.H new/STRUCTURES.H *** old/STRUCTURES.H Sun Jan 27 03:17:14 1991 --- new/STRUCTURES.H Tue Jun 25 18:59:57 1991 *************** *** 19,27 **** --- 19,33 ---- #ifdef VMS #include #else + #ifdef AMIGA + #include + /* swmem is already defined in */ + #define swmem xswmem + #else #include #endif #endif + #endif #if defined(lint) && defined(sun) extern char *sprintf() ; #endif *************** *** 76,81 **** --- 82,90 ---- #undef SHORTINT #endif #ifdef MSDOS + #define SHORTINT + #endif + #ifdef AMIGA #define SHORTINT #endif