Common subdirectories: gnuplot-orig/bugtest and gnuplot/bugtest diff -r -c gnuplot-orig/command.c gnuplot/command.c *** gnuplot-orig/command.c Wed Nov 28 18:13:34 1990 --- gnuplot/command.c Thu Jul 4 13:52:32 1991 *************** *** 48,57 **** void sleep(); /* defined later */ #endif /* TURBOC */ #endif /* ZTC */ ! #endif /* MSDOS */ - #include "plot.h" #include "setshow.h" #include "help.h" --- 48,60 ---- void sleep(); /* defined later */ #endif /* TURBOC */ #endif /* ZTC */ + #endif /* MSDOS */ ! #ifdef AMIGA_LC_5_1 ! #include ! void sleep(); ! #endif /* AMIGA_LC_5_1 */ #include "plot.h" #include "setshow.h" #include "help.h" *************** *** 61,68 **** --- 64,75 ---- #endif #ifndef HELPFILE + #ifdef AMIGA_LC_5_1 + #define HELPFILE "S:gnuplot.gih" + #else #define HELPFILE "docs/gnuplot.gih" /* changed by makefile */ #endif + #endif #define inrange(z,min,max) ((min=min)&&(z<=max)) : ((z>=max)&&(z<=min)) ) *************** *** 183,188 **** --- 190,196 ---- } if (stime < 0) (void) fgets (buf,MAX_LINE_LEN,stdin); /* Hold until CR hit. */ + #ifdef __ZTC__ if (stime > 0) usleep((unsigned long) stime); #else *************** *** 448,453 **** --- 456,465 ---- float temp; BOOLEAN yfirst; char format[MAX_LINE_LEN+1]; + #ifdef AMIGA_LC_5_1 + int num_perc_ast; + char *start_search; + #endif /* AMIGA_LC_5_1 */ quote_str(data_file, c_token); this_plot->plot_type = DATA; *************** *** 496,502 **** --- 508,525 ---- continue; } + #ifdef AMIGA_LC_5_1 + num_perc_ast = 0; + start_search = format; + while (*start_search != '\0') { + if (start_search[0] == '%') + if (start_search[1] == '*') num_perc_ast++; + start_search++; + } + switch (sscanf(line, format, &x, &y) - num_perc_ast) { + #else /* AMIGA_LC_5_1 */ switch (sscanf(line, format, &x, &y)) { + #endif /* AMIGA_LC_5_1 */ case 1: { /* only one number on the line */ y = x; /* assign that number to y */ x = datum; /* and make the index into x */ *************** *** 992,998 **** Throw away excess xp points, mark excess yp points as OUTRANGE. */ if (i > xp->p_count) { ! yp->points[i].type == OUTRANGE; continue; } /* --- 1015,1021 ---- Throw away excess xp points, mark excess yp points as OUTRANGE. */ if (i > xp->p_count) { ! yp->points[i].type = OUTRANGE; continue; } /* *************** *** 1086,1091 **** --- 1109,1121 ---- #endif /* not TURBOC */ #endif /* MSDOS */ + #ifdef AMIGA_LC_5_1 + void sleep(delay) + unsigned int delay; + { + Delay(50 * delay); + } + #endif /* Support for input, shell, and help for various systems */ *************** *** 1464,1469 **** --- 1494,1513 ---- } #else /* VFORK */ + #ifdef AMIGA_LC_5_1 + do_shell() + { + register char *shell; + if (!(shell = getenv("SHELL"))) + shell = SHELL; + + if (system(shell)) + os_error("system() failed",NO_CARET); + + (void) putc('\n',stderr); + } + #else /* AMIGA_LC_5_1 */ + #define EXEC "exec " do_shell() { *************** *** 1478,1483 **** --- 1522,1528 ---- (void) putc('\n',stderr); } + #endif /* AMIGA_LC_5_1 */ #endif /* VFORK */ #endif /* MSDOS */ #endif /* vms */ Common subdirectories: gnuplot-orig/demo and gnuplot/demo Common subdirectories: gnuplot-orig/docs and gnuplot/docs diff -r -c gnuplot-orig/graphics.c gnuplot/graphics.c *** gnuplot-orig/graphics.c Fri Nov 23 01:54:08 1990 --- gnuplot/graphics.c Thu Jul 4 13:51:20 1991 *************** *** 262,268 **** --- 262,272 ---- term_init = TRUE; } screen_ok = FALSE; + #ifdef AMIGA_LC_5_1 + scaling = (*t->scale)((double)xsize, (double)ysize); + #else scaling = (*t->scale)(xsize, ysize); + #endif (*t->graphics)(); /* now compute boundary for plot (xleft, xright, ytop, ybot) */ diff -r -c gnuplot-orig/help.c gnuplot/help.c *** gnuplot-orig/help.c Mon Mar 26 18:01:13 1990 --- gnuplot/help.c Fri Jun 28 16:21:04 1991 *************** *** 165,171 **** (void) strcpy(oldpathp, path); else { /* not enough room in oldpath, sigh */ (void) strncpy(oldpathp, path, sizeof oldpath); ! oldpath[sizeof oldpath] = NULL; } } --- 165,171 ---- (void) strcpy(oldpathp, path); else { /* not enough room in oldpath, sigh */ (void) strncpy(oldpathp, path, sizeof oldpath); ! oldpath[sizeof(oldpath)-1] = NULL; } } diff -r -c gnuplot-orig/internal.c gnuplot/internal.c *** gnuplot-orig/internal.c Wed Nov 28 18:08:43 1990 --- gnuplot/internal.c Thu Jul 4 13:53:06 1991 *************** *** 58,65 **** --- 58,70 ---- #ifdef apollo int matherr(x) /* apollo */ struct exception *x; + #else /* apollo */ + #ifdef AMIGA_LC_5_1 + int matherr(x) /* AMIGA_LC_5_1 */ + struct exception *x; #else /* Most everyone else (not apollo). */ int matherr() + #endif /* AMIGA_LC_5_1 */ #endif /* apollo */ #endif /* MSDOS */ { diff -r -c gnuplot-orig/parse.c gnuplot/parse.c *** gnuplot-orig/parse.c Tue Sep 18 00:56:59 1990 --- gnuplot/parse.c Thu Jul 4 13:50:58 1991 *************** *** 361,367 **** --- 361,371 ---- argptr = add_action(JUMPNZ); /* short-circuit if already TRUE */ aterm(); argptr->j_arg = at.a_count - savepc;/* offset for jump */ + #ifdef AMIGA_LC_5_1 + (void) add_action(ABOOL); + #else (void) add_action(BOOL); + #endif } } *************** *** 377,383 **** --- 381,391 ---- argptr = add_action(JUMPZ); /* short-circuit if already FALSE */ bterm(); argptr->j_arg = at.a_count - savepc;/* offset for jump */ + #ifdef AMIGA_LC_5_1 + (void) add_action(ABOOL); + #else (void) add_action(BOOL); + #endif } } diff -r -c gnuplot-orig/plot.c gnuplot/plot.c *** gnuplot-orig/plot.c Sun Nov 25 17:17:19 1990 --- gnuplot/plot.c Thu Jul 4 19:59:26 1991 *************** *** 41,46 **** --- 41,49 ---- #ifdef __TURBOC__ #include #endif + #ifdef AMIGA_LC_5_1 + #include + #endif extern char *getenv(),*strcat(),*strcpy(),*strncpy(); *************** *** 123,139 **** #define HOME "GNUPLOT" #else /* MSDOS */ #define HOME "HOME" #endif /* MSDOS */ #endif /* vms */ #ifdef unix #define PLOTRC ".gnuplot" ! #else #define PLOTRC "gnuplot.ini" ! #endif #ifdef __TURBOC__ void tc_interrupt() --- 126,151 ---- #define HOME "GNUPLOT" #else /* MSDOS */ + #ifdef AMIGA_LC_5_1 + #define HOME "GNUPLOT" + #else /* AMIGA_LC_5_1 */ + #define HOME "HOME" + #endif /* AMIGA_LC_5_1 */ #endif /* MSDOS */ #endif /* vms */ #ifdef unix #define PLOTRC ".gnuplot" ! #else /* unix */ ! #ifdef AMIGA_LC_5_1 ! #define PLOTRC ".gnuplot" ! #else /* AMIGA_LC_5_1 */ #define PLOTRC "gnuplot.ini" ! #endif /* AMIGA_LC_5_1 */ ! #endif /* unix */ #ifdef __TURBOC__ void tc_interrupt() *************** *** 187,193 **** --- 199,210 ---- interactive = FALSE; init_terminal(); /* can set term type if it likes */ + #ifdef AMIGA_LC_5_1 + if (IsInteractive(Input()) == DOSTRUE) interactive = TRUE; + else interactive = FALSE; + #else interactive = isatty(fileno(stdin)); + #endif if (argc > 1) interactive = FALSE; *************** *** 267,275 **** /* Look for a gnuplot init file in . or home directory */ #ifdef vms (void) strcpy(home,HOME); ! #else (void) strcat(strcpy(home,getenv(HOME)),"/"); ! #endif /* vms */ #ifdef NOCWDRC /* inhibit check of init file in current directory for security reasons */ { --- 284,306 ---- /* Look for a gnuplot init file in . or home directory */ #ifdef vms (void) strcpy(home,HOME); ! #else /* vms */ ! #ifdef AMIGA_LC_5_1 ! strcpy(home,getenv(HOME)); ! { ! int h; ! h = strlen(home) - 1; ! if (h >= 0) { ! if ((home[h] != ':') && (home[h] != '/')) { ! home[h] = '/'; ! home[h+1] = '\0'; ! } ! } ! } ! #else /* AMIGA_LC_5_1 */ (void) strcat(strcpy(home,getenv(HOME)),"/"); ! #endif /* AMIGA_LC_5_1 */ ! #endif /* vms */ #ifdef NOCWDRC /* inhibit check of init file in current directory for security reasons */ { diff -r -c gnuplot-orig/plot.h gnuplot/plot.h *** gnuplot-orig/plot.h Mon Mar 26 17:59:10 1990 --- gnuplot/plot.h Thu Jul 4 13:54:26 1991 *************** *** 30,36 **** --- 30,40 ---- #define PROGRAM "G N U P L O T" #define PROMPT "gnuplot> " + #ifdef AMIGA_LC_5_1 + #define SHELL "NewShell" + #else #define SHELL "/bin/sh" /* used if SHELL env variable not set */ + #endif #define SAMPLES 160 /* default number of samples for a plot */ #define ZERO 1e-8 /* default for 'zero' set option */ *************** *** 75,80 **** --- 79,89 ---- #endif + #ifdef AMIGA_LC_5_1 + #define OS "Amiga " + #endif + + #ifndef OS #define OS "" #endif *************** *** 162,174 **** typedef int (*FUNC_PTR)(); #endif ! enum operators { PUSH, PUSHC, PUSHD, CALL, LNOT, BNOT, UMINUS, LOR, LAND, BOR, XOR, BAND, EQ, NE, GT, LT, GE, LE, PLUS, MINUS, MULT, DIV, MOD, POWER, FACTORIAL, BOOL, JUMP, JUMPZ, JUMPNZ, JTERN, SF_START }; ! #define is_jump(operator) ((operator) >=(int)JUMP && (operator) <(int)SF_START) --- 171,189 ---- typedef int (*FUNC_PTR)(); #endif ! #ifdef AMIGA_LC_5_1 enum operators { PUSH, PUSHC, PUSHD, CALL, LNOT, BNOT, UMINUS, LOR, LAND, BOR, XOR, BAND, EQ, NE, GT, LT, GE, LE, PLUS, MINUS, MULT, DIV, MOD, POWER, + FACTORIAL, ABOOL, JUMP, JUMPZ, JUMPNZ, JTERN, SF_START + }; + #else + enum operators { + PUSH, PUSHC, PUSHD, CALL, LNOT, BNOT, UMINUS, LOR, LAND, BOR, XOR, + BAND, EQ, NE, GT, LT, GE, LE, PLUS, MINUS, MULT, DIV, MOD, POWER, FACTORIAL, BOOL, JUMP, JUMPZ, JUMPNZ, JTERN, SF_START }; ! #endif #define is_jump(operator) ((operator) >=(int)JUMP && (operator) <(int)SF_START) diff -r -c gnuplot-orig/scanner.c gnuplot/scanner.c *** gnuplot-orig/scanner.c Mon Mar 26 18:01:48 1990 --- gnuplot/scanner.c Thu Jul 4 13:51:58 1991 *************** *** 245,251 **** --- 245,257 ---- } #else /* MSDOS */ + #ifdef AMIGA_LC_5_1 + substitute() + { + int_error("substitution not supported by AmigaDOS!",t_num); + } + #else /* AMIGA_LC_5_1 */ substitute(str,max) /* substitute output from ` ` */ char *str; int max; *************** *** 303,306 **** --- 309,313 ---- (void) strcpy(str,output); /* now replace ` ` with output */ screen_ok = FALSE; } + #endif /* AMIGA_LC_5_1 */ #endif /* MS-DOS */ Common subdirectories: gnuplot-orig/term and gnuplot/term diff -r -c gnuplot-orig/term.c gnuplot/term.c *** gnuplot-orig/term.c Sun Dec 9 18:08:24 1990 --- gnuplot/term.c Sun Jun 30 16:43:00 1991 *************** *** 267,273 **** #include "term/tek.trm" #endif ! #ifdef EPSON /* bit map types, EPSON, NEC, PROPRINTER, STAR Color */ #include "term/epson.trm" #endif --- 267,273 ---- #include "term/tek.trm" #endif ! #ifdef EPSONP /* bit map types, EPSONP, NEC, PROPRINTER, STAR Color */ #include "term/epson.trm" #endif *************** *** 378,383 **** --- 378,387 ---- #include "term/x11.trm" #endif /* X11 */ + #ifdef AMIGATERM + #include "term/amiga.trm" + #endif + /* Dummy functions for unavailable features */ /* change angle of text. 0 is horizontal left to right. *************** *** 613,619 **** null_justify_text, do_point, do_arrow} #endif ! #ifdef EPSON ,{"epson_lx800", "Epson LX-800, Star NL-10, NX-1000, PROPRINTER ...", EPSONXMAX, EPSONYMAX, EPSONVCHAR, EPSONHCHAR, EPSONVTIC, EPSONHTIC, EPSONinit, EPSONreset, --- 617,623 ---- null_justify_text, do_point, do_arrow} #endif ! #ifdef EPSONP ,{"epson_lx800", "Epson LX-800, Star NL-10, NX-1000, PROPRINTER ...", EPSONXMAX, EPSONYMAX, EPSONVCHAR, EPSONHCHAR, EPSONVTIC, EPSONHTIC, EPSONinit, EPSONreset, *************** *** 926,931 **** --- 930,944 ---- X11_linetype, X11_put_text, null_text_angle, X11_justify_text, do_point, do_arrow} #endif + + #ifdef AMIGATERM + ,{"amiga", "Amiga Custom Screen", + AMIGA_XMAX, AMIGA_YMAX, AMIGA_VCHAR, AMIGA_HCHAR, + AMIGA_VTIC, AMIGA_HTIC, AMIGA_init, AMIGA_reset, + AMIGA_text, null_scale, AMIGA_graphics, AMIGA_move, AMIGA_vector, + AMIGA_linetype, AMIGA_put_text, null_text_angle, + AMIGA_justify_text, do_point, do_arrow} + #endif }; #define TERMCOUNT (sizeof(term_tbl)/sizeof(struct termentry)) *************** *** 1057,1062 **** --- 1070,1079 ---- if (term_name == (char *)NULL && display != (char *)NULL) term_name = "x11"; #endif /* x11 */ + + #ifdef AMIGATERM + term_name = "amiga"; + #endif #ifdef UNIXPC if (iswind() == 0) { diff -r -c gnuplot-orig/term.h gnuplot/term.h *** gnuplot-orig/term.h Tue Dec 11 00:41:23 1990 --- gnuplot/term.h Thu Jul 4 13:50:18 1991 *************** *** 34,42 **** --- 34,48 ---- * LIBS definition. */ + /* These terminals are not relevant for MSDOS */ #ifndef MSDOS + #ifdef AMIGA_LC_5_1 + #define AMIGATERM /* Amiga custom screen */ + + #else /* AMIGA_LC_5_1 */ + #define AED /* AED 512 and AED 767 */ #define BITGRAPH /* BBN BitGraph */ /* #define CGI /* SCO CGI */ *************** *** 53,59 **** #define VTTEK /* VT-like tek40xx emulators */ /* #define X11 /* X11R4 window system */ ! #endif /* These terminals can be used on any system */ #define DXY800A /* Roland DXY800A plotter */ --- 59,66 ---- #define VTTEK /* VT-like tek40xx emulators */ /* #define X11 /* X11R4 window system */ ! #endif /* AMIGA_LC_5_1 */ ! #endif /* MSDOS */ /* These terminals can be used on any system */ #define DXY800A /* Roland DXY800A plotter */ *************** *** 60,66 **** #define EEPIC /* EEPIC-extended LaTeX driver, for EEPIC users */ #define EMTEX /* LATEX picture environment with EMTEX specials */ #define EPS60 /* Epson-style 60-dot per inch printers */ ! #define EPSON /* Epson LX-800, Star NL-10, NX-1000 and lots of others */ #define HP2648 /* HP2648, HP2647 */ #define HP26 /* HP2623A and maybe others */ #define HP75 /* HP7580, and probably other HPs */ --- 67,73 ---- #define EEPIC /* EEPIC-extended LaTeX driver, for EEPIC users */ #define EMTEX /* LATEX picture environment with EMTEX specials */ #define EPS60 /* Epson-style 60-dot per inch printers */ ! #define EPSONP /* Epson LX-800, Star NL-10, NX-1000 and lots of others */ #define HP2648 /* HP2648, HP2647 */ #define HP26 /* HP2623A and maybe others */ #define HP75 /* HP7580, and probably other HPs */ *************** *** 80,88 **** #ifdef MSDOS #ifdef __TURBOC__ #define ATT6300 /* AT&T 6300 graphics */ ! #else #define ATT6300 /* AT&T 6300 graphics */ #define CORONA /* Corona graphics 325 */ #define HERCULES /* IBM PC/Clone with Hercules graphics board */ ! #endif ! #endif --- 87,95 ---- #ifdef MSDOS #ifdef __TURBOC__ #define ATT6300 /* AT&T 6300 graphics */ ! #else /* __TURBOC__ */ #define ATT6300 /* AT&T 6300 graphics */ #define CORONA /* Corona graphics 325 */ #define HERCULES /* IBM PC/Clone with Hercules graphics board */ ! #endif /* __TURBOC__ */ ! #endif /* MSDOS */ Common subdirectories: gnuplot-orig/translate and gnuplot/translate diff -r -c gnuplot-orig/version.c gnuplot/version.c *** gnuplot-orig/version.c Tue Dec 18 17:24:06 1990 --- gnuplot/version.c Fri Jun 28 16:28:24 1991 *************** *** 4,9 **** /* override in Makefile */ #ifndef CONTACT ! # define CONTACT "pixar!bug-gnuplot@sun.com"; #endif char bug_email[] = CONTACT; --- 4,9 ---- /* override in Makefile */ #ifndef CONTACT ! # define CONTACT "pixar!bug-gnuplot@sun.com" #endif char bug_email[] = CONTACT; diff -r -c gnuplot-orig/docs/doc2ms.c gnuplot/docs/doc2ms.c *** gnuplot-orig/docs/doc2ms.c Wed Nov 28 18:02:07 1990 --- gnuplot/docs/doc2ms.c Thu Jul 4 13:57:40 1991 *************** *** 22,27 **** --- 22,30 ---- #include #include + #ifdef AMIGA_LC_5_1 + #include + #endif #define MAX_NAME_LEN 256 #define MAX_LINE_LEN 256 *************** *** 158,164 **** --- 161,177 ---- int sh_i; static int old = 1; + #ifdef AMIGA_LC_5_1 + (void) sscanf(line,"%d",&sh_i); + strcpy(string,strchr(line,' ')+1); + { + char *p; + p = strchr(string,'\n'); + if (p != NULL) *p = '\0'; + } + #else (void) sscanf(line,"%d %[^\n]s",&sh_i,string); + #endif (void) fprintf(b,".sp %d\n",(sh_i == 1) ? LINE_SKIP : LINE_SKIP-1); diff -r -c gnuplot-orig/docs/doc2tex.c gnuplot/docs/doc2tex.c *** gnuplot-orig/docs/doc2tex.c Wed Nov 28 18:02:09 1990 --- gnuplot/docs/doc2tex.c Thu Jul 4 13:57:56 1991 *************** *** 19,24 **** --- 19,27 ---- #include #include + #ifdef AMIGA_LC_5_1 + #include + #endif #define MAX_NAME_LEN 256 #define MAX_LINE_LEN 256 *************** *** 140,146 **** --- 143,159 ---- (void) fputs("\\end{verbatim}\n",b); verb=FALSE; } + #ifdef AMIGA_LC_5_1 + (void) sscanf(line,"%d",&sh_i); + strcpy(string,strchr(line,' ')+1); + { + char *p; + p = strchr(string,'\n'); + if (p != NULL) *p = '\0'; + } + #else (void) sscanf(line,"%d %[^\n]s",&sh_i,string); + #endif switch(sh_i) { case 1: diff -r -c gnuplot-orig/docs/gnuplot.doc gnuplot/docs/gnuplot.doc *** gnuplot-orig/docs/gnuplot.doc Wed Nov 28 19:04:53 1990 --- gnuplot/docs/gnuplot.doc Mon Jul 1 10:55:16 1991 *************** *** 1325,1331 **** not be changed, so set trange [:10] changes tmax to 10 without affecting tmin. - 3 xtics 3 variables ?show variables The `show variables` command lists all user-defined variables and --- 1325,1330 ---- Common subdirectories: gnuplot-orig/docs/latextut and gnuplot/docs/latextut diff -r -c gnuplot-orig/term/eepic.trm gnuplot/term/eepic.trm *** gnuplot-orig/term/eepic.trm Tue Sep 18 00:58:57 1990 --- gnuplot/term/eepic.trm Thu Jul 4 13:56:54 1991 *************** *** 109,115 **** --- 109,119 ---- EEPIC_scale(xs, ys) + #ifdef AMIGA_LC_5_1 + double xs, ys; /* scaling factors */ + #else float xs, ys; /* scaling factors */ + #endif { register struct termentry *t = &term_tbl[term]; diff -r -c gnuplot-orig/term/epson.trm gnuplot/term/epson.trm *** gnuplot-orig/term/epson.trm Tue Dec 18 17:14:16 1990 --- gnuplot/term/epson.trm Fri Jun 28 20:50:42 1991 *************** *** 34,40 **** /* On PC, print using 'copy file /b lpt1:', do NOT use 'print' */ /* EPSON_init changes outfile to binary mode on PC's */ ! #ifdef EPSON #define EPSONXMAX 512 #define EPSONYMAX 384 --- 34,40 ---- /* On PC, print using 'copy file /b lpt1:', do NOT use 'print' */ /* EPSON_init changes outfile to binary mode on PC's */ ! #ifdef EPSONP #define EPSONXMAX 512 #define EPSONYMAX 384 *************** *** 107,113 **** #endif } ! #endif /* EPSON */ /* The following NEC CP6 Pinwriter driver uses generic bit mapped graphics --- 107,113 ---- #endif } ! #endif /* EPSONP */ /* The following NEC CP6 Pinwriter driver uses generic bit mapped graphics diff -r -c gnuplot-orig/term/latex.trm gnuplot/term/latex.trm *** gnuplot-orig/term/latex.trm Tue Sep 18 00:59:10 1990 --- gnuplot/term/latex.trm Thu Jul 4 13:56:38 1991 *************** *** 126,132 **** --- 126,136 ---- LATEX_scale(xs, ys) + #ifdef AMIGA_LC_5_1 + double xs, ys; /* scaling factors */ + #else float xs, ys; /* scaling factors */ + #endif { register struct termentry *t = &term_tbl[term]; *************** *** 265,273 **** --- 269,285 ---- } else { code = (LATEX_moved ? 0 : 1); /* no combine after move */ if (x1 == x2) /* vertical line - special case */ + #ifdef AMIGA_LC_5_1 + LATEX_rule(code, (double)x1, (double)y1, (double)LATEX_dotsize,(double)y2-y1); + #else LATEX_rule(code, (float)x1, (float)y1, LATEX_dotsize, (float)y2-y1); + #endif else if (y1 == y2) /* horizontal line - special case */ + #ifdef AMIGA_LC_5_1 + LATEX_rule(code, (double)x1, (double)y1, (double)x2-x1, (double)LATEX_dotsize); + #else LATEX_rule(code, (float)x1, (float)y1, (float)x2-x1, LATEX_dotsize); + #endif else { slope = ((float)y2-y1)/((float)x2-x1); if (abs(slope) <= 1.0) { *************** *** 313,321 **** --- 325,339 ---- static void LATEX_rule(code, x,y, width, height) int code; /* how do we treat this rule? */ + #ifdef AMIGA_LC_5_1 + double x, y; + double width; + double height; + #else float x, y; float width; float height; + #endif { static float lastx, lasty; static float lastw, lasth; diff -r -c gnuplot-orig/translate/internal.c gnuplot/translate/internal.c *** gnuplot-orig/translate/internal.c Mon Mar 26 18:04:07 1990 --- gnuplot/translate/internal.c Thu Jul 4 13:59:08 1991 *************** *** 26,36 **** struct value *pop(), *complex(), *integer(); double magnitude(), angle(), real(); ! struct value stack[STACK_DEPTH]; int s_p = -1; /* stack pointer */ #ifndef MSDOS /* suggested by "J.D. McDonald " */ /* * System V and MSC 4.0 call this when they wants to print an error message. * Don't! --- 26,43 ---- struct value *pop(), *complex(), *integer(); double magnitude(), angle(), real(); ! extern struct value stack[STACK_DEPTH]; int s_p = -1; /* stack pointer */ #ifndef MSDOS /* suggested by "J.D. McDonald " */ + #ifdef AMIGA_LC_5_1 + int matherr(x) + struct exception *x; + { + return (undefined = TRUE); /* don't print error message */ + } + #else /* AMIGA_LC_5_1 */ /* * System V and MSC 4.0 call this when they wants to print an error message. * Don't! *************** *** 39,44 **** --- 46,52 ---- { return (undefined = TRUE); /* don't print error message */ } + #endif /* AMIGA_LC_5_1 */ #endif MSDOS reset_stack() diff -r -c gnuplot-orig/translate/scanner.c gnuplot/translate/scanner.c *** gnuplot-orig/translate/scanner.c Mon Mar 26 18:04:18 1990 --- gnuplot/translate/scanner.c Thu Jul 4 13:58:48 1991 *************** *** 231,237 **** --- 231,244 ---- } #else /* MSDOS */ + #ifdef AMIGA_LC_5_1 + substitute() + { + int_error("substitution not supported by AmigaDOS!",t_num); + } + + #else /* AMIGA_LC_5_1 */ substitute(str,max) /* substitute output from ` ` */ char *str; int max; *************** *** 287,290 **** --- 294,298 ---- (void) strcpy(output+i,last+1); /* tack on rest of line to output */ (void) strcpy(str,output); /* now replace ` ` with output */ } + #endif /* AMIGA_LC_5_1 */ #endif /* MS-DOS */