Garbo

home *** CD-ROM | disk | FTP | other *** search

/ Garbo / Garbo.cdr / pc / source / gnuplotp.lzh / gnuplot#1.2 / patch1a

Wrap

Text File | 1990-10-12 | 74.9 KB | 2,619 lines

diff -c ./README ../patch/README *** ./README Tue Mar 27 08:58:56 1990 --- ../patch/README Thu Sep 13 10:07:14 1990 *************** *** 16,24 GNUPLOT 2.0 RELEASE NOTES ! New terminal drivers: Roland DXY800A, EEPIC, EPSON LX-800, Fig, ! HP2648, HPGL, HP LaserJet, Imagen, Kermit-MS Tektronix emulator, ! LaTeX, MCGA, NEC CP6 pinwriter, POSTSCRIPT, Proprinter, SUN, VGA. Additions: --- 16,25 ----- GNUPLOT 2.0 RELEASE NOTES ! New terminal drivers: ATT6300, Roland DXY800A, EEPIC, emTeX, EPSON LX-800, ! EPSON 60dpi, Fig, HP2648, HPGL, HP LaserJet, Imagen, Kermit-MS Tektronix ! emulator, LaTeX, MCGA, NEC CP6 pinwriter, POSTSCRIPT, Proprinter, Star color ! printer, Tandy DMP-130, Tektronix 410x, SUN, VGA, X11. Additions: *************** *** 178,184 PREPROCESSOR #DEFINES These #defines should be checked before compilation: ! define file note ------ ---- -------- VFORK Makefile define if you've got vfork() system call GAMMA Makefile define if you've got gamma(3) --- 179,185 ----- PREPROCESSOR #DEFINES These #defines should be checked before compilation: ! define file note ------ ---- -------- VFORK Makefile define if you've got vfork() system call GAMMA Makefile define if you've got gamma(3) *************** *** 199,205 various plotting terminals, printers, and protocols that a given version of gnuplot can access: ! define file note ------ ---- -------- TERMFLAGS Makefile the set of terminals you want, from below --- 200,206 ----- various plotting terminals, printers, and protocols that a given version of gnuplot can access: ! define file note ------ ---- -------- TERMFLAGS Makefile the set of terminals you want, from below or term.h *************** *** 202,207 define file note ------ ---- -------- TERMFLAGS Makefile the set of terminals you want, from below AED AED 512 and AED 767 BITGRAPH BBN BitGraph --- 203,209 ----- define file note ------ ---- -------- TERMFLAGS Makefile the set of terminals you want, from below + or term.h AED AED 512 and AED 767 ATT6300 PC with AT&T 6300 graphics *************** *** 204,209 TERMFLAGS Makefile the set of terminals you want, from below AED AED 512 and AED 767 BITGRAPH BBN BitGraph DXY800A Roland DXY800A plotter EPSON Epson LX-800, Star NL-10, NX-1000 and lots of others --- 206,212 ----- or term.h AED AED 512 and AED 767 + ATT6300 PC with AT&T 6300 graphics BITGRAPH BBN BitGraph CORONA PC with Corona graphics 325 DXY800A Roland DXY800A plotter *************** *** 205,210 AED AED 512 and AED 767 BITGRAPH BBN BitGraph DXY800A Roland DXY800A plotter EPSON Epson LX-800, Star NL-10, NX-1000 and lots of others FIG Fig graphics language (requires object.h from TransFig) --- 208,214 ----- AED AED 512 and AED 767 ATT6300 PC with AT&T 6300 graphics BITGRAPH BBN BitGraph + CORONA PC with Corona graphics 325 DXY800A Roland DXY800A plotter EEPIC EEPIC-extended LaTeX driver, for EEPIC users EMTEX LATEX picture environment with emTeX specials *************** *** 206,211 AED AED 512 and AED 767 BITGRAPH BBN BitGraph DXY800A Roland DXY800A plotter EPSON Epson LX-800, Star NL-10, NX-1000 and lots of others FIG Fig graphics language (requires object.h from TransFig) HP2648 HP2648, HP2647 --- 210,218 ----- BITGRAPH BBN BitGraph CORONA PC with Corona graphics 325 DXY800A Roland DXY800A plotter + EEPIC EEPIC-extended LaTeX driver, for EEPIC users + EMTEX LATEX picture environment with emTeX specials + EPS60 Epson-style 60-dot per inch printers EPSON Epson LX-800, Star NL-10, NX-1000 and lots of others FIG Fig graphics language (requires object.h from TransFig) HERCULES IBM PC/Clone with Hercules graphics board *************** *** 208,213 DXY800A Roland DXY800A plotter EPSON Epson LX-800, Star NL-10, NX-1000 and lots of others FIG Fig graphics language (requires object.h from TransFig) HP2648 HP2648, HP2647 HP26 HP2623A and maybe others HP75 HP7580, and probably other HPs --- 215,221 ----- EPS60 Epson-style 60-dot per inch printers EPSON Epson LX-800, Star NL-10, NX-1000 and lots of others FIG Fig graphics language (requires object.h from TransFig) + HERCULES IBM PC/Clone with Hercules graphics board HP2648 HP2648, HP2647 HP26 HP2623A and maybe others HP75 HP7580, and probably other HPs *************** *** 223,229 QMS QMS/QUIC laserprinter (Talaris 1200 and others) REGIS ReGis graphics (vt125, vt220, vt240, Gigis...) SELANAR Selanar ! TEK Tektronix 4010, and probably others SUN Sun Microsystems Workstation UNIXPC unixpc (ATT 3b1 or ATT 7300) UNIXPLOT unixplot --- 231,237 ----- QMS QMS/QUIC laserprinter (Talaris 1200 and others) REGIS ReGis graphics (vt125, vt220, vt240, Gigis...) SELANAR Selanar ! STARC Star Color Printer SUN Sun Microsystems Workstation T410X Tektronix 4106, 4107, 4109 and 420x terminals TANDY60 Tandy DMP-130 series 60-dot per inch graphics *************** *** 225,230 SELANAR Selanar TEK Tektronix 4010, and probably others SUN Sun Microsystems Workstation UNIXPC unixpc (ATT 3b1 or ATT 7300) UNIXPLOT unixplot V384 Vectrix 384 and tandy color printer --- 233,241 ----- SELANAR Selanar STARC Star Color Printer SUN Sun Microsystems Workstation + T410X Tektronix 4106, 4107, 4109 and 420x terminals + TANDY60 Tandy DMP-130 series 60-dot per inch graphics + TEK Tektronix 4010, and probably others UNIXPC unixpc (ATT 3b1 or ATT 7300) UNIXPLOT unixplot V384 Vectrix 384 and tandy color printer *************** *** 228,233 UNIXPC unixpc (ATT 3b1 or ATT 7300) UNIXPLOT unixplot V384 Vectrix 384 and tandy color printer These #defines are defined automatically by various compilers, some --- 239,245 ----- UNIXPC unixpc (ATT 3b1 or ATT 7300) UNIXPLOT unixplot V384 Vectrix 384 and tandy color printer + X11 X11R4 window system These #defines are defined automatically by various compilers, some *************** *** 246,254 under UNIX: To compile do: ! cp makefile.unx Makefile ! (make any changes to #defines, especially HELPDEST and TERMFLAGS) ! make under VMS: To compile: --- 258,271 ----- under UNIX: To compile do: ! Copy one of makefile.unx, makefile.x11 or makefile.3b1, ! to Makefile, for example ! cp makefile.unx Makefile ! Edit Makefile to change LIBS, #defines, especially HELPDEST and TERMFLAGS ! Edit term.h, to include/exclude terminals ! make ! If that works, try ! make install under VMS: To compile: diff -c ./README.x11 ../patch/README.x11 *** ./README.x11 Thu Sep 6 09:21:38 1990 --- ../patch/README.x11 Tue Sep 4 20:57:58 1990 *************** *** 0 --- 1,49 ----- + Gnuplot Support for X11 + ----------------------- + 31 August 1990 + + Installing gnuplot X11 support requires: + + o compilation of term.c with -DX11 included in TERMFLAGS + + o compilation of plot.c with -DX11 + + o compilation of the outboard X11 terminal driver gnuplot_x11 + + o additions to the gnuplot(1) man page to describe command line + options and tailorable resources available when gnuplot terminal + types x11 or X11 are used. + + makefile.x11 (a modified version of makefile.unx) provides these additional + functions. The X11LIBS and X11INCLUDES parameters should be set to point to + the X11 libraries and include files on your system. Comments give settings + for several systems. + + Sorry, as of this writing no support is available for systems without the + Athena widget library (libXaw.a), or platforms other than unix. + + Differences from "xgnuplot" + --------------------------- + + This X11 support is based on (and replaces) the xgnuplot wrapper/terminal + driver which was distributed separately from gnuplot. Differences: + + o Gnuplot silently invokes the outboard driver, rather than vice versa. + Thus resource names in .Xdefaults begin with "gnuplot" rather than + "xgnuplot". En passant, this change fixed the bug where xgnuplot would + hang until Ctrl-C when gnuplot was exited without plotting at least + one x11/X11 plot. + + o When the window is resized, the currently displayed plot is automatically + rescaled and replotted. + + o Compiles under X11 R3 as well as R4. This required using XtInitialize + instead of XtAppInitialize, (char *) instead of XtPointer for callback + client data declarations, removing a reference to XGetGCValues, and + parameterizing (X11INCLUDES in makefile.x11) the location of the needed + Athena include files. + + + --------------------------------- + Ed Kubaitis, ejk@uxh.cso.uiuc.edu + Computing Services Office - University of Illinois, Urbana Common subdirectories: ./bugtest and ../patch/bugtest diff -c ./buildvms.com ../patch/buildvms.com *** ./buildvms.com Tue Mar 27 08:59:27 1990 --- ../patch/buildvms.com Thu Sep 6 12:11:16 1990 *************** *** 1,6 $ ! buildvms.com (Command file to compile/link gnuplot and doc2hlp) $ CFLAGS = "/NOOP" ! $ TERMFLAGS = "/define=(AED,BITGRAPH,DXY800A,HP2648,HP26,HP75,HPGL,KERMIT,LATEX,POSTSCRIPT,QMS,REGIS,SELANAR,TEK,V384)" $ set verify $ cc 'CFLAGS' command.c $ cc 'CFLAGS' eval.c --- 1,7 ----- $ ! buildvms.com (Command file to compile/link gnuplot and doc2hlp) $ CFLAGS = "/NOOP" ! $ !TERMFLAGS = "/define=()" ! $ TERMFLAGS = "" $ set verify $ cc 'CFLAGS' command.c $ cc 'CFLAGS' eval.c diff -c ./command.c ../patch/command.c *** ./command.c Tue Mar 27 09:00:55 1990 --- ../patch/command.c Wed Sep 12 11:16:51 1990 *************** *** 40,45 #ifdef __TURBOC__ #include <dos.h> /* sleep() */ #else /* must be MSC */ #include <time.h> /* kludge to provide sleep() */ --- 40,47 ----- #ifdef __TURBOC__ #include <dos.h> /* sleep() */ + #include <conio.h> + extern unsigned _stklen = 8192; /* increase stack size */ #else /* must be MSC */ #include <time.h> /* kludge to provide sleep() */ *************** *** 72,77 extern char *strcpy(),*strncpy(),*strcat(); extern int strlen(), strcmp(); extern double magnitude(),angle(),real(),imag(); extern struct value *const_express(), *pop(), *complex(); extern struct at_type *temp_at(), *perm_at(); --- 74,86 ----- extern char *strcpy(),*strncpy(),*strcat(); extern int strlen(), strcmp(); + #ifdef unix + extern char *getwd(); + #else + extern char *getcwd(); + #endif + extern int chdir(); + extern double magnitude(),angle(),real(),imag(); extern struct value *const_express(), *pop(), *complex(); extern struct at_type *temp_at(), *perm_at(); *************** *** 265,270 c_token = num_tokens = 0; } } else if (almost_equals(c_token,"ex$it") || almost_equals(c_token,"q$uit")) { done(IO_SUCCESS); --- 274,301 ----- c_token = num_tokens = 0; } } + else if (almost_equals(c_token,"cd")) { + if (!isstring(++c_token)) + int_error("expecting directory name",c_token); + else { + quotel_str(sv_file,c_token); + if (chdir(sv_file)) { + int_error("Can't change to this directory",c_token); + } + c_token++; + } + } + else if (almost_equals(c_token,"pwd")) { + #ifdef unix + /* unix has getwd() */ + (void) getwd(sv_file); + #else + /* Turbo C and VMS have getcwd() */ + (void) getcwd(sv_file,MAX_ID_LEN); + #endif + fprintf(stderr,"%s\n", sv_file); + c_token++; + } else if (almost_equals(c_token,"ex$it") || almost_equals(c_token,"q$uit")) { done(IO_SUCCESS); *************** *** 281,287 int_error("cannot set range with replot",c_token); if (!END_OF_COMMAND) { capture(str,c_token,num_tokens-1); ! if ( (strlen(str) + strlen(input_line)) <= MAX_LINE_LEN-1) { (void) strcat(replot_line,","); (void) strcat(replot_line,str); } else { --- 312,318 ----- int_error("cannot set range with replot",c_token); if (!END_OF_COMMAND) { capture(str,c_token,num_tokens-1); ! if ( (strlen(str) + strlen(replot_line)) <= MAX_LINE_LEN-1) { (void) strcat(replot_line,","); (void) strcat(replot_line,str); } else { *************** *** 1001,1007 char *prompt; { register int i; ! int start = 0; BOOLEAN more; int last; --- 1032,1038 ----- char *prompt; { register int i; ! int start = 0, ilen = 0; BOOLEAN more; int last; *************** *** 1009,1016 if (interactive) { /* if interactive use console IO so CED will work */ cputs(prompt); do { ! input_line[start] = MAX_LINE_LEN - start - 1; ! cgets(&(input_line[start])); (void) putc('\n',stderr); if (input_line[start+2] == 26) { /* end-of-file */ --- 1040,1048 ----- if (interactive) { /* if interactive use console IO so CED will work */ cputs(prompt); do { ! ilen = MAX_LINE_LEN-start-1; ! input_line[start] = ilen > 126 ? 126 : ilen; ! (void) cgets(&(input_line[start])); (void) putc('\n',stderr); if (input_line[start+2] == 26) { /* end-of-file */ Common subdirectories: ./demo and ../patch/demo Common subdirectories: ./docs and ../patch/docs diff -c ./linkopt.tc ../patch/linkopt.tc *** ./linkopt.tc Tue Mar 27 09:03:43 1990 --- ../patch/linkopt.tc Tue Aug 28 17:10:27 1990 *************** *** 1,2 ! \tc\lib\C0l command eval graphics help internal misc parse plot scanner setshow standard term util version cga egavga herc ,gnuplot,gnuplot, \tc\lib\emu \tc\lib\mathl \tc\lib\cl \tc\lib\graphics ! --- 1,9 ----- ! \tc\lib\C0l + ! command eval graphics help internal misc parse + ! plot scanner setshow standard term util version + ! cga egavga herc att + ! ,gnuplot,gnuplot, + ! \tc\lib\emu + ! \tc\lib\mathl + ! \tc\lib\cl + ! \tc\lib\graphics diff -c ./makefile.3b1 ../patch/makefile.3b1 *** ./makefile.3b1 Tue Mar 27 08:59:02 1990 --- ../patch/makefile.3b1 Mon Sep 10 10:10:56 1990 *************** *** 21,26 CC = cc CFLAGS = -DGAMMA -O #-g # -D<terminal> in TERMFLAGS iff you wish to support <terminal> # -DAED AED 512 and AED 767 # -DBITGRAPH BBN BitGraph --- 21,31 ----- CC = cc CFLAGS = -DGAMMA -O #-g + # -lplot iff you have -DUNIXPLOT + # -lsuntool -lsunwindow -lpixrect iff you have -DSUN + # -lgl_s if IRIS4D + LIBS = -lm -lplot + # -D<terminal> in TERMFLAGS iff you wish to support <terminal> # other terminal flags defined in term.h # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) *************** *** 22,48 CFLAGS = -DGAMMA -O #-g # -D<terminal> in TERMFLAGS iff you wish to support <terminal> ! # -DAED AED 512 and AED 767 ! # -DBITGRAPH BBN BitGraph ! # -DDXY800A Roland DXY800A plotter ! # -DEPSON Epson LX-800, Star NL-10, NX-1000 and lots of others ! # -DFIG Fig graphics language (requires object.h from TransFig) ! # -DHP2648 HP2648, HP2647 ! # -DHP26 HP2623A and maybe others ! # -DHP75 HP7580, and probably other HPs ! # -DHPGL HP7475 and (hopefully) lots of others ! # -DHPLJET HP Laserjet ! # -DIMAGEN Imagen laser printers (300dpi) (requires -Iterm also) ! # -DIRIS4D IRIS4D series computer ! # -DKERMIT MS-Kermit Tektronix 4010 emulator ! # -DLATEX LATEX picture environment ! # -DPOSTSCRIPT Postscript ! # -DPROPRINTER IBM Proprinter ! # -DQMS QMS/QUIC laserprinter (Talaris 1200 and others) ! # -DREGIS ReGis graphics (vt125, vt220, vt240, Gigis...) ! # -DSELANAR Selanar ! # -DTEK Tektronix 4010, and probably others ! # -DSUN Sun Microsystems Workstation # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) # -DUNIXPLOT unixplot # -DV384 Vectrix 384 and tandy color printer --- 27,33 ----- LIBS = -lm -lplot # -D<terminal> in TERMFLAGS iff you wish to support <terminal> ! # other terminal flags defined in term.h # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) # -DUNIXPLOT unixplot *************** *** 45,51 # -DSUN Sun Microsystems Workstation # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) # -DUNIXPLOT unixplot - # -DV384 Vectrix 384 and tandy color printer TERMFLAGS = -Iterm -DNEC -DUNIXPLOT -DUNIXPC --- 30,35 ----- # other terminal flags defined in term.h # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) # -DUNIXPLOT unixplot TERMFLAGS = -Iterm -DUNIXPLOT -DUNIXPC *************** *** 47,53 # -DUNIXPLOT unixplot # -DV384 Vectrix 384 and tandy color printer ! TERMFLAGS = -Iterm -DNEC -DUNIXPLOT -DUNIXPC OBJS = command.o eval.o graphics.o help.o internal.o misc.o parse.o\ plot.o scanner.o setshow.o standard.o term.o util.o --- 31,37 ----- # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) # -DUNIXPLOT unixplot ! TERMFLAGS = -Iterm -DUNIXPLOT -DUNIXPC OBJS = command.o eval.o graphics.o help.o internal.o misc.o parse.o\ plot.o scanner.o setshow.o standard.o term.o util.o *************** *** 57,64 CSOURCE2 = help.c graphics.c internal.c CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c CSOURCE4 = term.c util.c version.c ! CSOURCE5 = term/aed.trm term/dxy.trm term/epson.trm term/font5x7.trm \ ! term/hp26.trm term/hp2648.trm term/hpgl.trm \ term/hpljet.trm term/iris4d.trm term/latex.trm term/sun.trm CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm \ --- 41,48 ----- CSOURCE2 = help.c graphics.c internal.c CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c CSOURCE4 = term.c util.c version.c ! CSOURCE5 = term/aed.trm term/dxy.trm term/eps60.trm term/epson.trm \ ! term/font5x7.trm term/hp26.trm term/hp2648.trm term/hpgl.trm \ term/hpljet.trm term/iris4d.trm term/latex.trm term/sun.trm CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm *************** *** 61,68 term/hp26.trm term/hp2648.trm term/hpgl.trm \ term/hpljet.trm term/iris4d.trm term/latex.trm term/sun.trm CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ ! term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm \ ! term/imPcodes.h term/imagen.trm term/object.h term/fig.trm # not C code, but still needed ETC = README README.gnutex makefile.unx makefile.vms linkopt.vms \ makefile.3b1 plot.h help.h setshow.h lasergnu \ --- 45,53 ----- term/font5x7.trm term/hp26.trm term/hp2648.trm term/hpgl.trm \ term/hpljet.trm term/iris4d.trm term/latex.trm term/sun.trm CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ ! term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm ! CSOURCE7 = term/imPcodes.h term/imagen.trm term/object.h term/fig.trm \ ! term/latex.trm term/eepic.trm term/x11.trm gnuplot_x11.c # not C code, but still needed ETC = README README.gnutex makefile.unx makefile.vms linkopt.vms \ README.x11 makefile.x11 \ *************** *** 65,71 term/imPcodes.h term/imagen.trm term/object.h term/fig.trm # not C code, but still needed ETC = README README.gnutex makefile.unx makefile.vms linkopt.vms \ ! makefile.3b1 plot.h help.h setshow.h lasergnu \ demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \ demo/simple.demo demo/polar.demo demo/electron.demo \ bugtest/README bugtest/printf.c bugtest/scanf.c \ --- 50,57 ----- term/latex.trm term/eepic.trm term/x11.trm gnuplot_x11.c # not C code, but still needed ETC = README README.gnutex makefile.unx makefile.vms linkopt.vms \ ! README.x11 makefile.x11 \ ! makefile.3b1 plot.h help.h setshow.h term.h lasergnu \ demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \ demo/simple.demo demo/polar.demo demo/electron.demo \ bugtest/README bugtest/printf.c bugtest/scanf.c \ *************** *** 90,99 translate/plot.h translate/scanner.c translate/standard.c \ translate/test1 translate/test2 translate/util.c ! # -lplot iff you have -DUNIXPLOT ! # -lsuntool -lsunwindow -lpixrect iff you have -DSUN ! # -lgl_s if IRIS4D ! LIBS = -lm -lplot gnuplot: $(OBJS) version.o ld /lib/crt0s.o /lib/shlib.ifile $(OBJS) version.o $(LIBS) -o gnuplot --- 76,82 ----- translate/plot.h translate/scanner.c translate/standard.c \ translate/test1 translate/test2 translate/util.c ! all: gnuplot doc gnuplot: $(OBJS) version.o ld /lib/crt0s.o /lib/shlib.ifile $(OBJS) version.o $(LIBS) -o gnuplot *************** *** 104,111 translate: (cd translate; make) - all: gnuplot doc - install: gnuplot doc man_install cp gnuplot lasergnu $(DEST) strip $(DEST)/gnuplot --- 87,92 ----- translate: (cd translate; make) install: gnuplot doc man_install cp gnuplot lasergnu $(DEST) strip $(DEST)/gnuplot *************** *** 114,120 man_install: docs/gnuplot.1 docs/lasergnu.1 cp docs/gnuplot.1 docs/lasergnu.1 $(MANDEST) ! term.o: $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c $(OBJS): plot.h --- 95,101 ----- man_install: docs/gnuplot.1 docs/lasergnu.1 cp docs/gnuplot.1 docs/lasergnu.1 $(MANDEST) ! term.o: $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c $(OBJS): plot.h *************** *** 127,133 command.o graphics.o misc.o plot.o setshow.o: setshow.h SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \ ! $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) lint: lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4) --- 108,114 ----- command.o graphics.o misc.o plot.o setshow.o: setshow.h SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \ ! $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) lint: lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4) diff -c ./makefile.msc ../patch/makefile.msc *** ./makefile.msc Tue Mar 27 09:03:45 1990 --- ../patch/makefile.msc Mon Sep 3 15:59:53 1990 *************** *** 10,16 # /DPC means define symbol PC CFLAGS = /c /AL /DPC #/DMSDOS #/Zi #/Od ! TERMFLAGS = /DHERCULES /DCORONA /DATT6300 /DEPSON /DPOSTSCRIPT /DHP75 /DHPGL /DDXY800A /DNEC # /NOE means NO EXTernal Dictionary # /EX means pack EXE file --- 10,17 ----- # /DPC means define symbol PC CFLAGS = /c /AL /DPC #/DMSDOS #/Zi #/Od ! # see other terminal defines in term.h ! TERMFLAGS = # /NOE means NO EXTernal Dictionary # /EX means pack EXE file *************** *** 21,29 misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \ term.obj util.obj version.obj pcgraph.obj hrcgraph.obj corgraph.obj ! CSOURCE5 = term\aed.trm term\dxy.trm term\epson.trm term\font5x7.trm \ ! term\hp26.trm term\hp2648.trm term\hpgl.trm \ ! term\hpljet.trm term\iris4d.trm term\latex.trm CSOURCE6 = term\post.trm term\pc.trm term\qms.trm term\regis.trm \ term\tek.trm term\unixpc.trm term\unixplot.trm term\v384.trm \ term\imPcodes.h term\imagen.trm term\object.h term\fig.trm --- 22,30 ----- misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \ term.obj util.obj version.obj pcgraph.obj hrcgraph.obj corgraph.obj ! CSOURCE5 = term\aed.trm term\dxy.trm term\eps60.trm term\epson.trm \ ! term\font5x7.trm term\hp26.trm term\hp2648.trm term\hpgl.trm \ ! term\hpljet.trm term\iris4d.trm term\latex.trm term\sun.trm CSOURCE6 = term\post.trm term\pc.trm term\qms.trm term\regis.trm \ term\tek.trm term\unixpc.trm term\unixplot.trm term\v384.trm \ term\imPcodes.h term\imagen.trm term\object.h term\fig.trm *************** *** 65,72 standard.obj: standard.c plot.h ! term.obj: term.c plot.h $(CSOURCE5) $(CSOURCE6) ! cl $(CFLAGS) $(TERMFLAGS) term.c util.obj: util.c plot.h --- 66,73 ----- standard.obj: standard.c plot.h ! term.obj: term.c term.h plot.h $(CSOURCE5) $(CSOURCE6) ! cl $(CFLAGS) $(TERMFLAGS) /Iterm term.c util.obj: util.c plot.h diff -c ./makefile.tc ../patch/makefile.tc *** ./makefile.tc Tue Mar 27 09:03:46 1990 --- ../patch/makefile.tc Mon Sep 3 15:58:19 1990 *************** *** 8,15 # location of Turbo C compiler # if this is changed then linkopt.tc will need to be edited. TC = \tc ! # location of BGI files ! BGI = $(TC) # -c means don't link, -f means emulate 8087 if not present # -ml means use large model (large code, large data) # -M means produce link map --- 8,16 ----- # location of Turbo C compiler # if this is changed then linkopt.tc will need to be edited. TC = \tc ! # location of BGI files and BGIOBJ.EXE, ! # change this line if not in TC directory, i.e. $(TC)\bgi ! BGI = $(TC)\bgi # -c means don't link, -f means emulate 8087 if not present # -ml means use large model (large code, large data) # -M means produce link map *************** *** 15,22 # -M means produce link map # -y means include line numbers for debugger # -v means include debug info ! CFLAGS = -c -f -ml -M -y -v -I$(TC)\include -DMSDOS -DPC ! TERMFLAGS = -DPOSTSCRIPT -DHPGL -DHP75 -DDXY800A -DEPSON -DNEC OBJS = command.obj eval.obj graphics.obj help.obj internal.obj \ misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \ --- 16,24 ----- # -M means produce link map # -y means include line numbers for debugger # -v means include debug info ! # -w- means ignore warnings and do not report them ! CFLAGS = -c -f -ml -M -y -v -w- -I$(TC)\include -DMSDOS -DPC ! TERMFLAGS = OBJS = command.obj eval.obj graphics.obj help.obj internal.obj \ misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \ *************** *** 20,26 OBJS = command.obj eval.obj graphics.obj help.obj internal.obj \ misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \ ! term.obj util.obj version.obj cga.obj egavga.obj herc.obj CSOURCE5 = term\aed.trm term\dxy.trm term\epson.trm term\font5x7.trm \ term\hp26.trm term\hp2648.trm term\hpgl.trm \ --- 22,28 ----- OBJS = command.obj eval.obj graphics.obj help.obj internal.obj \ misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \ ! term.obj util.obj version.obj cga.obj egavga.obj herc.obj att.obj CSOURCE5 = term\aed.trm term\dxy.trm term\eps60.trm term\epson.trm \ term\font5x7.trm term\hp26.trm term\hp2648.trm term\hpgl.trm \ *************** *** 22,29 misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \ term.obj util.obj version.obj cga.obj egavga.obj herc.obj ! CSOURCE5 = term\aed.trm term\dxy.trm term\epson.trm term\font5x7.trm \ ! term\hp26.trm term\hp2648.trm term\hpgl.trm \ term\hpljet.trm term\iris4d.trm term\latex.trm CSOURCE6 = term\post.trm term\pc.trm term\qms.trm term\regis.trm \ term\tek.trm term\unixpc.trm term\unixplot.trm term\v384.trm \ --- 24,31 ----- misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \ term.obj util.obj version.obj cga.obj egavga.obj herc.obj att.obj ! CSOURCE5 = term\aed.trm term\dxy.trm term\eps60.trm term\epson.trm \ ! term\font5x7.trm term\hp26.trm term\hp2648.trm term\hpgl.trm \ term\hpljet.trm term\iris4d.trm term\latex.trm CSOURCE6 = term\post.trm term\pc.trm term\qms.trm term\regis.trm \ term\tek.trm term\unixpc.trm term\unixplot.trm term\v384.trm \ *************** *** 65,72 standard.obj: standard.c plot.h ! term.obj: term.c plot.h $(CSOURCE5) $(CSOURCE6) ! tcc $(CFLAGS) $(TERMFLAGS) term.c util.obj: util.c plot.h --- 67,74 ----- standard.obj: standard.c plot.h ! term.obj: term.c term.h plot.h $(CSOURCE5) $(CSOURCE6) ! tcc $(CFLAGS) $(TERMFLAGS) -Iterm term.c util.obj: util.c plot.h *************** *** 81,87 # convert Borland Graphics Interface files to object for linking cga.obj: $(BGI)\cga.bgi ! bgiobj $(BGI)\cga egavga.obj: $(BGI)\egavga.bgi bgiobj $(BGI)\egavga --- 83,89 ----- # convert Borland Graphics Interface files to object for linking cga.obj: $(BGI)\cga.bgi ! $(BGI)\bgiobj $(BGI)\cga egavga.obj: $(BGI)\egavga.bgi $(BGI)\bgiobj $(BGI)\egavga *************** *** 84,90 bgiobj $(BGI)\cga egavga.obj: $(BGI)\egavga.bgi ! bgiobj $(BGI)\egavga herc.obj: $(BGI)\herc.bgi bgiobj $(BGI)\herc --- 86,92 ----- $(BGI)\bgiobj $(BGI)\cga egavga.obj: $(BGI)\egavga.bgi ! $(BGI)\bgiobj $(BGI)\egavga herc.obj: $(BGI)\herc.bgi $(BGI)\bgiobj $(BGI)\herc *************** *** 87,90 bgiobj $(BGI)\egavga herc.obj: $(BGI)\herc.bgi ! bgiobj $(BGI)\herc --- 89,95 ----- $(BGI)\bgiobj $(BGI)\egavga herc.obj: $(BGI)\herc.bgi ! $(BGI)\bgiobj $(BGI)\herc ! ! att.obj: $(BGI)\att.bgi ! $(BGI)\bgiobj $(BGI)\att diff -c ./makefile.ult ../patch/makefile.ult *** ./makefile.ult Tue Mar 27 08:59:07 1990 --- ../patch/makefile.ult Thu Sep 13 10:21:36 1990 *************** *** 1,12 # # GNUPLOT Makefile for Ultrix # - # Note: Ultrix standard cc compiler has a bug with static structure - # initializations [such as struct ts {int x;} tb[]={{100*0.32}};] - # and so this makefile uses vcc instead. If this isn't possible, - # and you get "line xx: illegal initialization", then you'll have - # to go into the .trm include file and compute all the floating point - # defines with a calculator. # directory where to install executables on 'make install' DEST=/usr/local/bin --- 1,6 ----- # # GNUPLOT Makefile for Ultrix # # Changes were made in patch 1 so that the standard Ultrix cc compiler # can be used. Use makefile.unx. *************** *** 8,20 # to go into the .trm include file and compute all the floating point # defines with a calculator. ! # directory where to install executables on 'make install' ! DEST=/usr/local/bin ! # directory for installing man page on 'make man_install' ! MANDEST=/usr/man/manl ! # where to install help file gnuplot.gih ! #HELPDEST=/usr/local/lib/gnuplot.gih ! HELPDEST=docs/gnuplot.gih # -DVFORK if you have vfork() # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?) --- 2,9 ----- # GNUPLOT Makefile for Ultrix # ! # Changes were made in patch 1 so that the standard Ultrix cc compiler ! # can be used. Use makefile.unx. all: echo "Use makefile.unx instead" *************** *** 16,28 #HELPDEST=/usr/local/lib/gnuplot.gih HELPDEST=docs/gnuplot.gih ! # -DVFORK if you have vfork() ! # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?) ! # -DBZERO if you need to use bzero() (another BSD feature) instead of memset() ! # -DNOCOPY if you don't have a memcpy() by any name ! # -DGAMMA if you've got gamma(3) ! # -O if you trust your compiler's optimizer ! CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA -O #-gx # Not wise to use vcc for everything because math.h isn't compatible with # vcc. (How can they get away with this?) --- 5,10 ----- # Changes were made in patch 1 so that the standard Ultrix cc compiler # can be used. Use makefile.unx. ! all: ! echo "Use makefile.unx instead" *************** *** 24,157 # -O if you trust your compiler's optimizer CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA -O #-gx - # Not wise to use vcc for everything because math.h isn't compatible with - # vcc. (How can they get away with this?) - #CC = vcc - - # -D<terminal> in TERMFLAGS iff you wish to support <terminal> - # -DAED AED 512 and AED 767 - # -DBITGRAPH BBN BitGraph - # -DDXY800A Roland DXY800A plotter - # -DEPSON Epson LX-800, Star NL-10, NX-1000 and lots of others - # -DFIG Fig graphics language (requires object.h from TransFig) - # -DHP2648 HP2648, HP2647 - # -DHP26 HP2623A and maybe others - # -DHP75 HP7580, and probably other HPs - # -DHPGL HP7475 and (hopefully) lots of others - # -DHPLJET HP Laserjet - # -DIMAGEN Imagen laser printers (300dpi) (requires -Iterm also) - # -DIRIS4D IRIS4D series computer - # -DKERMIT MS-Kermit Tektronix 4010 emulator - # -DLATEX LATEX picture environment - # -DPOSTSCRIPT Postscript - # -DPROPRINTER IBM Proprinter - # -DQMS QMS/QUIC laserprinter (Talaris 1200 and others) - # -DREGIS ReGis graphics (vt125, vt220, vt240, Gigis...) - # -DSELANAR Selanar - # -DTEK Tektronix 4010, and probably others - # -DSUN Sun Microsystems Workstation - # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) - # -DUNIXPLOT unixplot - # -DV384 Vectrix 384 and tandy color printer - - TERMFLAGS = -Iterm -DAED -DBITGRAPH -DDXY800A -DEPSON -DHP2648 \ - -DHP26 -DHP75 -DHPGL -DHPLJET -DIMAGEN -DKERMIT -DLATEX \ - -DPOSTSCRIPT -DPROPRINTER -DQMS -DREGIS -DSELANAR -DTEK \ - -DUNIXPLOT -DV384 - - #TERMFLAGS = -Iterm -DIMAGEN - - OBJS = command.o eval.o graphics.o help.o internal.o misc.o parse.o\ - plot.o scanner.o setshow.o standard.o term.o util.o - - DIRS = term demo bugtest docs docs/latextut translate - CSOURCE1 = command.c setshow.c - CSOURCE2 = help.c graphics.c internal.c - CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c - CSOURCE4 = term.c util.c version.c - CSOURCE5 = term/aed.trm term/dxy.trm term/epson.trm term/font5x7.trm \ - term/hp26.trm term/hp2648.trm term/hpgl.trm \ - term/hpljet.trm term/iris4d.trm term/latex.trm term/sun.trm - CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ - term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm \ - term/imPcodes.h term/imagen.trm term/object.h term/fig.trm - # not C code, but still needed - ETC = README README.gnutex makefile.unx makefile.vms linkopt.vms \ - makefile.3b1 plot.h help.h setshow.h lasergnu \ - demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \ - demo/simple.demo demo/polar.demo demo/electron.demo \ - bugtest/README bugtest/printf.c bugtest/scanf.c \ - bugtest/mscbug.c term/README - # PC-specific files - PC = corgraph.asm corplot.c header.mac hrcgraph.asm lineproc.mac \ - linkopt.msc linkopt.tc makefile.msc makefile.tc pcgraph.asm - # Documentation and help files - DOCS1 = docs/Makefile docs/README docs/checkdoc.c docs/doc2gih.c \ - docs/doc2hlp.c docs/doc2hlp.com docs/doc2ms.c docs/doc2tex.c \ - docs/gnuplot.1 docs/lasergnu.1 \ - docs/titlepage.ms docs/titlepage.tex - DOCS2 = docs/gnuplot.doc - DOCS3 = docs/latextut/Makefile docs/latextut/eg1.plt \ - docs/latextut/eg2.plt docs/latextut/eg3.dat docs/latextut/eg3.plt \ - docs/latextut/eg4.plt docs/latextut/eg5.plt docs/latextut/eg6.plt \ - docs/latextut/header.tex docs/latextut/tutorial.tex - # gnutex->gnuplot translator - TSOURCE1 = translate/Makefile translate/README translate/command.c \ - translate/eval.c translate/gnut2p.1 translate/internal.c \ - translate/misc.c translate/parse.c translate/plot.c \ - translate/plot.h translate/scanner.c translate/standard.c \ - translate/test1 translate/test2 translate/util.c - - # -lplot iff you have -DUNIXPLOT - # -lsuntool -lsunwindow -lpixrect iff you have -DSUN - # -lgl_s if IRIS4D - LIBS = -lm -lplot - - gnuplot: $(OBJS) version.o - vcc $(CFLAGS) $(OBJS) version.o $(LIBS) -o gnuplot - - doc: - ( cd docs; make gnuplot.gih ) - - translate: - (cd translate; make) - - all: gnuplot doc - - install: gnuplot doc man_install - cp gnuplot lasergnu $(DEST) - strip $(DEST)/gnuplot - (cd docs; make install-unix HELPDEST=$(HELPDEST)) - - man_install: docs/gnuplot.1 docs/lasergnu.1 - cp docs/gnuplot.1 docs/lasergnu.1 $(MANDEST) - - term.o: $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) - vcc $(CFLAGS) $(TERMFLAGS) -c term.c - - $(OBJS): plot.h - - command.o: - cc $(CFLAGS) -c command.c -DHELPFILE=\"$(HELPDEST)\" - - command.o help.o misc.o: help.h - - command.o graphics.o misc.o plot.o setshow.o: setshow.h - - SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \ - $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) - - lint: - lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4) - - clean: - rm -f *.o *~ term/*~ - (cd docs; make clean) - (cd docs/latextut; make clean) - (cd translate; make clean) - - spotless: - rm -f *.o *~ term/*~ TAGS gnuplot - (cd docs; make clean) - (cd docs/latextut; make spotless) - (cd translate; make spotless) --- 8,10 ----- all: echo "Use makefile.unx instead" diff -c ./makefile.unx ../patch/makefile.unx *** ./makefile.unx Tue Mar 27 08:58:58 1990 --- ../patch/makefile.unx Thu Sep 13 09:57:07 1990 *************** *** 18,23 # -DNOCOPY if you don't have a memcpy() by any name # -DGAMMA if you've got gamma(3) # -fswitch if you are compiling on a Sun3 (or even -f68881) # -O if you trust your compiler's optimizer CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA #-gx #-O --- 18,24 ----- # -DNOCOPY if you don't have a memcpy() by any name # -DGAMMA if you've got gamma(3) # -fswitch if you are compiling on a Sun3 (or even -f68881) + # (but -fswitch is buggy on some systems, so watch out) # -O if you trust your compiler's optimizer CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA #-gx #-O *************** *** 21,26 # -O if you trust your compiler's optimizer CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA #-gx #-O # -D<terminal> in TERMFLAGS iff you wish to support <terminal> # -DAED AED 512 and AED 767 # -DBITGRAPH BBN BitGraph --- 22,32 ----- # -O if you trust your compiler's optimizer CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA #-gx #-O + # -lplot if you have -DUNIXPLOT + # -lsuntool -lsunwindow -lpixrect if you have -DSUN + # -lgl_s if IRIS4D + LIBS = -lm -lplot + # -D<terminal> in TERMFLAGS iff you wish to support <terminal> # see other terminal defines in term.h # -DFIG Fig graphics language (requires object.h from TransFig) *************** *** 22,39 CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA #-gx #-O # -D<terminal> in TERMFLAGS iff you wish to support <terminal> ! # -DAED AED 512 and AED 767 ! # -DBITGRAPH BBN BitGraph ! # -DDXY800A Roland DXY800A plotter ! # -DEEPIC EEPIC-extended LaTeX driver, for EEPIC users ! # -DEPSON Epson LX-800, Star NL-10, NX-1000 and lots of others ! # -DFIG Fig graphics language (requires object.h from TransFig) ! # -DHP2648 HP2648, HP2647 ! # -DHP26 HP2623A and maybe others ! # -DHP75 HP7580, and probably other HPs ! # -DHPGL HP7475, HP7220 plotters, and (hopefully) lots of others ! # -DHPLJET HP Laserjet ! # -DIMAGEN Imagen laser printers (300dpi) (requires -Iterm also) # -DIRIS4D IRIS4D series computer # -DKERMIT MS-Kermit Tektronix 4010 emulator # -DLATEX LATEX picture environment --- 28,35 ----- LIBS = -lm -lplot # -D<terminal> in TERMFLAGS iff you wish to support <terminal> ! # see other terminal defines in term.h ! # -DFIG Fig graphics language (requires object.h from TransFig) # -DIRIS4D IRIS4D series computer # -DSUN Sun Microsystems Workstation # -DUNIXPLOT unixplot *************** *** 35,49 # -DHPLJET HP Laserjet # -DIMAGEN Imagen laser printers (300dpi) (requires -Iterm also) # -DIRIS4D IRIS4D series computer - # -DKERMIT MS-Kermit Tektronix 4010 emulator - # -DLATEX LATEX picture environment - # -DNEC NEC CP6 pinwriter printer - # -DPOSTSCRIPT Postscript - # -DPROPRINTER IBM Proprinter - # -DQMS QMS/QUIC laserprinter (Talaris 1200 and others) - # -DREGIS ReGis graphics (vt125, vt220, vt240, Gigis...) - # -DSELANAR Selanar - # -DTEK Tektronix 4010, and probably others # -DSUN Sun Microsystems Workstation # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) # -DUNIXPLOT unixplot --- 31,36 ----- # see other terminal defines in term.h # -DFIG Fig graphics language (requires object.h from TransFig) # -DIRIS4D IRIS4D series computer # -DSUN Sun Microsystems Workstation # -DUNIXPLOT unixplot *************** *** 45,51 # -DSELANAR Selanar # -DTEK Tektronix 4010, and probably others # -DSUN Sun Microsystems Workstation - # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) # -DUNIXPLOT unixplot # -DV384 Vectrix 384 and tandy color printer --- 32,37 ----- # -DFIG Fig graphics language (requires object.h from TransFig) # -DIRIS4D IRIS4D series computer # -DSUN Sun Microsystems Workstation # -DUNIXPLOT unixplot TERMFLAGS = -Iterm -DUNIXPLOT *************** *** 47,53 # -DSUN Sun Microsystems Workstation # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) # -DUNIXPLOT unixplot - # -DV384 Vectrix 384 and tandy color printer TERMFLAGS = -Iterm -DAED -DBITGRAPH -DDXY800A -DEPSON -DHP2648 \ -DHP26 -DHP75 -DHPGL -DHPLJET -DIMAGEN -DKERMIT -DLATEX -DEEPIC \ --- 33,38 ----- # -DIRIS4D IRIS4D series computer # -DSUN Sun Microsystems Workstation # -DUNIXPLOT unixplot TERMFLAGS = -Iterm -DUNIXPLOT *************** *** 49,58 # -DUNIXPLOT unixplot # -DV384 Vectrix 384 and tandy color printer ! TERMFLAGS = -Iterm -DAED -DBITGRAPH -DDXY800A -DEPSON -DHP2648 \ ! -DHP26 -DHP75 -DHPGL -DHPLJET -DIMAGEN -DKERMIT -DLATEX -DEEPIC \ ! -DPOSTSCRIPT -DPROPRINTER -DQMS -DREGIS -DSELANAR -DTEK \ ! -DUNIXPLOT -DV384 OBJS = command.o eval.o graphics.o help.o internal.o misc.o parse.o\ plot.o scanner.o setshow.o standard.o term.o util.o --- 34,40 ----- # -DSUN Sun Microsystems Workstation # -DUNIXPLOT unixplot ! TERMFLAGS = -Iterm -DUNIXPLOT OBJS = command.o eval.o graphics.o help.o internal.o misc.o parse.o\ plot.o scanner.o setshow.o standard.o term.o util.o *************** *** 62,70 CSOURCE2 = help.c graphics.c internal.c CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c CSOURCE4 = term.c util.c version.c ! CSOURCE5 = term/aed.trm term/dxy.trm term/epson.trm term/font5x7.trm \ ! term/hp26.trm term/hp2648.trm term/hpgl.trm \ ! term/hpljet.trm term/iris4d.trm term/sun.trm CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm CSOURCE7 = term/imPcodes.h term/imagen.trm term/object.h term/fig.trm \ --- 44,52 ----- CSOURCE2 = help.c graphics.c internal.c CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c CSOURCE4 = term.c util.c version.c ! CSOURCE5 = term/aed.trm term/dxy.trm term/eps60.trm term/epson.trm \ ! term/font5x7.trm term/hp26.trm term/hp2648.trm term/hpgl.trm \ ! term/hpljet.trm term/iris4d.trm term/latex.trm term/sun.trm CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm CSOURCE7 = term/imPcodes.h term/imagen.trm term/object.h term/fig.trm \ *************** *** 68,74 CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm CSOURCE7 = term/imPcodes.h term/imagen.trm term/object.h term/fig.trm \ ! term/latex.trm term/eepic.trm # not C code, but still needed ETC = Copyright README README.gnutex makefile.unx makefile.vms \ makefile.3b1 makefile.ult plot.h help.h setshow.h lasergnu \ --- 50,56 ----- CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm CSOURCE7 = term/imPcodes.h term/imagen.trm term/object.h term/fig.trm \ ! term/latex.trm term/eepic.trm term/x11.trm gnuplot_x11.c # not C code, but still needed ETC = Copyright README README.gnutex makefile.unx makefile.vms \ README.x11 makefile.x11 \ *************** *** 71,77 term/latex.trm term/eepic.trm # not C code, but still needed ETC = Copyright README README.gnutex makefile.unx makefile.vms \ ! makefile.3b1 makefile.ult plot.h help.h setshow.h lasergnu \ demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \ demo/simple.demo demo/polar.demo demo/electron.demo \ bugtest/README bugtest/printf.c bugtest/scanf.c \ --- 53,60 ----- term/latex.trm term/eepic.trm term/x11.trm gnuplot_x11.c # not C code, but still needed ETC = Copyright README README.gnutex makefile.unx makefile.vms \ ! README.x11 makefile.x11 \ ! makefile.3b1 plot.h help.h setshow.h term.h lasergnu \ demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \ demo/simple.demo demo/polar.demo demo/electron.demo \ bugtest/README bugtest/printf.c bugtest/scanf.c \ *************** *** 98,107 translate/plot.h translate/scanner.c translate/standard.c \ translate/test1 translate/test2 translate/util.c ! # -lplot if you have -DUNIXPLOT ! # -lsuntool -lsunwindow -lpixrect if you have -DSUN ! # -lgl_s if IRIS4D ! LIBS = -lm -lplot gnuplot: $(OBJS) version.o cc $(CFLAGS) $(OBJS) version.o $(LIBS) -o gnuplot --- 81,87 ----- translate/plot.h translate/scanner.c translate/standard.c \ translate/test1 translate/test2 translate/util.c ! all: gnuplot doc gnuplot: $(OBJS) version.o $(CC) $(CFLAGS) $(OBJS) version.o $(LIBS) -o gnuplot *************** *** 104,110 LIBS = -lm -lplot gnuplot: $(OBJS) version.o ! cc $(CFLAGS) $(OBJS) version.o $(LIBS) -o gnuplot doc: ( cd docs; make gnuplot.gih ) --- 84,90 ----- all: gnuplot doc gnuplot: $(OBJS) version.o ! $(CC) $(CFLAGS) $(OBJS) version.o $(LIBS) -o gnuplot doc: ( cd docs; make gnuplot.gih ) *************** *** 112,119 translate: (cd translate; make) - all: gnuplot doc - install: gnuplot doc man_install cp gnuplot lasergnu $(DEST) strip $(DEST)/gnuplot --- 92,97 ----- translate: (cd translate; make) install: gnuplot doc man_install cp gnuplot lasergnu $(DEST) strip $(DEST)/gnuplot *************** *** 122,129 man_install: docs/gnuplot.1 docs/lasergnu.1 cp docs/gnuplot.1 docs/lasergnu.1 $(MANDEST) ! term.o: $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) ! cc $(CFLAGS) $(TERMFLAGS) -c term.c version.o: cc $(CFLAGS) -DCONTACT=$(EMAIL) -c version.c --- 100,107 ----- man_install: docs/gnuplot.1 docs/lasergnu.1 cp docs/gnuplot.1 docs/lasergnu.1 $(MANDEST) ! term.o: term.h $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) ! $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c version.o: $(CC) $(CFLAGS) -DCONTACT=$(EMAIL) -c version.c *************** *** 126,132 cc $(CFLAGS) $(TERMFLAGS) -c term.c version.o: ! cc $(CFLAGS) -DCONTACT=$(EMAIL) -c version.c $(OBJS): plot.h --- 104,110 ----- $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c version.o: ! $(CC) $(CFLAGS) -DCONTACT=$(EMAIL) -c version.c $(OBJS): plot.h *************** *** 131,137 $(OBJS): plot.h command.o: ! cc $(CFLAGS) -c command.c -DHELPFILE=\"$(HELPDEST)\" command.o help.o misc.o: help.h --- 109,115 ----- $(OBJS): plot.h command.o: ! $(CC) $(CFLAGS) -c command.c -DHELPFILE=\"$(HELPDEST)\" command.o help.o misc.o: help.h diff -c ./makefile.vms ../patch/makefile.vms *** ./makefile.vms Tue Mar 27 08:58:59 1990 --- ../patch/makefile.vms Thu Sep 6 12:10:21 1990 *************** *** 9,38 # NOOP NO Optimiser CFLAGS = /NOOP ! # -D<terminal> in TERMFLAGS iff you wish to support <terminal> ! # -DAED AED 512 and AED 767 ! # -DBITGRAPH BBN BitGraph ! # -DDXY800A Roland DXY800A plotter ! # -DEPSON Epson LX-800, Star NL-10, NX-1000 and lots of others ! # -DFIG Fig graphics language (requires object.h from TransFig) ! # -DHP2648 HP2648, HP2647 ! # -DHP26 HP2623A and maybe others ! # -DHP75 HP7580, and probably other HPs ! # -DHPGL HP7475 and (hopefully) lots of others ! # -DHPLJET HP Laserjet ! # -DIMAGEN Imagen laser printers (300dpi) (requires -Iterm also) ! # -DIRIS4D IRIS4D series computer ! # -DKERMIT MS-Kermit Tektronix 4010 emulator ! # -DLATEX LATEX picture environment ! # -DPOSTSCRIPT Postscript ! # -DPROPRINTER IBM Proprinter ! # -DQMS QMS/QUIC laserprinter (Talaris 1200 and others) ! # -DREGIS ReGis graphics (vt125, vt220, vt240, Gigis...) ! # -DSELANAR Selanar ! # -DTEK Tektronix 4010, and probably others ! # -DUNIXPC unixpc (ATT 3b1 or ATT 7300) ! # -DUNIXPLOT unixplot ! # -DV384 Vectrix 384 and tandy color printer TERMFLAGS = /define=(AED,BITGRAPH,DXY800A,HP2648,HP26,HP75,HPGL, \ --- 9,16 ----- # NOOP NO Optimiser CFLAGS = /NOOP ! # /define=(<terminal>) in TERMFLAGS iff you wish to support <terminal> ! # see other terminal defines in term.h TERMFLAGS = *************** *** 34,39 # -DUNIXPLOT unixplot # -DV384 Vectrix 384 and tandy color printer TERMFLAGS = /define=(AED,BITGRAPH,DXY800A,HP2648,HP26,HP75,HPGL, \ KERMIT,LATEX,POSTSCRIPT,QMS,REGIS,SELANAR,TEK,V384) --- 12,18 ----- # /define=(<terminal>) in TERMFLAGS iff you wish to support <terminal> # see other terminal defines in term.h + TERMFLAGS = OBJS = command.obj,eval.obj,graphics.obj,internal.obj, \ misc.obj,parse.obj,plot.obj,scanner.obj,setshow.obj, \ *************** *** 35,43 # -DV384 Vectrix 384 and tandy color printer - TERMFLAGS = /define=(AED,BITGRAPH,DXY800A,HP2648,HP26,HP75,HPGL, \ - KERMIT,LATEX,POSTSCRIPT,QMS,REGIS,SELANAR,TEK,V384) - OBJS = command.obj,eval.obj,graphics.obj,internal.obj, \ misc.obj,parse.obj,plot.obj,scanner.obj,setshow.obj, \ standard.obj,term.obj,util.obj,version.obj --- 14,19 ----- TERMFLAGS = OBJS = command.obj,eval.obj,graphics.obj,internal.obj, \ misc.obj,parse.obj,plot.obj,scanner.obj,setshow.obj, \ standard.obj,term.obj,util.obj,version.obj *************** *** 46,53 CSOURCE2 = help.c graphics.c internal.c CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c CSOURCE4 = term.c util.c version.c ! CSOURCE5 = [.term]aed.trm [.term]dxy.trm [.term]epson.trm [.term]font5x7.trm \ ! [.term]hp26.trm [.term]hp2648.trm [.term]hpgl.trm \ [.term]hpljet.trm [.term]iris4d.trm [.term]latex.trm CSOURCE6 = [.term]post.trm [.term]pc.trm [.term]qms.trm [.term]regis.trm \ [.term]tek.trm [.term]unixpc.trm [.term]unixplot.trm [.term]v384.trm \ --- 22,29 ----- CSOURCE2 = help.c graphics.c internal.c CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c CSOURCE4 = term.c util.c version.c ! CSOURCE5 = [.term]aed.trm [.term]dxy.trm [.term]eps60.trm [.term]epson.trm \ ! [.term]font5x7.trm [.term]hp26.trm [.term]hp2648.trm [.term]hpgl.trm \ [.term]hpljet.trm [.term]iris4d.trm [.term]latex.trm CSOURCE6 = [.term]post.trm [.term]pc.trm [.term]qms.trm [.term]regis.trm \ [.term]tek.trm [.term]unixpc.trm [.term]unixplot.trm [.term]v384.trm \ *************** *** 70,76 cc [.docs]doc2hlp.c link doc2hlp,linkopt.vms/opt ! term.obj : $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) cc $(CFLAGS) $(TERMFLAGS) term.c $(OBJS) : plot.h --- 46,52 ----- cc [.docs]doc2hlp.c link doc2hlp,linkopt.vms/opt ! term.obj : term.h $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) cc $(CFLAGS) $(TERMFLAGS) term.c $(OBJS) : plot.h diff -c ./makefile.x11 ../patch/makefile.x11 *** ./makefile.x11 Thu Sep 6 09:22:34 1990 --- ../patch/makefile.x11 Thu Sep 13 09:57:28 1990 *************** *** 0 --- 1,210 ----- + # + # GNUPLOT Makefile (Unix X11 support) + # + + # directory where to install executables on 'make install' + DEST=/usr/local/bin + # directory for installing man page on 'make man_install' + MANDEST=/usr/man/manl + # where to install help file gnuplot.gih + #HELPDEST=/usr/local/lib/gnuplot.gih + HELPDEST=docs/gnuplot.gih + # Where to send email about bugs and comments (locally) + EMAIL=\"pixar\!bug-gnuplot@sun.com\" + + # -DVFORK if you have vfork() + # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?) + # -DBZERO if you need to use bzero() (another BSD feature) instead of memset() + # -DNOCOPY if you don't have a memcpy() by any name + # -DGAMMA if you've got gamma(3) + # -fswitch if you are compiling on a Sun3 (or even -f68881) + # (but -fswitch is buggy on some systems, so watch out) + # -O if you trust your compiler's optimizer + # -Dunix and no -DVFORK if IBM RS/6000 AIX 3.1 + CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA #-gx #-O + + # -lplot if you have -DUNIXPLOT + # -lsuntool -lsunwindow -lpixrect if you have -DSUN + # -lgl_s if IRIS4D + LIBS = -lm -lplot + + # standard MIT X11 R4: -lXaw -lXmu -lXt -lXext -lX11 + # Apollo DomainOS 10.4.2 (R3): -L/usr/lib/X11 -lXaw -lXmu -lXt -lX11 + # IBM RS/6000 AIX 3.1 (R3): -L/usr/lpp/X11/Xamples/lib/Xmu \ + # -L/usr/lpp/X11/Xamples/lib/Xaw \ + # -lXaw -lXmu -lXt -lXext -lX11 + X11LIBS = -lXaw -lXmu -lXt -lXext -lX11 + + # standard MIT X11 R4: -I/usr/include/X11 -I/usr/include/X11/Xaw + # Apollo DomainOS 10.4.2 (R3): -I/usr/include/X11 + # IBM RS/6000 AIX 3.1 (R3): -I/usr/include/X11 -I/usr/lpp/X11/Xamples/lib/Xaw \ + # -I/usr/lpp/X11/Xamples/lib/Xaw/X11 + X11INCLUDES = -I/usr/include/X11 -I/usr/include/X11/Xaw + + # -D<terminal> in TERMFLAGS iff you wish to support <terminal> + # see other terminal defines in term.h + # -DFIG Fig graphics language (requires object.h from TransFig) + # -DIRIS4D IRIS4D series computer + # -DSUN Sun Microsystems Workstation + # -DUNIXPLOT unixplot + # -DX11 X11 Window System + + TERMFLAGS = -Iterm -DUNIXPLOT -DX11 + + OBJS = command.o eval.o graphics.o help.o internal.o misc.o parse.o\ + plot.o scanner.o setshow.o standard.o term.o util.o + + DIRS = term demo bugtest docs docs/latextut translate + CSOURCE1 = command.c setshow.c + CSOURCE2 = help.c graphics.c internal.c + CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c + CSOURCE4 = term.c util.c version.c + CSOURCE5 = term/aed.trm term/dxy.trm term/epson.trm term/font5x7.trm \ + term/hp26.trm term/hp2648.trm term/hpgl.trm \ + term/hpljet.trm term/iris4d.trm term/sun.trm + CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ + term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm + CSOURCE7 = term/imPcodes.h term/imagen.trm term/object.h term/fig.trm \ + term/latex.trm term/eepic.trm term/x11.trm gnuplot_x11.c + # not C code, but still needed + ETC = Copyright README README.gnutex makefile.unx makefile.vms \ + README.x11 makefile.x11 \ + makefile.3b1 plot.h help.h setshow.h term.h lasergnu \ + demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \ + demo/simple.demo demo/polar.demo demo/electron.demo \ + bugtest/README bugtest/printf.c bugtest/scanf.c \ + bugtest/mscbug.c term/README \ + linkopt.vms buildvms.com + # PC-specific files + PC = corgraph.asm corplot.c header.mac hrcgraph.asm lineproc.mac \ + linkopt.msc linkopt.tc makefile.msc makefile.tc pcgraph.asm + # Documentation and help files + DOCS1 = docs/Makefile docs/README docs/checkdoc.c docs/doc2gih.c \ + docs/doc2hlp.c docs/doc2hlp.com docs/doc2ms.c docs/doc2tex.c \ + docs/gnuplot.1 docs/lasergnu.1 \ + docs/titlepage.ms docs/titlepage.tex + DOCS2 = docs/gnuplot.doc + DOCS3 = docs/latextut/Makefile docs/latextut/eg1.plt \ + docs/latextut/eg2.plt docs/latextut/eg3.dat docs/latextut/eg3.plt \ + docs/latextut/eg4.plt docs/latextut/eg5.plt docs/latextut/eg6.plt \ + docs/latextut/header.tex docs/latextut/tutorial.tex + # gnutex->gnuplot translator + TSOURCE1 = translate/Makefile translate/README translate/command.c \ + translate/eval.c translate/gnut2p.1 translate/internal.c \ + translate/misc.c translate/parse.c translate/plot.c + TSOURCE2 = \ + translate/plot.h translate/scanner.c translate/standard.c \ + translate/test1 translate/test2 translate/util.c + + all: gnuplot gnuplot_x11 doc + + gnuplot: $(OBJS) version.o + $(CC) $(CFLAGS) $(OBJS) version.o $(LIBS) -o gnuplot + + doc: + ( cd docs; make gnuplot.gih ) + + translate: + (cd translate; make) + + gnuplot_x11: gnuplot_x11.c + $(CC) $(CFLAGS) $(X11INCLUDES) -o gnuplot_x11 gnuplot_x11.c $(X11LIBS) + + install: gnuplot gnuplot_x11 doc man_install + cp gnuplot gnuplot_x11 lasergnu $(DEST) + strip $(DEST)/gnuplot + strip $(DEST)/gnuplot_x11 + (cd docs; make install-unix HELPDEST=$(HELPDEST)) + + man_install: docs/gnuplot.1.x11 docs/lasergnu.1 + cp docs/lasergnu.1 $(MANDEST) + cp docs/gnuplot.1.x11 $(MANDEST)/gnuplot.1 + + plot.o: plot.c + $(CC) $(CFLAGS) -DX11 -c plot.c + + term.o: term.h $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) + $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c + + version.o: + $(CC) $(CFLAGS) -DCONTACT=$(EMAIL) -c version.c + + $(OBJS): plot.h + + command.o: + $(CC) $(CFLAGS) -c command.c -DHELPFILE=\"$(HELPDEST)\" + + command.o help.o misc.o: help.h + + command.o graphics.o misc.o plot.o setshow.o: setshow.h + + SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \ + $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) + + lint: + lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4) + + clean: + rm -f *.o *~ term/*~ + (cd docs; make clean) + (cd docs/latextut; make clean) + (cd translate; make clean) + + spotless: + rm -f *.o *~ term/*~ TAGS gnuplot gnuplot_x11 + (cd docs; make clean) + (cd docs/latextut; make spotless) + (cd translate; make spotless) + + shar: gnuplot.sh00 gnuplot.sh01 gnuplot.sh02 gnuplot.sh03 gnuplot.sh04 \ + gnuplot.sh05 gnuplot.sh06 gnuplot.sh07 gnuplot.sh08 \ + gnuplot.sh09 gnuplot.sh10 gnuplot.sh11 gnuplot.sh12 \ + gnuplot.sh13 gnuplot.sh14 + + gnuplot.sh00: + echo '#!/bin/sh' > gnuplot.sh00 + echo '# This is a shell file to make directories' >> gnuplot.sh00 + echo mkdir $(DIRS) >> gnuplot.sh00 + + gnuplot.sh01: $(ETC) + shar $(ETC) > gnuplot.sh01 + + gnuplot.sh02: $(DOCS1) + shar $(DOCS1) > gnuplot.sh02 + + gnuplot.sh03: $(DOCS2) + shar $(DOCS2) > gnuplot.sh03 + + gnuplot.sh04: $(DOCS3) + shar $(DOCS3) > gnuplot.sh04 + + gnuplot.sh05: $(CSOURCE1) + shar $(CSOURCE1) > gnuplot.sh05 + + gnuplot.sh06: $(CSOURCE2) + shar $(CSOURCE2) > gnuplot.sh06 + + gnuplot.sh07: $(CSOURCE3) + shar $(CSOURCE3) > gnuplot.sh07 + + gnuplot.sh08: $(CSOURCE4) + shar $(CSOURCE4) > gnuplot.sh08 + + gnuplot.sh09: $(CSOURCE5) + shar $(CSOURCE5) > gnuplot.sh09 + + gnuplot.sh10: $(CSOURCE6) + shar $(CSOURCE6) > gnuplot.sh10 + + gnuplot.sh11: $(CSOURCE7) + shar $(CSOURCE7) > gnuplot.sh11 + + gnuplot.sh12: $(PC) + shar $(PC) > gnuplot.sh12 + + gnuplot.sh13: $(TSOURCE1) + shar $(TSOURCE1) > gnuplot.sh13 + + gnuplot.sh14: $(TSOURCE2) + shar $(TSOURCE2) > gnuplot.sh14 + diff -c ./misc.c ../patch/misc.c *** ./misc.c Tue Mar 27 09:01:30 1990 --- ../patch/misc.c Thu Sep 6 09:20:35 1990 *************** *** 36,41 #include <graphics.h> #endif extern int c_token; extern char replot_line[]; extern struct at_type at; --- 36,43 ----- #include <graphics.h> #endif + extern char *malloc(); + extern int c_token; extern char replot_line[]; extern struct at_type at; *************** *** 514,520 { char *p; /* the new allocation */ char errbuf[100]; /* error message string */ - extern char *malloc(); p = malloc(size); if (p == (char *)NULL) { --- 516,521 ----- { char *p; /* the new allocation */ char errbuf[100]; /* error message string */ p = malloc(size); if (p == (char *)NULL) { diff -c ./parse.c ../patch/parse.c *** ./parse.c Tue Mar 27 09:01:39 1990 --- ../patch/parse.c Thu Aug 30 09:40:22 1990 *************** *** 31,36 #include <setjmp.h> #include <signal.h> #include <errno.h> #include "plot.h" #ifndef vms --- 31,37 ----- #include <setjmp.h> #include <signal.h> #include <errno.h> + #include <math.h> #include "plot.h" #ifndef vms *************** *** 75,80 } evaluate_at(at_ptr,val_ptr) struct at_type *at_ptr; struct value *val_ptr; --- 76,112 ----- } + #ifdef apollo + #include <apollo/base.h> + #include <apollo/pfm.h> + #include <apollo/fault.h> + + /* + On an Apollo, the OS can signal a couple errors that are not mapped + into SIGFPE, namely signalling NaN and branch on an unordered + comparison. I suppose there are others, but none of these are documented, + so I handle them as they arise. + + Anyway, we need to catch these faults and signal SIGFPE. + */ + + pfm_$fh_func_val_t apollo_sigfpe(pfm_$fault_rec_t& fault_rec) + { + kill(getpid(), SIGFPE); + return pfm_$continue_fault_handling; + } + + apollo_pfm_catch() + { + status_$t status; + pfm_$establish_fault_handler(fault_$fp_bsun, pfm_$fh_backstop, + apollo_sigfpe, &status); + pfm_$establish_fault_handler(fault_$fp_sig_nan, pfm_$fh_backstop, + apollo_sigfpe, &status); + } + #endif + + evaluate_at(at_ptr,val_ptr) struct at_type *at_ptr; struct value *val_ptr; *************** *** 79,84 struct at_type *at_ptr; struct value *val_ptr; { undefined = FALSE; errno = 0; reset_stack(); --- 111,118 ----- struct at_type *at_ptr; struct value *val_ptr; { + double temp, real(); + undefined = FALSE; errno = 0; reset_stack(); *************** *** 95,100 } else { (void) pop(val_ptr); check_stack(); } } --- 129,139 ----- } else { (void) pop(val_ptr); check_stack(); + } + /* At least one machine (ATT 3b1) computes Inf without a SIGFPE */ + temp = real(val_ptr); + if (temp > VERYLARGE || temp < -VERYLARGE) { + undefined = TRUE; } } diff -c ./pcgraph.asm ../patch/pcgraph.asm *** ./pcgraph.asm Tue Mar 27 09:03:47 1990 --- ../patch/pcgraph.asm Fri Aug 31 12:53:35 1990 *************** *** 23,28 GPg1_Base equ 0B800h ; Graphics page 1 base address _text segment public _PC_line, _PC_color, _PC_mask, _PC_curloc, _PC_puts, _Vmode --- 23,30 ----- GPg1_Base equ 0B800h ; Graphics page 1 base address + extrn _inter:far + _text segment public _PC_line, _PC_color, _PC_mask, _PC_curloc, _PC_puts, _Vmode *************** *** 27,33 public _PC_line, _PC_color, _PC_mask, _PC_curloc, _PC_puts, _Vmode public _erase, _save_stack, _ss_interrupt - extrn _inter:near pcpixel proc near ror word ptr linemask,1 --- 29,34 ----- public _PC_line, _PC_color, _PC_mask, _PC_curloc, _PC_puts, _Vmode public _erase, _save_stack, _ss_interrupt pcpixel proc near ror word ptr linemask,1 *************** *** 205,211 mov sp,-1 ; here too save_sp equ this word - 2 sti ! jmp _inter; now it's safe to call the real routine _ss_interrupt endp --- 206,212 ----- mov sp,-1 ; here too save_sp equ this word - 2 sti ! jmp far ptr _inter; now it's safe to call the real routine _ss_interrupt endp diff -c ./plot.c ../patch/plot.c *** ./plot.c Tue Mar 27 09:01:43 1990 --- ../patch/plot.c Thu Sep 6 09:20:12 1990 *************** *** 170,175 registerbgidriver(CGA_driver); registerbgidriver(EGAVGA_driver); registerbgidriver(Herc_driver); #endif setbuf(stderr,(char *)NULL); --- 170,183 ----- registerbgidriver(CGA_driver); registerbgidriver(EGAVGA_driver); registerbgidriver(Herc_driver); + registerbgidriver(ATT_driver); + #endif + #ifdef X11 + { int n = X11_args(argc, argv); argv += n; argc -= n; } + #endif + + #ifdef apollo + apollo_pfm_catch(); #endif setbuf(stderr,(char *)NULL); diff -c ./standard.c ../patch/standard.c *** ./standard.c Tue Mar 27 09:01:51 1990 --- ../patch/standard.c Thu Aug 30 14:33:01 1990 *************** *** 40,45 extern struct value stack[STACK_DEPTH]; extern int s_p; struct value *pop(), *complex(), *integer(); --- 40,46 ----- extern struct value stack[STACK_DEPTH]; extern int s_p; + extern double zero; struct value *pop(), *complex(), *integer(); *************** *** 45,50 double magnitude(), angle(), real(), imag(); f_real() { --- 46,56 ----- double magnitude(), angle(), real(), imag(); + /* The bessel function approximations here are from + * "Computer Approximations" + * by Hart, Cheney et al. + * John Wiley & Sons, 1968 + */ /* There appears to be a mistake in Hart, Cheney et al. on page 149. * Where it list Qn(x)/x ~ P(z*z)/Q(z*z), z = 8/x, it should read *************** *** 46,51 double magnitude(), angle(), real(), imag(); f_real() { struct value a; --- 52,268 ----- * John Wiley & Sons, 1968 */ + /* There appears to be a mistake in Hart, Cheney et al. on page 149. + * Where it list Qn(x)/x ~ P(z*z)/Q(z*z), z = 8/x, it should read + * Qn(x)/z ~ P(z*z)/Q(z*z), z = 8/x + * In the functions below, Qn(x) is implementated using the later + * equation. + * These bessel functions are accurate to about 1e-13 + */ + + #define PI_ON_FOUR 0.78539816339744830961566084581987572 + #define PI_ON_TWO 1.57079632679489661923131269163975144 + #define THREE_PI_ON_FOUR 2.35619449019234492884698253745962716 + #define TWO_ON_PI 0.63661977236758134307553505349005744 + + static double dzero = 0.0; + + /* jzero for x in [0,8] + * Index 5849, 19.22 digits precision + */ + static double pjzero[] = { + 0.4933787251794133561816813446e+21, + -0.11791576291076105360384408e+21, + 0.6382059341072356562289432465e+19, + -0.1367620353088171386865416609e+18, + 0.1434354939140346111664316553e+16, + -0.8085222034853793871199468171e+13, + 0.2507158285536881945555156435e+11, + -0.4050412371833132706360663322e+8, + 0.2685786856980014981415848441e+5 + }; + + static double qjzero[] = { + 0.4933787251794133562113278438e+21, + 0.5428918384092285160200195092e+19, + 0.3024635616709462698627330784e+17, + 0.1127756739679798507056031594e+15, + 0.3123043114941213172572469442e+12, + 0.669998767298223967181402866e+9, + 0.1114636098462985378182402543e+7, + 0.1363063652328970604442810507e+4, + 0.1e+1 + }; + + /* pzero for x in [8,inf] + * Index 6548, 18.16 digits precision + */ + static double ppzero[] = { + 0.2277909019730468430227002627e+5, + 0.4134538663958076579678016384e+5, + 0.2117052338086494432193395727e+5, + 0.348064864432492703474453111e+4, + 0.15376201909008354295771715e+3, + 0.889615484242104552360748e+0 + }; + + static double qpzero[] = { + 0.2277909019730468431768423768e+5, + 0.4137041249551041663989198384e+5, + 0.2121535056188011573042256764e+5, + 0.350287351382356082073561423e+4, + 0.15711159858080893649068482e+3, + 0.1e+1 + }; + + /* qzero for x in [8,inf] + * Index 6948, 18.33 digits precision + */ + static double pqzero[] = { + -0.8922660020080009409846916e+2, + -0.18591953644342993800252169e+3, + -0.11183429920482737611262123e+3, + -0.2230026166621419847169915e+2, + -0.124410267458356384591379e+1, + -0.8803330304868075181663e-2, + }; + + static double qqzero[] = { + 0.571050241285120619052476459e+4, + 0.1195113154343461364695265329e+5, + 0.726427801692110188369134506e+4, + 0.148872312322837565816134698e+4, + 0.9059376959499312585881878e+2, + 0.1e+1 + }; + + + /* yzero for x in [0,8] + * Index 6245, 18.78 digits precision + */ + static double pyzero[] = { + -0.2750286678629109583701933175e+20, + 0.6587473275719554925999402049e+20, + -0.5247065581112764941297350814e+19, + 0.1375624316399344078571335453e+18, + -0.1648605817185729473122082537e+16, + 0.1025520859686394284509167421e+14, + -0.3436371222979040378171030138e+11, + 0.5915213465686889654273830069e+8, + -0.4137035497933148554125235152e+5 + }; + + static double qyzero[] = { + 0.3726458838986165881989980739e+21, + 0.4192417043410839973904769661e+19, + 0.2392883043499781857439356652e+17, + 0.9162038034075185262489147968e+14, + 0.2613065755041081249568482092e+12, + 0.5795122640700729537380087915e+9, + 0.1001702641288906265666651753e+7, + 0.1282452772478993804176329391e+4, + 0.1e+1 + }; + + + /* jone for x in [0,8] + * Index 6050, 20.98 digits precision + */ + static double pjone[] = { + 0.581199354001606143928050809e+21, + -0.6672106568924916298020941484e+20, + 0.2316433580634002297931815435e+19, + -0.3588817569910106050743641413e+17, + 0.2908795263834775409737601689e+15, + -0.1322983480332126453125473247e+13, + 0.3413234182301700539091292655e+10, + -0.4695753530642995859767162166e+7, + 0.270112271089232341485679099e+4 + }; + + static double qjone[] = { + 0.11623987080032122878585294e+22, + 0.1185770712190320999837113348e+20, + 0.6092061398917521746105196863e+17, + 0.2081661221307607351240184229e+15, + 0.5243710262167649715406728642e+12, + 0.1013863514358673989967045588e+10, + 0.1501793594998585505921097578e+7, + 0.1606931573481487801970916749e+4, + 0.1e+1 + }; + + + /* pone for x in [8,inf] + * Index 6749, 18.11 digits precision + */ + static double ppone[] = { + 0.352246649133679798341724373e+5, + 0.62758845247161281269005675e+5, + 0.313539631109159574238669888e+5, + 0.49854832060594338434500455e+4, + 0.2111529182853962382105718e+3, + 0.12571716929145341558495e+1 + }; + + static double qpone[] = { + 0.352246649133679798068390431e+5, + 0.626943469593560511888833731e+5, + 0.312404063819041039923015703e+5, + 0.4930396490181088979386097e+4, + 0.2030775189134759322293574e+3, + 0.1e+1 + }; + + /* qone for x in [8,inf] + * Index 7149, 18.28 digits precision + */ + static double pqone[] = { + 0.3511751914303552822533318e+3, + 0.7210391804904475039280863e+3, + 0.4259873011654442389886993e+3, + 0.831898957673850827325226e+2, + 0.45681716295512267064405e+1, + 0.3532840052740123642735e-1 + }; + + static double qqone[] = { + 0.74917374171809127714519505e+4, + 0.154141773392650970499848051e+5, + 0.91522317015169922705904727e+4, + 0.18111867005523513506724158e+4, + 0.1038187585462133728776636e+3, + 0.1e+1 + }; + + + /* yone for x in [0,8] + * Index 6444, 18.24 digits precision + */ + static double pyone[] = { + -0.2923821961532962543101048748e+20, + 0.7748520682186839645088094202e+19, + -0.3441048063084114446185461344e+18, + 0.5915160760490070618496315281e+16, + -0.4863316942567175074828129117e+14, + 0.2049696673745662182619800495e+12, + -0.4289471968855248801821819588e+9, + 0.3556924009830526056691325215e+6 + }; + + static double qyone[] = { + 0.1491311511302920350174081355e+21, + 0.1818662841706134986885065935e+19, + 0.113163938269888452690508283e+17, + 0.4755173588888137713092774006e+14, + 0.1500221699156708987166369115e+12, + 0.3716660798621930285596927703e+9, + 0.726914730719888456980191315e+6, + 0.10726961437789255233221267e+4, + 0.1e+1 + }; + + f_real() { struct value a; *************** *** 264,326 } - f_besj0() /* j0(a) = sin(a)/a */ - { - struct value a; - a = top_of_stack; - f_sin(); - push(&a); - f_div(); - } - - - f_besj1() /* j1(a) = sin(a)/(a**2) - cos(a)/a */ - { - struct value a; - a = top_of_stack; - f_sin(); - push(&a); - push(&a); - f_mult(); - f_div(); - push(&a); - f_cos(); - push(&a); - f_div(); - f_minus(); - } - - - f_besy0() /* y0(a) = -cos(a)/a */ - { - struct value a; - a = top_of_stack; - f_cos(); - push(&a); - f_div(); - f_uminus(); - } - - - f_besy1() /* y1(a) = -cos(a)/(a**2) - sin(a)/a */ - { - struct value a; - - a = top_of_stack; - f_cos(); - push(&a); - push(&a); - f_mult(); - f_div(); - push(&a); - f_sin(); - push(&a); - f_div(); - f_plus(); - f_uminus(); - } - - f_floor() { struct value a; --- 481,486 ----- } f_floor() { struct value a; *************** *** 369,371 } #endif /* GAMMA */ --- 529,780 ----- } #endif /* GAMMA */ + + + /* bessel function approximations */ + double jzero(x) + double x; + { + double p, q, x2; + int n; + + x2 = x * x; + p = pjzero[8]; + q = qjzero[8]; + for (n=7; n>=0; n--) { + p = p*x2 + pjzero[n]; + q = q*x2 + qjzero[n]; + } + return(p/q); + } + + double pzero(x) + double x; + { + double p, q, z, z2; + int n; + + z = 8.0 / x; + z2 = z * z; + p = ppzero[5]; + q = qpzero[5]; + for (n=4; n>=0; n--) { + p = p*z2 + ppzero[n]; + q = q*z2 + qpzero[n]; + } + return(p/q); + } + + double qzero(x) + double x; + { + double p, q, z, z2; + int n; + + z = 8.0 / x; + z2 = z * z; + p = pqzero[5]; + q = qqzero[5]; + for (n=4; n>=0; n--) { + p = p*z2 + pqzero[n]; + q = q*z2 + qqzero[n]; + } + return(p/q); + } + + double yzero(x) + double x; + { + double p, q, x2; + int n; + + x2 = x * x; + p = pyzero[8]; + q = qyzero[8]; + for (n=7; n>=0; n--) { + p = p*x2 + pyzero[n]; + q = q*x2 + qyzero[n]; + } + return(p/q); + } + + double rj0(x) + double x; + { + if ( x <= 0.0 ) + x = -x; + if ( x < 8.0 ) + return(jzero(x)); + else + return( sqrt(TWO_ON_PI/x) * + (pzero(x)*cos(x-PI_ON_FOUR) - 8.0/x*qzero(x)*sin(x-PI_ON_FOUR)) ); + + } + + double ry0(x) + double x; + { + if ( x < 0.0 ) + return(dzero/dzero); /* error */ + if ( x < 8.0 ) + return( yzero(x) + TWO_ON_PI*rj0(x)*log(x) ); + else + return( sqrt(TWO_ON_PI/x) * + (pzero(x)*sin(x-PI_ON_FOUR) + + (8.0/x)*qzero(x)*cos(x-PI_ON_FOUR)) ); + + } + + + double jone(x) + double x; + { + double p, q, x2; + int n; + + x2 = x * x; + p = pjone[8]; + q = qjone[8]; + for (n=7; n>=0; n--) { + p = p*x2 + pjone[n]; + q = q*x2 + qjone[n]; + } + return(p/q); + } + + double pone(x) + double x; + { + double p, q, z, z2; + int n; + + z = 8.0 / x; + z2 = z * z; + p = ppone[5]; + q = qpone[5]; + for (n=4; n>=0; n--) { + p = p*z2 + ppone[n]; + q = q*z2 + qpone[n]; + } + return(p/q); + } + + double qone(x) + double x; + { + double p, q, z, z2; + int n; + + z = 8.0 / x; + z2 = z * z; + p = pqone[5]; + q = qqone[5]; + for (n=4; n>=0; n--) { + p = p*z2 + pqone[n]; + q = q*z2 + qqone[n]; + } + return(p/q); + } + + double yone(x) + double x; + { + double p, q, x2; + int n; + + x2 = x * x; + p = 0.0; + q = qyone[8]; + for (n=7; n>=0; n--) { + p = p*x2 + pyone[n]; + q = q*x2 + qyone[n]; + } + return(p/q); + } + + double rj1(x) + double x; + { + double v,w; + v = x; + if ( x < 0.0 ) + x = -x; + if ( x < 8.0 ) + return(v*jone(x)); + else { + w = sqrt(TWO_ON_PI/x) * + (pone(x)*cos(x-THREE_PI_ON_FOUR) - + 8.0/x*qone(x)*sin(x-THREE_PI_ON_FOUR)) ; + if (v < 0.0) + w = -w; + return( w ); + } + } + + double ry1(x) + double x; + { + if ( x <= 0.0 ) + return(dzero/dzero); /* error */ + if ( x < 8.0 ) + return( x*yone(x) + TWO_ON_PI*(rj1(x)*log(x) - 1.0/x) ); + else + return( sqrt(TWO_ON_PI/x) * + (pone(x)*sin(x-THREE_PI_ON_FOUR) + + (8.0/x)*qone(x)*cos(x-THREE_PI_ON_FOUR)) ); + } + + + f_besj0() + { + struct value a; + double x; + (void) pop(&a); + if (imag(&a) > zero) + int_error("can only do bessel functions of reals",NO_CARET); + push( complex(&a,rj0(real(&a)),0.0) ); + } + + + f_besj1() + { + struct value a; + double x; + (void) pop(&a); + if (imag(&a) > zero) + int_error("can only do bessel functions of reals",NO_CARET); + push( complex(&a,rj1(real(&a)),0.0) ); + } + + + f_besy0() + { + struct value a; + double x; + (void) pop(&a); + if (imag(&a) > zero) + int_error("can only do bessel functions of reals",NO_CARET); + if (real(&a) > 0.0) + push( complex(&a,ry0(real(&a)),0.0) ); + else { + push( complex(&a,0.0,0.0) ); + undefined = TRUE ; + } + } + + + f_besy1() + { + struct value a; + double x; + (void) pop(&a); + if (imag(&a) > zero) + int_error("can only do bessel functions of reals",NO_CARET); + if (real(&a) > 0.0) + push( complex(&a,ry1(real(&a)),0.0) ); + else { + push( complex(&a,0.0,0.0) ); + undefined = TRUE ; + } + } + Common subdirectories: ./term and ../patch/term Common subdirectories: ./translate and ../patch/translate