home *** CD-ROM | disk | FTP | other *** search
Text File | 1992-06-18 | 35.2 KB | 1,106 lines |
- Newsgroups: comp.sources.misc
- From: woo@ra-next.arc.nasa.gov (Alex Woo)
- Subject: v30i058: gnuplot3 - interactive function plotting utility, Patch02e/7
- Message-ID: <1992Jun14.214107.8565@sparky.imd.sterling.com>
- X-Md4-Signature: cde995d25740dd3829133b2c9d7cc146
- Date: Sun, 14 Jun 1992 21:41:07 GMT
- Approved: kent@sparky.imd.sterling.com
-
- Submitted-by: woo@ra-next.arc.nasa.gov (Alex Woo)
- Posting-number: Volume 30, Issue 58
- Archive-name: gnuplot3/patch02e
- Environment: UNIX, MS-DOS, VMS
- Patch-To: gnuplot3: Volume 24, Issue 23-48
-
- #! /bin/sh
- # This is a shell archive. Remove anything before this line, then feed it
- # into a shell via "sh file" or similar. To overwrite existing files,
- # type "sh file -c".
- # The tool that generated this appeared in the comp.sources.unix newsgroup;
- # send mail to comp-sources-unix@uunet.uu.net if you want that tool.
- # Contents: patch.1
- # Wrapped by woo@ra-iris. on Thu May 28 22:44:40 1992
- PATH=/bin:/usr/bin:/usr/ucb ; export PATH
- echo If this archive is complete, you will see the following message:
- echo ' "shar: End of archive 5 (of 7)."'
- if test -f 'patch.1' -a "${1}" != "-c" ; then
- echo shar: Will not clobber existing file \"'patch.1'\"
- else
- echo shar: Extracting \"'patch.1'\" \(33186 characters\)
- sed "s/^X//" >'patch.1' <<'END_OF_FILE'
- Xdiff -rc gnuplot/Copyright gnuplot3.2/Copyright
- X*** gnuplot/Copyright Sun Jan 5 21:33:12 1992
- X--- gnuplot3.2/Copyright Wed Mar 25 07:59:24 1992
- X***************
- X*** 1,5 ****
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X--- 1,5 ----
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991, 1992 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X***************
- X*** 26,35 ****
- X * Gershon Elber and many others.
- X *
- X * Send your comments or suggestions to
- X! * pixar!info-gnuplot@sun.com.
- X * This is a mailing list; to join it send a note to
- X! * pixar!info-gnuplot-request@sun.com.
- X * Send bug reports to
- X! * pixar!bug-gnuplot@sun.com.
- X */
- X
- X--- 26,35 ----
- X * Gershon Elber and many others.
- X *
- X * Send your comments or suggestions to
- X! * info-gnuplot@ames.arc.nasa.gov.
- X * This is a mailing list; to join it send a note to
- X! * info-gnuplot-request@ames.arc.nasa.gov.
- X * Send bug reports to
- X! * bug-gnuplot@ames.arc.nasa.gov.
- X */
- X
- XOnly in gnuplot3.2: EPSView.h
- XOnly in gnuplot3.2: EPSView.m
- XOnly in gnuplot3.2: EpsViewer.h
- XOnly in gnuplot3.2: EpsViewer.m
- Xdiff -rc gnuplot/History gnuplot3.2/History
- X*** gnuplot/History Thu Sep 19 10:47:22 1991
- X--- gnuplot3.2/History Sat May 16 09:53:14 1992
- X***************
- X*** 1,4 ****
- X--- 1,43 ----
- X
- X+ GNUPLOT 3.2 RELEASE NOTES
- X+
- X+ This describes changes to gnuplot since version 3.0.
- X+
- X+ Highlights:
- X+ -----------
- X+ Version 3.1 (also known as version 3.0, patchlevel 1) was a bugfix
- X+ release. In particular, it corrected the y logscale error.
- X+ Version 3.2 also fixes a number of bugs but contains two major
- X+ changes. The X11 support, in particular, gnuplot_x11.c was completely
- X+ rewritten to rely solely on X11 intrinsics and no widget libraries.
- X+ This should hopefully make it more portable. The other major change
- X+ is hidden line removal for explicit 3D surfaces.
- X+
- X+ This release was deliberately limited in scope in order to
- X+ release a new X11 driver and have some hidden line removal capability
- X+ quickly. Version 3.3 will be a much larger modification.
- X+
- X+
- X+ ACKNOWLEDGEMENTS
- X+
- X+ - New generic gnuplot_x11.c, Ed Kubatis <ejk@ux2.ncsa.uiuc.edu>
- X+ - Hidden Line Removal for Explicit Surfaces and IRIX 4.0 fixes,
- X+ Gershon Elber <gershon@gr.utah.edu>
- X+ - Table Terminal Driver, Kevin Russo <russo@rudedog.nrl.navy.mil>
- X+ - PCL5 driver fixes (HPGL page eject),datafile pipe and README,
- X+ Alex Woo <woo@ames.arc.nasa.gov>
- X+ - Pbmplus driver & fix to ylog tics, Put FAR pointers in bitmap.c and bitmap.h
- X+ Russell Lang <rjl@monu1.cc.monash.edu.au>
- X+ - NeXT Console Driver, Nick Strobel <strobel@phast.phys.washington.edu>
- X+ - Fix GNUTERM environment with disk resident BGI drivers,
- X+ Craig Johnston <johnston@maxwell.ee.washington.edu>
- X+ - Fix tables for troff in doc2ms, Michael Schuh <schuh@ames.arc.nasa.gov>
- X+ - Fix dump when GNUPLOT$HELP undefined,
- X+ Wolfgang J. Moeller <moeller@gwdgv1.dnet.gwdg.de>
- X+ - Fix AMIGA segment limits, Carsten Steger <stegerc@informatik.tu-muenchen.de>
- X+ - Bug fix to latex.trm, Rob Cunningham <rkc@xn.ll.mit.edu>
- X+
- X+ =========================================================================
- X GNUPLOT 3.0 RELEASE NOTES
- X
- X This describes changes to gnuplot since version 2.02 (ie, 2.0
- X***************
- X*** 255,261 ****
- X (David.Kotz@Dartmouth.edu)
- X And of course, the vast majority of the program is by Colin Kelley
- X and Thomas Williams.
- X! (pixar!info-gnuplot@sun.com)
- X
- X =======================================================================
- X
- X--- 294,300 ----
- X (David.Kotz@Dartmouth.edu)
- X And of course, the vast majority of the program is by Colin Kelley
- X and Thomas Williams.
- X! (info-gnuplot@ames.arc.nasa.gov)
- X
- X =======================================================================
- X
- Xdiff -rc gnuplot/README gnuplot3.2/README
- X*** gnuplot/README Thu Sep 19 10:43:25 1991
- X--- gnuplot3.2/README Sat May 16 05:11:18 1992
- X***************
- X*** 1,4 ****
- X--- 1,35 ----
- X
- X+ GNUPLOT is a command-driven interactive function plotting program. It
- X+ is case sensitive (commands and function names written in lowercase
- X+ are not the same as those written in CAPS). All command names may be
- X+ abbreviated, as long as the abbreviation is not ambiguous. Any number
- X+ of commands may appear on a line, separated by semicolons (;).
- X+ Strings are indicated with quotes. They may be either single or double
- X+ quotation marks, e.g.,
- X+
- X+ load "filename"
- X+ cd 'dir'
- X+
- X+ Any command-line arguments are assumed to be names of files containing
- X+ GNUPLOT commands, with the exception of standard X11 arguments, which
- X+ are processed first. Each file is loaded with the `load` command, in the
- X+ order specified. GNUPLOT exits after the last file is processed. When
- X+ no load files are named, gnuplot enters into an interactive mode.
- X+
- X+ Commands may extend over several input lines, by ending each
- X+ line but the last with a backslash (\). The backslash must be the LAST
- X+ character on each line. The effect is as if the backslash and newline
- X+ were not there. That is, no white space is implied, nor is a comment
- X+ terminated. Therefore, commenting out a continued line comments out
- X+ the entire command (see `comment`).
- X+
- X+ For help on any topic, type `help` followed by the name of the topic.
- X+
- X+ The new GNUPLOT user should begin by reading about the `plot`
- X+ command (type `help plot`). The manual for gnuplot can be printed
- X+ either with TeX, troff or nroff. Look at the docs/Makefile for
- X+ the appropriate option.
- X+
- X Where to get updates to GNUPLOT
- X
- X Congratulations on getting this version of GNUPLOT! Unfortunately, it
- X***************
- X*** 16,32 ****
- X prep.ai.mit.edu is NOT an official site, and may not be up to date.
- X Also, comp.sources.misc is usually a month or so behind us.
- X
- X! Date: Wed Sep 18 20:45:52 EDT 1991
- X! Version: 3.0
- X
- X! In general, GNUPLOT 3.0 is available as the file gnuplot3.0.tar.Z.
- X There are no patches that bring GNUPLOT 2.02 up to 3.0, so you must
- X! obtain the whole new release. Please obtain gnuplot from the site
- X nearest you.
- X
- X USENET users:
- X
- X! GNUPLOT 3.0 was posted to comp.sources.misc.
- X
- X
- X NORTH AMERICA:
- X--- 47,67 ----
- X prep.ai.mit.edu is NOT an official site, and may not be up to date.
- X Also, comp.sources.misc is usually a month or so behind us.
- X
- X! Date: Sun Mar 1 20:45:52 EDT 1992
- X! Version: 3.2
- X
- X! In general, GNUPLOT 3.2 is available as the file gnuplot3.2.tar.Z.
- X! There are patches which bring GNUPLOT 3.0 up to 3.1 and patches
- X! which bring GNUPLOT 3.1 up to GNUPLOT 3.2. The latter are in
- X! the file gnuplot3.2.shar.Z.
- X There are no patches that bring GNUPLOT 2.02 up to 3.0, so you must
- X! obtain the whole new release.
- X! Please obtain gnuplot from the site
- X nearest you.
- X
- X USENET users:
- X
- X! GNUPLOT 3.2 was posted to comp.sources.misc.
- X
- X
- X NORTH AMERICA:
- X***************
- X*** 33,39 ****
- X
- X Anonymous ftp to dartmouth.edu (129.170.16.4)
- X Fetch
- X! pub/gnuplot/gnuplot3.0.tar.Z
- X in binary mode.
- X
- X Users without ftp capability can obtain it through a mail ftp
- X--- 68,74 ----
- X
- X Anonymous ftp to dartmouth.edu (129.170.16.4)
- X Fetch
- X! pub/gnuplot/gnuplot3.2.tar.Z
- X in binary mode.
- X
- X Users without ftp capability can obtain it through a mail ftp
- X***************
- X*** 45,51 ****
- X USER ANONYMOUS
- X CD pub/gnuplot
- X BINARY
- X! GET gnuplot3.0.tar.Z
- X QUIT
- X
- X
- X--- 80,86 ----
- X USER ANONYMOUS
- X CD pub/gnuplot
- X BINARY
- X! GET gnuplot3.2.tar.Z
- X QUIT
- X
- X
- X***************
- X*** 52,64 ****
- X AUSTRALIA:
- X
- X Anonymous ftp to monu1.cc.monash.edu.au (130.194.1.101).
- X! Fetch pub/gnuplot3.0.tar.Z in binary mode.
- X
- X
- X EUROPE:
- X
- X Anonymous ftp to irisa.irisa.fr (131.254.2.3).
- X! Fetch pub/gnuplot3.0.tar.Z in binary mode.
- X
- X ----
- X
- X--- 87,99 ----
- X AUSTRALIA:
- X
- X Anonymous ftp to monu1.cc.monash.edu.au (130.194.1.101).
- X! Fetch pub/gnuplot3.2.tar.Z in binary mode.
- X
- X
- X EUROPE:
- X
- X Anonymous ftp to irisa.irisa.fr (131.254.2.3).
- X! Fetch pub/gnuplot3.2.tar.Z in binary mode.
- X
- X ----
- X
- X***************
- X*** 68,77 ****
- X ----
- X CONTACTS:
- X Please send any questions or comments to
- X! pixar!info-gnuplot@ucbvax.berkeley.edu.
- X To join the above mailing list (or get yourself off), mail to
- X! pixar!info-gnuplot-request@ucbvax.berkeley.edu.
- X Send bug reports and problems to
- X! pixar!bug-gnuplot@ucbvax.berkeley.edu.
- X
- X -Thomas Williams-
- X--- 103,113 ----
- X ----
- X CONTACTS:
- X Please send any questions or comments to
- X! info-gnuplot@ames.arc.nasa.gov.
- X To join the above mailing list (or get yourself off), mail to
- X! info-gnuplot-request@ames.arc.nasa.gov.
- X Send bug reports and problems to
- X! bug-gnuplot@ames.arc.nasa.gov.
- X
- X -Thomas Williams-
- X+
- XOnly in gnuplot3.2: README.3d
- XOnly in gnuplot3.2: README.3p2
- Xdiff -rc gnuplot/README.Install gnuplot3.2/README.Install
- X*** gnuplot/README.Install Sun Jan 5 21:33:13 1992
- X--- gnuplot3.2/README.Install Sat May 16 09:25:12 1992
- X***************
- X*** 16,26 ****
- X GNUPLOT has not been tested on Pyramid 90x and IBM PC Microsoft C.
- X
- X Send your comments, suggestions, or modifications to
- X! pixar!info-gnuplot@sun.com
- X This is a mailing list; to join it send a note to
- X! pixar!info-gnuplot-request@sun.com
- X Send bug reports to
- X! pixar!bug-gnuplot@sun.com
- X
- X PREPROCESSOR #DEFINES
- X
- X--- 16,26 ----
- X GNUPLOT has not been tested on Pyramid 90x and IBM PC Microsoft C.
- X
- X Send your comments, suggestions, or modifications to
- X! info-gnuplot@ames.arc.nasa.gov
- X This is a mailing list; to join it send a note to
- X! info-gnuplot-request@ames.arc.nasa.gov
- X Send bug reports to
- X! bug-gnuplot@ames.arc.nasa.gov
- X
- X PREPROCESSOR #DEFINES
- X
- X***************
- X*** 54,59 ****
- X--- 54,60 ----
- X or term.h
- X
- X AED AED 512 and AED 767
- X+ AIFM Adobe Illustrator Format
- X AMIGASCREEN Amiga custom screen
- X APOLLO Apollo Graphics Primitive Resource (resizable window)
- X ATT6300 PC with AT&T 6300 graphics
- X***************
- X*** 76,86 ****
- X--- 77,90 ----
- X HP75 HP7580, and probably other HPs
- X HPGL HP7475 and (hopefully) lots of others
- X HPLJII HP Laserjet II
- X+ HPLJIII HP Laserjet III (HPGL/2)
- X IMAGEN Imagen laser printers (300dpi) (requires -Iterm also)
- X IRIS4D IRIS4D series computer
- X KERMIT MS-Kermit Tektronix 4010 emulator
- X LATEX LATEX picture environment
- X+ LN03P DEC LN03P laser printer
- X NEC NEC CP6 pinwriter printer
- X+ PBM PBMPLUS pbm, pgm, ppm formats
- X POSTSCRIPT Postscript
- X PRESCRIBE Kyocera Laser printer
- X QMS QMS/QUIC laserprinter (Talaris 1200 and others)
- XOnly in gnuplot3.2: README.NeXT
- XOnly in gnuplot: README.patch1
- XOnly in gnuplot3.2: README.x11
- Xdiff -rc gnuplot/bitmap.c gnuplot3.2/bitmap.c
- X*** gnuplot/bitmap.c Thu Jul 18 11:54:16 1991
- X--- gnuplot3.2/bitmap.c Wed Mar 25 07:59:31 1992
- X***************
- X*** 1,6 ****
- X /* GNUPLOT - bitmap.c */
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X--- 1,11 ----
- X+ #ifndef lint
- X+ static char *RCSid = "$Id: bitmap.c,v 3.26 92/03/24 22:34:39 woo Exp Locker: woo $";
- X+ #endif
- X+
- X+
- X /* GNUPLOT - bitmap.c */
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991, 1992 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X***************
- X*** 23,33 ****
- X * Russell Lang <rjl@monu1.cc.monash.edu.au>
- X *
- X * Send your comments or suggestions to
- X! * pixar!info-gnuplot@sun.com.
- X * This is a mailing list; to join it send a note to
- X! * pixar!info-gnuplot-request@sun.com.
- X * Send bug reports to
- X! * pixar!bug-gnuplot@sun.com.
- X */
- X
- X /*
- X--- 28,38 ----
- X * Russell Lang <rjl@monu1.cc.monash.edu.au>
- X *
- X * Send your comments or suggestions to
- X! * info-gnuplot@ames.arc.nasa.gov.
- X * This is a mailing list; to join it send a note to
- X! * info-gnuplot-request@ames.arc.nasa.gov.
- X * Send bug reports to
- X! * bug-gnuplot@ames.arc.nasa.gov.
- X */
- X
- X /*
- X***************
- X*** 72,78 ****
- X #define IN(i,size) ((unsigned)i < (unsigned)size)
- X
- X /* 5x9 font, bottom row first, left pixel in lsb */
- X! char_row fnt5x9[FNT_CHARS][FNT5X9_VBITS] = {
- X /* */ {000000,000000,000000,000000,000000,000000,000000,000000,000000},
- X /*!*/ {000000,000000,0x0004,000000,0x0004,0x0004,0x0004,0x0004,0x0004},
- X /*"*/ {000000,000000,000000,000000,000000,000000,0x000a,0x000a,0x000a},
- X--- 77,83 ----
- X #define IN(i,size) ((unsigned)i < (unsigned)size)
- X
- X /* 5x9 font, bottom row first, left pixel in lsb */
- X! char_row FAR fnt5x9[FNT_CHARS][FNT5X9_VBITS] = {
- X /* */ {000000,000000,000000,000000,000000,000000,000000,000000,000000},
- X /*!*/ {000000,000000,0x0004,000000,0x0004,0x0004,0x0004,0x0004,0x0004},
- X /*"*/ {000000,000000,000000,000000,000000,000000,0x000a,0x000a,0x000a},
- X***************
- X*** 172,178 ****
- X };
- X
- X /* 9x17 font, bottom row first, left pixel in lsb */
- X! char_row fnt9x17[FNT_CHARS][FNT9X17_VBITS] = {
- X /* */ {000000,000000,000000,000000,000000,000000,000000,000000,000000,
- X 000000,000000,000000,000000,000000,000000,000000,000000},
- X /*!*/ {000000,000000,000000,000000,0x0010,000000,000000,000000,0x0010,
- X--- 177,183 ----
- X };
- X
- X /* 9x17 font, bottom row first, left pixel in lsb */
- X! char_row FAR fnt9x17[FNT_CHARS][FNT9X17_VBITS] = {
- X /* */ {000000,000000,000000,000000,000000,000000,000000,000000,000000,
- X 000000,000000,000000,000000,000000,000000,000000,000000},
- X /*!*/ {000000,000000,000000,000000,0x0010,000000,000000,000000,0x0010,
- X***************
- X*** 368,374 ****
- X };
- X
- X /* 13x25 font, bottom row first, left pixel in lsb */
- X! char_row fnt13x25[FNT_CHARS][FNT13X25_VBITS] = {
- X /* */ {000000,000000,000000,000000,000000,000000,000000,000000,000000,
- X 000000,000000,000000,000000,000000,000000,000000,000000,000000,
- X 000000,000000,000000,000000,000000,000000,000000},
- X--- 373,379 ----
- X };
- X
- X /* 13x25 font, bottom row first, left pixel in lsb */
- X! char_row FAR fnt13x25[FNT_CHARS][FNT13X25_VBITS] = {
- X /* */ {000000,000000,000000,000000,000000,000000,000000,000000,000000,
- X 000000,000000,000000,000000,000000,000000,000000,000000,000000,
- X 000000,000000,000000,000000,000000,000000,000000},
- Xdiff -rc gnuplot/bitmap.h gnuplot3.2/bitmap.h
- X*** gnuplot/bitmap.h Mon Jun 3 15:25:57 1991
- X--- gnuplot3.2/bitmap.h Wed Mar 25 07:59:32 1992
- X***************
- X*** 1,8 ****
- X /* bitmap.h */
- X
- X /* allow up to 16 bit width for character array */
- X typedef unsigned int char_row;
- X! typedef char_row * char_box;
- X
- X #define FNT_CHARS 96 /* Number of characters in the font set */
- X
- X--- 1,18 ----
- X+ /*
- X+ * $Id: bitmap.h,v 3.26 92/03/24 22:34:16 woo Exp Locker: woo $
- X+ */
- X+
- X /* bitmap.h */
- X
- X+ #ifdef __TURBOC__
- X+ #define FAR far
- X+ #else
- X+ #define FAR
- X+ #endif
- X+
- X /* allow up to 16 bit width for character array */
- X typedef unsigned int char_row;
- X! typedef char_row * FAR char_box;
- X
- X #define FNT_CHARS 96 /* Number of characters in the font set */
- X
- X***************
- X*** 11,17 ****
- X #define FNT5X9_VBITS 9 /* actual number of rows of bits per char */
- X #define FNT5X9_HCHAR 7 /* horizontal spacing between characters */
- X #define FNT5X9_HBITS 5 /* actual number of bits per row per char */
- X! extern char_row fnt5x9[FNT_CHARS][FNT5X9_VBITS];
- X
- X #define FNT9X17 1
- X #define FNT9X17_VCHAR 21 /* vertical spacing between characters */
- X--- 21,27 ----
- X #define FNT5X9_VBITS 9 /* actual number of rows of bits per char */
- X #define FNT5X9_HCHAR 7 /* horizontal spacing between characters */
- X #define FNT5X9_HBITS 5 /* actual number of bits per row per char */
- X! extern char_row FAR fnt5x9[FNT_CHARS][FNT5X9_VBITS];
- X
- X #define FNT9X17 1
- X #define FNT9X17_VCHAR 21 /* vertical spacing between characters */
- X***************
- X*** 18,24 ****
- X #define FNT9X17_VBITS 17 /* actual number of rows of bits per char */
- X #define FNT9X17_HCHAR 13 /* horizontal spacing between characters */
- X #define FNT9X17_HBITS 9 /* actual number of bits per row per char */
- X! extern char_row fnt9x17[FNT_CHARS][FNT9X17_VBITS];
- X
- X #define FNT13X25 2
- X #define FNT13X25_VCHAR 31 /* vertical spacing between characters */
- X--- 28,34 ----
- X #define FNT9X17_VBITS 17 /* actual number of rows of bits per char */
- X #define FNT9X17_HCHAR 13 /* horizontal spacing between characters */
- X #define FNT9X17_HBITS 9 /* actual number of bits per row per char */
- X! extern char_row FAR fnt9x17[FNT_CHARS][FNT9X17_VBITS];
- X
- X #define FNT13X25 2
- X #define FNT13X25_VCHAR 31 /* vertical spacing between characters */
- X***************
- X*** 25,31 ****
- X #define FNT13X25_VBITS 25 /* actual number of rows of bits per char */
- X #define FNT13X25_HCHAR 19 /* horizontal spacing between characters */
- X #define FNT13X25_HBITS 13 /* actual number of bits per row per char */
- X! extern char_row fnt13x25[FNT_CHARS][FNT13X25_VBITS];
- X
- X
- X typedef unsigned char pixels; /* the type of one set of 8 pixels in bitmap */
- X--- 35,41 ----
- X #define FNT13X25_VBITS 25 /* actual number of rows of bits per char */
- X #define FNT13X25_HCHAR 19 /* horizontal spacing between characters */
- X #define FNT13X25_HBITS 13 /* actual number of bits per row per char */
- X! extern char_row FAR fnt13x25[FNT_CHARS][FNT13X25_VBITS];
- X
- X
- X typedef unsigned char pixels; /* the type of one set of 8 pixels in bitmap */
- Xdiff -rc gnuplot/command.c gnuplot3.2/command.c
- X*** gnuplot/command.c Sun Jan 5 21:33:14 1992
- X--- gnuplot3.2/command.c Wed Mar 25 07:59:34 1992
- X***************
- X*** 1,6 ****
- X /* GNUPLOT - command.c */
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X--- 1,10 ----
- X+ #ifndef lint
- X+ static char *RCSid = "$Id: command.c,v 3.26 92/03/24 22:34:17 woo Exp Locker: woo $";
- X+ #endif
- X+
- X /* GNUPLOT - command.c */
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991, 1992 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X***************
- X*** 27,37 ****
- X * Gershon Elber and many others.
- X *
- X * Send your comments or suggestions to
- X! * pixar!info-gnuplot@sun.com.
- X * This is a mailing list; to join it send a note to
- X! * pixar!info-gnuplot-request@sun.com.
- X * Send bug reports to
- X! * pixar!bug-gnuplot@sun.com.
- X */
- X
- X #include <stdio.h>
- X--- 31,41 ----
- X * Gershon Elber and many others.
- X *
- X * Send your comments or suggestions to
- X! * info-gnuplot@ames.arc.nasa.gov.
- X * This is a mailing list; to join it send a note to
- X! * info-gnuplot-request@ames.arc.nasa.gov.
- X * Send bug reports to
- X! * bug-gnuplot@ames.arc.nasa.gov.
- X */
- X
- X #include <stdio.h>
- X***************
- X*** 81,88 ****
- X #define HELPFILE "S:gnuplot.gih"
- X #else
- X #define HELPFILE "docs/gnuplot.gih" /* changed by makefile */
- X! #endif
- X! #endif
- X
- X #define inrange(z,min,max) ((min<max) ? ((z>=min)&&(z<=max)) : ((z>=max)&&(z<=min)) )
- X
- X--- 85,92 ----
- X #define HELPFILE "S:gnuplot.gih"
- X #else
- X #define HELPFILE "docs/gnuplot.gih" /* changed by makefile */
- X! #endif /* AMIGA_LC_5_1 */
- X! #endif /* HELPFILE */
- X
- X #define inrange(z,min,max) ((min<max) ? ((z>=min)&&(z<=max)) : ((z>=max)&&(z<=min)) )
- X
- X***************
- X*** 113,118 ****
- X--- 117,127 ----
- X int vms_vkid; /* Virtual keyboard id */
- X #endif
- X
- X+ #ifdef unix
- X+ extern FILE *popen();
- X+ static BOOLEAN pipe_open=FALSE;
- X+ #endif
- X+
- X extern int chdir();
- X
- X extern double magnitude(),angle(),real(),imag();
- X***************
- X*** 622,627 ****
- X--- 631,646 ----
- X
- X quote_str(data_file, c_token);
- X this_plot->plot_type = DATA;
- X+ if( parametric)
- X+ int_error("Parametric data files not yet implemented",NO_CARET);
- X+ #ifdef unix
- X+ if ( *data_file == '<' ) {
- X+ if ((fp = popen(data_file+1,"r")) == (FILE *)NULL)
- X+ os_error("cannot create pipe; output not changed",c_token);
- X+ else
- X+ pipe_open = TRUE;
- X+ } else
- X+ #endif
- X if ((fp = fopen(data_file, "r")) == (FILE *)NULL)
- X os_error("can't open data file", c_token);
- X
- X***************
- X*** 784,789 ****
- X--- 803,815 ----
- X }
- X this_plot->p_count = i;
- X cp_extend(this_plot, i); /* shrink to fit */
- X+
- X+ #ifdef unix
- X+ if ( pipe_open ) {
- X+ (void) pclose(fp);
- X+ pipe_open = FALSE;
- X+ } else
- X+ #endif
- X (void) fclose(fp);
- X }
- X
- X***************
- X*** 913,918 ****
- X--- 939,952 ----
- X quote_str(data_file, c_token);
- X this_plot->plot_type = DATA3D;
- X this_plot->has_grid_topology = TRUE;
- X+ #ifdef unix
- X+ if ( *data_file == '<' ) {
- X+ if ((fp = popen(data_file+1,"r")) == (FILE *)NULL)
- X+ os_error("cannot create pipe; output not changed",c_token);
- X+ else
- X+ pipe_open = TRUE;
- X+ } else
- X+ #endif
- X if ((fp = fopen(data_file, "r")) == (FILE *)NULL)
- X os_error("can't open data file", c_token);
- X
- X***************
- X*** 1233,1240 ****
- X iso_free(this_iso);/* Free last allocation. */
- X }
- X
- X (void) fclose(fp);
- X!
- X if (this_plot->has_grid_topology) {
- X struct iso_curve *new_icrvs = NULL;
- X int num_new_iso = this_plot->iso_crvs->p_count,
- X--- 1267,1281 ----
- X iso_free(this_iso);/* Free last allocation. */
- X }
- X
- X+ #ifdef unix
- X+ if ( pipe_open ) {
- X+ (void) pclose(fp);
- X+ pipe_open = FALSE;
- X+ } else
- X+ #endif
- X (void) fclose(fp);
- X! if (this_plot->num_iso_read <= 1)
- X! this_plot->has_grid_topology = FALSE;
- X if (this_plot->has_grid_topology) {
- X struct iso_curve *new_icrvs = NULL;
- X int num_new_iso = this_plot->iso_crvs->p_count,
- X***************
- X*** 1331,1337 ****
- X--- 1372,1425 ----
- X }
- X }
- X
- X+ print_table()
- X+ {
- X+ register struct curve_points *this_plot;
- X+ int i, curve;
- X
- X+ for (this_plot = first_plot, curve = 0; this_plot != NULL;
- X+ curve++, this_plot = this_plot->next_cp)
- X+ {
- X+ fprintf(outfile,"Curve %d, %d points\n", curve, this_plot->p_count);
- X+ for (i = 0; i < this_plot->p_count; i++) {
- X+ fprintf(outfile,"%c x=%g y=%g\n",
- X+ this_plot->points[i].type == INRANGE ? 'i'
- X+ : this_plot->points[i].type == OUTRANGE ? 'o'
- X+ : 'u',
- X+ this_plot->points[i].x,
- X+ this_plot->points[i].y);
- X+ }
- X+ fprintf(outfile,"\n");
- X+ }
- X+ fflush(outfile);
- X+ }
- X+
- X+ print_3dtable()
- X+ {
- X+ register struct surface_points *this_3dplot;
- X+ int i, curve;
- X+ struct gnuplot_contours *contours; /* Not NULL If have contours. */
- X+ struct iso_curve *isocrv;
- X+
- X+ for (this_3dplot = first_3dplot, curve = 0; this_3dplot != NULL;
- X+ curve++, this_3dplot = this_3dplot->next_sp)
- X+ {
- X+ isocrv = this_3dplot->iso_crvs;
- X+ fprintf(outfile,"Curve %d, %d points\n", curve, isocrv->p_count);
- X+ for (i = 0; i < isocrv->p_count; i++) {
- X+ fprintf(outfile,"%c x=%g y=%g z=%g\n",
- X+ isocrv->points[i].type == INRANGE ? 'i'
- X+ : isocrv->points[i].type == OUTRANGE ? 'o'
- X+ : 'u',
- X+ isocrv->points[i].x,
- X+ isocrv->points[i].y,
- X+ isocrv->points[i].z);
- X+ }
- X+ fprintf(outfile,"\n");
- X+ }
- X+ fflush(outfile);
- X+ }
- X+
- X /* This parses the plot command after any range specifications.
- X * To support autoscaling on the x axis, we want any data files to
- X * define the x range, then to plot any functions using that range.
- X***************
- X*** 1704,1710 ****
- X parametric_fixup (first_plot, &plot_num, &x_min, &x_max);
- X }
- X
- X! do_plot(first_plot,plot_num,x_min,x_max,y_min,y_max);
- X cp_free(first_plot);
- X first_plot = NULL;
- X }
- X--- 1792,1801 ----
- X parametric_fixup (first_plot, &plot_num, &x_min, &x_max);
- X }
- X
- X! if (strcmp(term_tbl[term].name,"table") == 0)
- X! print_table();
- X! else
- X! do_plot(first_plot,plot_num,x_min,x_max,y_min,y_max);
- X cp_free(first_plot);
- X first_plot = NULL;
- X }
- X***************
- X*** 1869,1877 ****
- X (this_plot->plot_style == ERRORBARS) )
- X if (crnt_param == 0)
- X point_num +=
- X! 1 + (draw_contour != 0);
- X if (crnt_param == 0)
- X! line_num += 1 + (draw_contour != 0);
- X
- X tp_3d_ptr = &(this_plot->next_sp);
- X }
- X--- 1960,1970 ----
- X (this_plot->plot_style == ERRORBARS) )
- X if (crnt_param == 0)
- X point_num +=
- X! 1 + (draw_contour != 0)
- X! + (hidden3d != 0);
- X if (crnt_param == 0)
- X! line_num += 1 + (draw_contour != 0)
- X! + (hidden3d != 0);
- X
- X tp_3d_ptr = &(this_plot->next_sp);
- X }
- X***************
- X*** 2257,2263 ****
- X }
- X }
- X
- X! do_3dplot(first_3dplot,plot_num,x_min,x_max,y_min,y_max,z_min,z_max);
- X sp_free(first_3dplot);
- X first_3dplot = NULL;
- X }
- X--- 2350,2359 ----
- X }
- X }
- X
- X! if (strcmp(term_tbl[term].name,"table") == 0)
- X! print_3dtable();
- X! else
- X! do_3dplot(first_3dplot,plot_num,x_min,x_max,y_min,y_max,z_min,z_max);
- X sp_free(first_3dplot);
- X first_3dplot = NULL;
- X }
- X***************
- X*** 2594,2599 ****
- X--- 2690,2725 ----
- X while (new_list->next_sp != NULL)
- X new_list = new_list->next_sp;
- X new_list->next_sp = free_head;
- X+ if (lxmax - lxmin < zero) {
- X+ if (fabs(lxmax) < zero) {
- X+ lxmin = -1.0;
- X+ lxmax = 1.0;
- X+ }
- X+ else {
- X+ lxmin *= 0.9;
- X+ lxmax *= 1.1;
- X+ }
- X+ }
- X+ if (lymax - lymin < zero) {
- X+ if (fabs(lymax) < zero) {
- X+ lymin = -1.0;
- X+ lymax = 1.0;
- X+ }
- X+ else {
- X+ lymin *= 0.9;
- X+ lymax *= 1.1;
- X+ }
- X+ }
- X+ if (lzmax - lzmin < zero) {
- X+ if (fabs(lzmax) < zero) {
- X+ lzmin = -1.0;
- X+ lzmax = 1.0;
- X+ }
- X+ else {
- X+ lzmin *= 0.9;
- X+ lzmax *= 1.1;
- X+ }
- X+ }
- X
- X /* Report the overall graph mins and maxs. */
- X if (autoscale_lx) {
- X***************
- X*** 2739,2745 ****
- X help_desc.dsc$w_length = strlen(help);
- X if ((vaxc$errno = lbr$output_help(lib$put_output,0,&help_desc,
- X &helpfile_desc,0,lib$get_input)) != SS$_NORMAL)
- X! os_error("can't open GNUPLOT$HELP");
- X }
- X
- X
- X--- 2865,2871 ----
- X help_desc.dsc$w_length = strlen(help);
- X if ((vaxc$errno = lbr$output_help(lib$put_output,0,&help_desc,
- X &helpfile_desc,0,lib$get_input)) != SS$_NORMAL)
- X! os_error("can't open GNUPLOT$HELP",NO_CARET);
- X }
- X
- X
- X***************
- X*** 2882,2888 ****
- X if(fexecv(parms[0],parms) < 0)
- X #else
- X if (system(input_line + 1))
- X! #endif
- X os_error("system() failed",NO_CARET);
- X }
- X
- X--- 3008,3014 ----
- X if(fexecv(parms[0],parms) < 0)
- X #else
- X if (system(input_line + 1))
- X! #endif /* AMIGA_AC_5 */
- X os_error("system() failed",NO_CARET);
- X }
- X
- X***************
- X*** 3087,3093 ****
- X if (more && interactive)
- X fputs("> ", stderr);
- X } while(more);
- X! #ifndef __ZTC
- X }
- X #endif
- X }
- X--- 3213,3219 ----
- X if (more && interactive)
- X fputs("> ", stderr);
- X } while(more);
- X! #ifndef __ZTC__
- X }
- X #endif
- X }
- Xdiff -rc gnuplot/contour.c gnuplot3.2/contour.c
- X*** gnuplot/contour.c Sun Jan 5 21:33:16 1992
- X--- gnuplot3.2/contour.c Wed Mar 25 07:59:35 1992
- X***************
- X*** 1,6 ****
- X /* GNUPLOT - contour.c */
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X--- 1,10 ----
- X+ #ifndef lint
- X+ static char *RCSid = "$Id: contour.c,v 3.26 92/03/24 22:35:54 woo Exp Locker: woo $";
- X+ #endif
- X+
- X /* GNUPLOT - contour.c */
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991, 1992 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X***************
- X*** 21,31 ****
- X * Gershon Elber
- X *
- X * Send your comments or suggestions to
- X! * pixar!info-gnuplot@sun.com.
- X * This is a mailing list; to join it send a note to
- X! * pixar!info-gnuplot-request@sun.com.
- X * Send bug reports to
- X! * pixar!bug-gnuplot@sun.com.
- X */
- X
- X #include <stdio.h>
- X--- 25,35 ----
- X * Gershon Elber
- X *
- X * Send your comments or suggestions to
- X! * info-gnuplot@ames.arc.nasa.gov.
- X * This is a mailing list; to join it send a note to
- X! * info-gnuplot-request@ames.arc.nasa.gov.
- X * Send bug reports to
- X! * bug-gnuplot@ames.arc.nasa.gov.
- X */
- X
- X #include <stdio.h>
- Xdiff -rc gnuplot/corplot.c gnuplot3.2/corplot.c
- X*** gnuplot/corplot.c Thu Jul 18 11:56:08 1991
- X--- gnuplot3.2/corplot.c Wed Mar 25 07:59:36 1992
- X***************
- X*** 1,6 ****
- X /* GNUPLOT - corplot.c */
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X--- 1,10 ----
- X+ #ifndef lint
- X+ static char *RCSid = "$Id: corplot.c,v 3.26 92/03/24 22:36:10 woo Exp Locker: woo $";
- X+ #endif
- X+
- X /* GNUPLOT - corplot.c */
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991, 1992 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X***************
- X*** 27,37 ****
- X * Gershon Elber and many others.
- X *
- X * Send your comments or suggestions to
- X! * pixar!info-gnuplot@sun.com.
- X * This is a mailing list; to join it send a note to
- X! * pixar!info-gnuplot-request@sun.com.
- X * Send bug reports to
- X! * pixar!bug-gnuplot@sun.com.
- X */
- X #include <stdio.h>
- X #include <process.h>
- X--- 31,41 ----
- X * Gershon Elber and many others.
- X *
- X * Send your comments or suggestions to
- X! * info-gnuplot@ames.arc.nasa.gov.
- X * This is a mailing list; to join it send a note to
- X! * info-gnuplot-request@ames.arc.nasa.gov.
- X * Send bug reports to
- X! * bug-gnuplot@ames.arc.nasa.gov.
- X */
- X #include <stdio.h>
- X #include <process.h>
- XCommon subdirectories: gnuplot/demo and gnuplot3.2/demo
- XCommon subdirectories: gnuplot/docs and gnuplot3.2/docs
- Xdiff -rc gnuplot/eval.c gnuplot3.2/eval.c
- X*** gnuplot/eval.c Thu Jul 18 11:56:29 1991
- X--- gnuplot3.2/eval.c Wed Mar 25 07:59:36 1992
- X***************
- X*** 1,6 ****
- X /* GNUPLOT - eval.c */
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X--- 1,10 ----
- X+ #ifndef lint
- X+ static char *RCSid = "$Id: eval.c,v 3.26 92/03/24 22:34:32 woo Exp Locker: woo $";
- X+ #endif
- X+
- X /* GNUPLOT - eval.c */
- X /*
- X! * Copyright (C) 1986, 1987, 1990, 1991, 1992 Thomas Williams, Colin Kelley
- X *
- X * Permission to use, copy, and distribute this software and its
- X * documentation for any purpose with or without fee is hereby granted,
- X***************
- X*** 27,37 ****
- X * Gershon Elber and many others.
- X *
- X * Send your comments or suggestions to
- X! * pixar!info-gnuplot@sun.com.
- X * This is a mailing list; to join it send a note to
- X! * pixar!info-gnuplot-request@sun.com.
- X * Send bug reports to
- X! * pixar!bug-gnuplot@sun.com.
- X */
- X
- X #include <stdio.h>
- X--- 31,41 ----
- X * Gershon Elber and many others.
- X *
- X * Send your comments or suggestions to
- X! * info-gnuplot@ames.arc.nasa.gov.
- X * This is a mailing list; to join it send a note to
- X! * info-gnuplot-request@ames.arc.nasa.gov.
- X * Send bug reports to
- X! * bug-gnuplot@ames.arc.nasa.gov.
- X */
- X
- X #include <stdio.h>
- Xdiff -rc gnuplot/gnuplot.el gnuplot3.2/gnuplot.el
- X*** gnuplot/gnuplot.el Sun Jan 5 21:33:16 1992
- X--- gnuplot3.2/gnuplot.el Wed Mar 25 07:59:37 1992
- X***************
- X*** 5,11 ****
- X ; Computer Science Dept.
- X ; University of Utah
- X ; Date: Tue May 14 1991
- X! ; Copyright (c) 1991, Gershon Elber
- X ;
- X ; This file defines an environment to run edit and execute GNU-PLOT programs.
- X ; Such a program should have a '.gp' extension in order it to be in
- X--- 5,11 ----
- X ; Computer Science Dept.
- X ; University of Utah
- X ; Date: Tue May 14 1991
- X! ; Copyright (c) 1991, 1992, Gershon Elber
- X ;
- X ; This file defines an environment to run edit and execute GNU-PLOT programs.
- X ; Such a program should have a '.gp' extension in order it to be in
- END_OF_FILE
- if test 33186 -ne `wc -c <'patch.1'`; then
- echo shar: \"'patch.1'\" unpacked with wrong size!
- fi
- # end of 'patch.1'
- fi
- echo shar: End of archive 5 \(of 7\).
- cp /dev/null ark5isdone
- MISSING=""
- for I in 1 2 3 4 5 6 7 ; do
- if test ! -f ark${I}isdone ; then
- MISSING="${MISSING} ${I}"
- fi
- done
- if test "${MISSING}" = "" ; then
- echo You have unpacked all 7 archives.
- rm -f ark[1-9]isdone
- else
- echo You still must unpack the following archives:
- echo " " ${MISSING}
- fi
- exit 0
-
- exit 0 # Just in case...
-