Source Code 1994 March/Source_Code_CD-ROM_Walnut_Creek_March_1994.iso/compsrcs/misc/volume30/gnuplot3/patch02a

Text File | 1992-06-18 | 53.9 KB | 1,808 lines

Newsgroups: comp.sources.misc
From: [e-mail] (Alex Woo)
Subject:  v30i054:  gnuplot3 - interactive function plotting utility, Patch02a/7
Message-ID: <csm-v30i054=[e-mail]>
X-Md4-Signature: 37203953b07cd2edc7ee58ee5bd1d617
Date: Sun, 14 Jun 1992 21:38:55 GMT
Approved: [e-mail]

Submitted-by: [e-mail] (Alex Woo)
Posting-number: Volume 30, Issue 54
Archive-name: gnuplot3/patch02a
Environment: UNIX, MS-DOS, VMS
Patch-To: gnuplot3: Volume 24, Issue 23-48

Below is the official patch2 for gnuplot 3.0 (which makes it 3.2)
This is the official release of GNUPLOT.3.2.  It is available in either
a patch or tar archive.  Sites for the retrieval are listed in the
README.   Below are the modifications and contributors to this release.
The patch files patch.[1-7] need to be applied with the p1 flag

(with csh or tcsh the following will apply the patches)
%cd gnuplot
%foreach f (patch.*)
>patch -p1 <  $f
>end

 What is Gnuplot 3.1?
 --------------------
Gnuplot is a command-line driven interactive function plotting utility
for UNIX, MSDOS, and VMS platforms.  The software is copyrighted but
freely distributed (i.e., you don't have to pay for it).  It was
originally intended as graphical program which would allow scientists
and students to visualize mathematical functions and data.  Additions
to this version of the software allow plots of three-dimensional
functions and data files.  Gnuplot supports many different types of
terminals, plotters, and printers and is easily extensible to include
new devices.  [ The "GNU" in Gnuplot is NOT related to the Free
Software Foundation, the naming is just a coincidence (and a long
story). Thus gnuplot is not covered by the Gnu copyleft, but rather
by its own copyright statement, included in all source code files.]

Alex Woo
--------------------------------
#! /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 [e-mail] if you want that tool.
# Contents:  README.patch2 EpsViewer.h README.3d README.3p2 README.NeXT
#   README.x11 demo/hidden.demo patch.7
# Wrapped by [e-mail]. on Thu May 28 22:44:39 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 1 (of 7)."'
if test -f 'README.patch2' -a "${1}" != "-c" ; then
  echo shar: Will not clobber existing file \"'README.patch2'\"
else
  echo shar: Extracting \"'README.patch2'\" \(2920 characters\)
  sed "s/^X//" >'README.patch2' <<'END_OF_FILE'
XThis is the official release of GNUPLOT.3.2.  It is available in either
Xa patch or tar archive.  Sites for the retrieval are listed in the
XREADME.   Below are the modifications and contributors to this release.
XThe patch files patch.[1-7] need to be applied with the p1 flag
X
X(with csh or tcsh the following will apply the patches)
X%cd gnuplot
X%foreach f (patch.*)
X>patch -p1 <  $f
X>end
X
X
XThanks  ---  Alex Woo
X
X* Subject: New generic gnuplot_x11.c
X  Name: Ed Kubatis
X  Email: [e-mail]
X
X* Subject: Hidden Line Removal for Explicit Surfaces and IRIX 4.0 fixes.
X  Name: Gershon Elber
X  Email: [e-mail]
X
X* Subject: Table Terminal Driver.
X  Name: Kevin Russo
X  Email: [e-mail]
X
X* Subject: PCL5 driver fixes (HPGL page eject),datafile pipe and README.
X  Name: Alex Woo
X  Email: [e-mail]
X
X* Subject: Pbmplus driver and fix to y log tics.
X  Name: Russell Lang
X  Email: [e-mail]
X
X* Subject: NeXT Console Driver.
X  Name: Nick Strobel
X  Email: [e-mail]
X
X* Subject: Fix GNUTERM environment with disk resident BGI drivers
X  Name: Craig Johnston
X  Email: [e-mail]
X
X* Subject: Fix tables for troff in doc2ms
X  Name: Michael Schuh
X  Email: [e-mail]
X
X* Subject: Fix dump when GNUPLOT$HELP undefined
X  Name: Wolfgang J. Moeller
X  Email: [e-mail]
X
X* Subject: Fix AMIGA segment limits
X  Name: Carsten Steger
X  Email: [e-mail]
X
X* Subject: Put FAR pointers in bitmap.c and bitmap.h
X  Name: Russell Lang
X  Email: [e-mail]
X
X* Subject: Bug fix to latex.trm
X  Name: Rob Cunningham
X  Email: [e-mail]
X----------------------------------------------------------------------------
X
X                   GNUPLOT 3.1 Patch
X
XThis package provides the upgrade of gnuplot 3.0 to patch level 1.
XBelow are the contributers to this upgrade and the modifications made.
X
XThank you all
X
XGershon
X
X----------------------------------------------------------------------------
X
X* Subject: Y log / postscript eps fix
X  Name: Russell Lang
X  Email: [e-mail]
X
X* Subject: HP26 driver to lift text.
X  Name: Bruce Lueckenhoff
X  Email: [e-mail]
X
X* Subject: CRAY prt, UIUC coordinates.
X  Name: Daniel Lewart
X  Email: [e-mail]
X
X* Subject: AI device
X  Name:    Ray Ghanbari
X  Email: [e-mail]
X
X* Subject: HP_MOTIF on a Snake, X11 for Next
X  Name: Alex Woo
X  Email: [e-mail]
X
X* Subject: Mod. to LaTeX for multiple curves/plots, complex atan function fix.
X  Name: Ray Toy???
X  Email: [e-mail]
X
X* Subject: Fix the "splot 'file.dat'" with only z values.
X  Name: Gershon Elber
X  Email: [e-mail]
X
X* Subject: Underscore prefixed names.
X  Name: Tom Tkacik
X  Email: [e-mail]
X
X* Subject: Amiga port
X  Name: Carsten Steger
X  Email: [e-mail]
END_OF_FILE
  if test 2920 -ne `wc -c <'README.patch2'`; then
    echo shar: \"'README.patch2'\" unpacked with wrong size!
  fi
  # end of 'README.patch2'
fi
if test -f 'EpsViewer.h' -a "${1}" != "-c" ; then
  echo shar: Will not clobber existing file \"'EpsViewer.h'\"
else
  echo shar: Extracting \"'EpsViewer.h'\" \(467 characters\)
  sed "s/^X//" >'EpsViewer.h' <<'END_OF_FILE'
X/*
X * $Id: EpsViewer.h,v 3.24 1992/02/29 16:27:40 woo Exp woo $
X *
X * $Log: EpsViewer.h,v $
X * Revision 3.24  1992/02/29  16:27:40  woo
X * gnuplot3.2, beta 4
X *
X */
X
X#import <appkit/Application.h>
X#import <appkit/graphics.h>
X#import <dpsclient/dpsclient.h>
X#import <appkit/Window.h>
X
X@interface EpsViewer:Application
X{
X    id theNewWin;
X}
X
X- windowCreate:(NXCoord)width Height:(NXCoord)height;
X- (NXRect *)nextRectForWidth:(NXCoord)width Height:(NXCoord)height;
X
X@end
X
X
END_OF_FILE
  if test 467 -ne `wc -c <'EpsViewer.h'`; then
    echo shar: \"'EpsViewer.h'\" unpacked with wrong size!
  fi
  # end of 'EpsViewer.h'
fi
if test -f 'README.3d' -a "${1}" != "-c" ; then
  echo shar: Will not clobber existing file \"'README.3d'\"
else
  echo shar: Extracting \"'README.3d'\" \(5930 characters\)
  sed "s/^X//" >'README.3d' <<'END_OF_FILE'
X
X           A tutorial on explicit/parametric
X                   and
X            everything you did not dare to ask
X                  about
X               curves and surfaces
X                    in
X                  gnuplot
X
XSeveral types of curves and surface are supported in gnuplot. Of those
Xnot every operation is supported for every curve or surface type and it
Xcan be therefore useful to understand the different types, their advantages
Xand limitations.
X
XCurves in gnuplot are almost always planar (with one exception which we
Xwill deal with in the end) and are assumed to be in the XY plane.
XTherefore only X and Y coordinates are needed for plotting curves.
XThe simplest curve is the `explicit function`. This curve is in fact a
Xfunction and for each given x, there is one and only one y value associated
Xwith it. A gnuplot example for such type is `plot sin(x)` or
X`plot "datafile" using 1". Note the later is using only a single column from
Xthe data file which is assumed to be the y values.
X
XAlternatively one can define a `parametric curve` form. In this case
Xx and y are both functions of a third free parameter t, while independent
Xof each other. A circle can be expressed parametrically as x = cos(t),
Xy = sin(t) and be plotted using gnuplot as
X'set parametric; plot cos(t),sin(t)'.
XThis form is not a function since there can be unlimited number of y values
Xassociated with same x. Furthermore the explicit form is a special case of
Xthe parametric representation by letting x equal to t. The curve y = sin(x)
Xcan be written in parametric form as y = sin(t), x = t.
X
XWe are used to think of the plane in cartesian coordinate system.
XIn practice, some coordinate systems may be easier to use then others
Xunder some circumstances. The polar form uses a different basis
Xto span the XY plane. In this representation the cartesian x coordinate
Xis equal to r cos(t) and the cartesian y coordinate is equal to r sin(t).
XTo draw a unit circle using the polar coordinate system in gnuplot use the
Xfollowing simple command: 'set polar; plot 1'. To better understand this
Xexplicit form lets backup a little.
XWhen we plot a regular explicit function like `y = sin(x)` we march in equal
Xsteps in x, evaluate the provided function and plot a piecewise linear curve
Xbetween the sampled points approximating the real function. In the polar
Xexplicit form we do exactly the same thing, but we march along the angular
Xdirection - we turn around the origin, computing the length of the radius
Xat that angle. Since for the unit circle, this radius is a constant 1,
X`plot 1` in polar form plots a circle (if t domain is from 0 or 2Pi).
XNote the polar form is explicit in that for each angle there is only a
Xsingle radius.
X
XSurprisingly (or maybe not so surprising) surfaces share the same
Xrepresentations. Since surfaces are two dimensional entities, they
Xrequire two free parameters (like t for curves).
X
XA surface explicit function uses x and y as the free parameters. For
Xeach such pair it provides a single z value. An example for this form
Xcan be `splot sin(sqrt(x**2+y**2))/sqrt(x**2+y**2)` for a three dimensional
Xsinc function or `splot 'datafile' using 1`. As for curves, the single column
Xused from the data file defines the function value or z in this case.
XThe order of the x and y function values is very strict in this form and
Xsimply defines a rectangular grid in the XY plane. Fortunately this
Xstrict form allows us to apply a very simplistic hidden line algorithm
Xcalled "the floating horizon". This hidden line algorithm exploits the
Xrectangular XY domain of the surface and therefore may be used for this
Xtype of surfaces only. Since in gnuplot this is the only form of hidden
Xlines removing algorithm provided, only explicit surfaces may have their
Xhidden lines removed.
X
XParametric surfaces are the exact extension for explicit surfaces as in
Xthe curves case. the x, y, and z are defined in terms of two new free
Xvariables and are totally independent of each other as x(u, v), y(u, v),
Xand z(u, v). Again the explicit surface is a special case of the parametric
Xrepresentation where x = u, and y = v. Examples for plotting parametric
Xsurfaces in gnuplot can be `splot cos(u)*cos(v),cos(u)*sin(v),sin(u)` which
Xdefines a sphere, or `splot "datafile" using 1:2:3`. Since these are
Xparametric surfaces, gnuplot must be informed to handle them by issuing
X`set parametric`.
X
XThe curve polar form takes the obvious extensions in the surface world.
XThe first possible extension is spherical coordinate system, while the
Xsecond is the cylinderical one. These modes currently work for data files
Xonly and both requires two parameters, teta and phi for mapping onto the
Xunit sphere, and teta and z form mapping on a unit radius cylinder as follow:
X
X    Spherical coord.            Cylin. coord.
X    ----------------            -------------
X    x = cos( theta ) * cos( phi )        x = cos( theta )
X    y = sin( theta ) * cos( phi )        y = sin( theta )
X    z = sin( phi )                z = z
X
XThis subject brings us back to non planar curves. When surfaces are displayed
Xunder gnuplot, isocurves are actually getting plotted. An isocurve is a
Xcurve on the surface in which one of the two free parameters of the
Xsurface is fixed. For example the u isolines of a surface are drawn by
Xsetting u to be fixed and varying v along the entire v domain. The v isolines
Xare similarly drawn by fixing v. When data files are specified they are
Xclassified internally into two types. A surface is tagged to have grid
Xtopology if all its specified isolines are of the same length. A data mesh
Xof five isolines, seven points each is an example. In such a case the
Xsurface cross isolines are drawn as well. Seven isolines with five points
Xeach will be automatically created and drawn for grid type data. If
Xhowever, isolines of different length are found in the data, it is
Xtagged as nongrid surface and in fact is nothing more than a collection
Xof three dimensional curves. only the provided data is plotted in that
Xcase (see world.demo for a such an example).
X
END_OF_FILE
  if test 5930 -ne `wc -c <'README.3d'`; then
    echo shar: \"'README.3d'\" unpacked with wrong size!
  fi
  # end of 'README.3d'
fi
if test -f 'README.3p2' -a "${1}" != "-c" ; then
  echo shar: Will not clobber existing file \"'README.3p2'\"
else
  echo shar: Extracting \"'README.3p2'\" \(2920 characters\)
  sed "s/^X//" >'README.3p2' <<'END_OF_FILE'
XThis is the official release of GNUPLOT.3.2.  It is available in either
Xa patch or tar archive.  Sites for the retrieval are listed in the
XREADME.   Below are the modifications and contributors to this release.
XThe patch files patch.[1-7] need to be applied with the p1 flag
X
X(with csh or tcsh the following will apply the patches)
X%cd gnuplot
X%foreach f (patch.*)
X>patch -p1 <  $f
X>end
X
X
XThanks  ---  Alex Woo
X
X* Subject: New generic gnuplot_x11.c
X  Name: Ed Kubatis
X  Email: [e-mail]
X
X* Subject: Hidden Line Removal for Explicit Surfaces and IRIX 4.0 fixes.
X  Name: Gershon Elber
X  Email: [e-mail]
X
X* Subject: Table Terminal Driver.
X  Name: Kevin Russo
X  Email: [e-mail]
X
X* Subject: PCL5 driver fixes (HPGL page eject),datafile pipe and README.
X  Name: Alex Woo
X  Email: [e-mail]
X
X* Subject: Pbmplus driver and fix to y log tics.
X  Name: Russell Lang
X  Email: [e-mail]
X
X* Subject: NeXT Console Driver.
X  Name: Nick Strobel
X  Email: [e-mail]
X
X* Subject: Fix GNUTERM environment with disk resident BGI drivers
X  Name: Craig Johnston
X  Email: [e-mail]
X
X* Subject: Fix tables for troff in doc2ms
X  Name: Michael Schuh
X  Email: [e-mail]
X
X* Subject: Fix dump when GNUPLOT$HELP undefined
X  Name: Wolfgang J. Moeller
X  Email: [e-mail]
X
X* Subject: Fix AMIGA segment limits
X  Name: Carsten Steger
X  Email: [e-mail]
X
X* Subject: Put FAR pointers in bitmap.c and bitmap.h
X  Name: Russell Lang
X  Email: [e-mail]
X
X* Subject: Bug fix to latex.trm
X  Name: Rob Cunningham
X  Email: [e-mail]
X----------------------------------------------------------------------------
X
X                   GNUPLOT 3.1 Patch
X
XThis package provides the upgrade of gnuplot 3.0 to patch level 1.
XBelow are the contributers to this upgrade and the modifications made.
X
XThank you all
X
XGershon
X
X----------------------------------------------------------------------------
X
X* Subject: Y log / postscript eps fix
X  Name: Russell Lang
X  Email: [e-mail]
X
X* Subject: HP26 driver to lift text.
X  Name: Bruce Lueckenhoff
X  Email: [e-mail]
X
X* Subject: CRAY prt, UIUC coordinates.
X  Name: Daniel Lewart
X  Email: [e-mail]
X
X* Subject: AI device
X  Name:    Ray Ghanbari
X  Email: [e-mail]
X
X* Subject: HP_MOTIF on a Snake, X11 for Next
X  Name: Alex Woo
X  Email: [e-mail]
X
X* Subject: Mod. to LaTeX for multiple curves/plots, complex atan function fix.
X  Name: Ray Toy???
X  Email: [e-mail]
X
X* Subject: Fix the "splot 'file.dat'" with only z values.
X  Name: Gershon Elber
X  Email: [e-mail]
X
X* Subject: Underscore prefixed names.
X  Name: Tom Tkacik
X  Email: [e-mail]
X
X* Subject: Amiga port
X  Name: Carsten Steger
X  Email: [e-mail]
END_OF_FILE
  if test 2920 -ne `wc -c <'README.3p2'`; then
    echo shar: \"'README.3p2'\" unpacked with wrong size!
  fi
  # end of 'README.3p2'
fi
if test -f 'README.NeXT' -a "${1}" != "-c" ; then
  echo shar: Will not clobber existing file \"'README.NeXT'\"
else
  echo shar: Extracting \"'README.NeXT'\" \(1407 characters\)
  sed "s/^X//" >'README.NeXT' <<'END_OF_FILE'
X    This directory contains version 2 of the additional files
Xyou'll need to get gnuplot3.0 to display it's postscript directly to a
Xwindow instead of going through the klunky process of writing the
Xpostscript to a file and launching Previewer to view the file.  Note
Xthat all input is still done at the shell level! Fancier NeXTStep
Xinterfaces will be a future project.
X
X    This version is faster and leaner than the old method.  It
Xalso does not eat up swap space like the older version (this was
Xparticularly noticeable when doing animation-like plots).  To do this
XI used DPS function calls instead of creating a NXImage and
Xcompositing the stream of commands. I based my code on the program
Xcalled "epsview" in the hackkit tar file on the archive servers.
X
X    The next_dps.trm (next terminal) is basically the post.trm
X(postscript terminal) with the fprintf replaced by DPSPrintf and
Xoutfile by the DPSContext d.  You'll also see that I also used some
Xcode (with modifications) from David S. Joerg's MovieApp.  Using the
XDPS functions enabled me to slim down the EpsViewer.[hm] and
XEPSView.[hm] files.
X
X    No claim is made to code elegance or to it being a good example of
Xobjective-c coding.  This is my first (well, second, sort of) objective-c
Xprogram. It seems to work for me. Any constructive criticism would be
Xappreciated.  I can be reached at [e-mail]
X
Xcheers!
X
Xnick strobel
X
END_OF_FILE
  if test 1407 -ne `wc -c <'README.NeXT'`; then
    echo shar: \"'README.NeXT'\" unpacked with wrong size!
  fi
  # end of 'README.NeXT'
fi
if test -f 'README.x11' -a "${1}" != "-c" ; then
  echo shar: Will not clobber existing file \"'README.x11'\"
else
  echo shar: Extracting \"'README.x11'\" \(4308 characters\)
  sed "s/^X//" >'README.x11' <<'END_OF_FILE'
X
XNotes on the new X11 features are attached.
X
XEd
X----------------------------------
XEd Kubaitis ([e-mail])
XComputing & Communications Services Office - University of Illinois, Urbana
X
X===============================================================================
XGnuplot_x11 for 3.2
X-------------------
X
XNew features
X------------
X   o CRIPPLED_SELECT build option for SVR3 platforms with incomplete
X     or faulty implementations of BSD select().
X
X   o Xlib only
X
X     X11 support no longer requires Athena or Motif libraries and
X     include files. This makes life easier for people on platforms
X     with Open Look only. It also simplifies X11 tailoring on all
X     platforms. Oh yes, and the gnuplot_x11 executable is smaller
X     (~43K instead of ~500K on RS/6000.)
X
X     makefile.unx has been edited to remove references to Athena &
X     Motif. Also, with the exception of the HP definition (where it
X     appeared to be intentionally specific to R4) all references to
X     X11R4 have also been removed since this version should work without
X     changes on R3, R4, or R5.
X
X   o Grayscale handling
X
X     * grayscale displays get monochrome rendering by default
X
X     * '-gray' option & resource forces grayscale rendering on grayscale
X       or color displays.
X
X     * '-mono' option forces monochrome rendering on color displays.
X
X     * special grayscale resources (separate from color)
X
X   o Miscellaneous
X
X     * By default, the window is no longer momentarily cleared when
X       a new plot is displayed. The new plot "silently" replaces the
X       previous one.  I found this useful when running some of the demos,
X       such as contours.demo, where a plot "adds" a feature to
X       the one before (gnuplot "movies" anyone?;-).
X
X       However, a "-clear" command line-option and "gnuplot*clear: on"
X       restores the momentary clear that was there previously.
X
X     * Added ptx_x11 and convex_x11 machine options to makefile.unx.
X
X     * There is an X11FLAGS option (-DOLD_SELECT) for old 4.2 BSD systems
X       (such as SunOS 3.5) which don't have the FD_XXX macros that
X       go with select().
X
X
XA few words about CRIPPLED_SELECT
X---------------------------------
XI closely reviewed four different ways people had devised for dealing with
Xthe "select error" problem encountered on some SVR3 platforms. I had one
Xsuch platform (Sequent Dynix/PTX) available for testing. Unfortunately 3 of
Xthe four ways that had been submitted did not work for PTX (which has
Xproblems with non-blocking I/O and Unix domain sockets as well as select).
XThe fourth way worked there but it used SV STREAMS and I had no way to
Xverify that it would also work on all the other platforms that encountered
Xthe problem.
X
XWhat was done instead was to use a temporary file instead of a pipe for
Xgnuplot->gnuplot_x11 communication when CRIPPLED_SELECT is used. This is
Xlike a sledgehammer - crude but (hopefully) robust. It should work on any
Xplatform with open(), read(), write(), close(), unlink(), getpid(), and
Xgetppid().
X
XResponse time is not bad with CRIPPLED_SELECT. Timings on an RS/6000
Xfor all.demo (hitting RETURN as soon as a plot appears) indicate that
XCRIPPLED_SELECT only adds an average of .5 seconds to response time,
Xabout what one would expect given the 1 second timer used. And curiously,
XCRIPPLED_SELECT used 30% less CPU than the default mode.
X
XTesting
X-------
XThe new gnuplot_x11 was tested here on the following platforms:
X
X   o IBM RS/6000 AIX 3.1.6 (IBM X11R3)
X   o IBM RS/6000 AIX 3.1.6 (MIT X11R4)
X   o Apollo 400s DomainOS 10.3 (Apollo X11R3)
X   o Sun SPARC SunOS 4.1.1-GFX-Rev2 (X11R?)
X   o Vax BSD 4.3 Reno (X11R5)
X   o Vax Ultrix-32 V3.0 Rev 64 (MIT X11R4)
X   o Sun 3/50 SunOS 3.5 (MIT X11R4)
X   o Sun 3/60 SunOS 4.1 (MIT X11R4)
X   o NeXT (X11 R?)
X   o Convex C2 9.0 OS (MIT X11R5)
X   o Sequent Dynix 3.1 (MIT X11R5)
X   o Sequent Dynix/PTX (MIT X11R5)
X   o Cray 2 - Unicos 5+?
X   o Cray Y-MP - Unicos 5+?
X
XAnd with the following servers:
X
X   o NCD 19 monochrome (NCD X11R3)
X   o Visual X-15 monochrome (Visual X11R4)
X   o Sun 3/50 monochrome (MIT X11R4)
X   o IBM XStation 120 grayscale (IBM X11R4)
X   o Visual Turbo X-19 grayscale (Visual X11R4)
X   o IBM XStation 120 color (IBM X11R4)
X   o Sun 3/60 color (MIT X11R4)
X   o IBM XStation 130 1.3 (IBM X11R4)
X
END_OF_FILE
  if test 4308 -ne `wc -c <'README.x11'`; then
    echo shar: \"'README.x11'\" unpacked with wrong size!
  fi
  # end of 'README.x11'
fi
if test -f 'demo/hidden.demo' -a "${1}" != "-c" ; then
  echo shar: Will not clobber existing file \"'demo/hidden.demo'\"
else
  echo shar: Extracting \"'demo/hidden.demo'\" \(1023 characters\)
  sed "s/^X//" >'demo/hidden.demo' <<'END_OF_FILE'
X#
X# $Id$
X#
X# $Log$
X#
Xset samples 20
Xset isosamples 20
Xset hidden3d
Xset title "Hidden line removal of explicit surfaces"
X
X
Xset xrange [-3:3]
Xset yrange [-2:2]
Xsplot 1 / (x*x + y*y + 1)
Xpause -1 "Hit return to continue (1)"
X
Xset xrange [-1:1]
Xset yrange [-1:1]
Xsplot x*y / (x**2 + y**2 + 0.1)
Xpause -1 "Hit return to continue (2)"
X
Xset view 70,45
Xset nocontour
Xset xrange [-3:3]
Xset yrange [-3:3]
Xsplot sin(x*x + y*y) / (x*x + y*y)
Xpause -1 "Hit return to continue (3)"
X
Xset view 60,30
Xset xrange [-3:3]
Xset yrange [-3:3]
Xsplot sin(x) * cos(y)
Xpause -1 "Hit return to continue (4)"
X
Xset view 75,230
Xset contour
Xreplot
Xpause -1 "Hit return to continue (5)"
X
Xset view 80,30,1,1
Xset data style lines
Xset autoscale
Xsplot "glass.dat" using 1
Xpause -1 "Hit return to continue (6)"
X
Xset view 50,
Xset grid
Xreplot
Xpause -1 "Hit return to continue (7)"
X
Xset nocontour
Xset nogrid
Xset nohidden3d
Xset samples 100
Xset isosamples 10
Xset view 60,30,1,1
Xset xrange [-10:10]
Xset yrange [-10:10]
Xset zrange [-10:10]
Xset auto
Xset title "" 0,0
X
X
END_OF_FILE
  if test 1023 -ne `wc -c <'demo/hidden.demo'`; then
    echo shar: \"'demo/hidden.demo'\" unpacked with wrong size!
  fi
  # end of 'demo/hidden.demo'
fi
if test -f 'patch.7' -a "${1}" != "-c" ; then
  echo shar: Will not clobber existing file \"'patch.7'\"
else
  echo shar: Extracting \"'patch.7'\" \(28597 characters\)
  sed "s/^X//" >'patch.7' <<'END_OF_FILE'
Xdiff -rc gnuplot/term/hp2648.trm gnuplot3.2/term/hp2648.trm
X*** gnuplot/term/hp2648.trm    Mon Mar 26 15:02:34 1990
X--- gnuplot3.2/term/hp2648.trm    Wed Mar 25 08:00:43 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT -  hp2648.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: hp2648.trm,v 3.26 92/03/24 22:34:55 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT -  hp2648.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 22,28 ****
X   * AUTHORS
X   *  Russell Lang
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 26,32 ----
X   * AUTHORS
X   *  Russell Lang
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/hpgl.trm gnuplot3.2/term/hpgl.trm
X*** gnuplot/term/hpgl.trm    Sun Jan  5 21:33:33 1992
X--- gnuplot3.2/term/hpgl.trm    Wed Mar 25 08:00:44 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - hpgl.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: hpgl.trm,v 3.26 92/03/24 22:34:56 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - hpgl.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 22,28 ****
X   * AUTHORS
X   *  Colin Kelley, Thomas Williams, Russell Lang
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 26,32 ----
X   * AUTHORS
X   *  Colin Kelley, Thomas Williams, Russell Lang
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
X***************
X*** 29,34 ****
X--- 33,41 ----
X  #define HPGL_XMAX 15200
X  #define HPGL_YMAX 10000
X
X+ #define PCL_XMAX 10000
X+ #define PCL_YMAX  7500
X+
X  #define HPGL_XLAST (HPGL_XMAX - 1)
X  #define HPGL_YLAST (HPGL_XMAX - 1)
X
X***************
X*** 38,43 ****
X--- 45,55 ----
X  #define HPGL_VTIC    (HPGL_YMAX/70)
X  #define HPGL_HTIC    (HPGL_YMAX/70)
X
X+ #define PCL_VCHAR    (PCL_YMAX/100*32/10) /* 3.2% */
X+ #define PCL_HCHAR    (PCL_XMAX/100*12/10) /* 1.2% */
X+ #define PCL_VTIC    (PCL_YMAX/70)
X+ #define PCL_HTIC    (PCL_YMAX/70)
X+
X  int HPGL_ang = 0;
X
X  HPGL_init()
X***************
X*** 48,72 ****
X  */
X  }
X
X! HPLJIII_PORT_init()
X  {
X!       fputs("\033E\033&l1X\033&l0O\033%0B;PW0.15\n",outfile);
X  }
X
X! HPLJIII_LAND_init()
X  {
X      fputs("\033E\033&l1X\033&l1O\033%0B;PW0.15\n",outfile);
X  }
X
X
X! HPLJIII_graphics()
X  {
X      fprintf(outfile,
X      "\033%0B\nIN;\nSC0,%d,0,%d;\nSR%f,%f;\n",
X!         HPGL_XMAX,HPGL_YMAX,
X!         ((double)(HPGL_HCHAR)*200/3/HPGL_XMAX),
X!         ((double)(HPGL_VCHAR)*100/2/HPGL_YMAX) );
X! /*     1    2             3
X      1. reset to power-up defaults
X      2. set SCaling
X      3. set character size
X--- 60,101 ----
X  */
X  }
X
X! PCL_PORT_init()
X  {
X!       fputs("\033E\033&l1X\033&l0O\033&2A\033%0B;PW0.15\n",outfile);
X! /*           1      2       3       4     5     6
X!     1. reset the printer
X!     2. one copy
X!     3. portrait orientation
X!     4. use letter paper
X!     5. enter HP-GL/2 with old pen position
X!     6. Pen Width
X! */
X  }
X
X! PCL_LAND_init()
X  {
X      fputs("\033E\033&l1X\033&l1O\033%0B;PW0.15\n",outfile);
X+ /*
X+                  1      2       3       4     5
X+     1. reset the printer
X+     2. one copy
X+     3. landscape orientation
X+     4. enter HP-GL/2 with old pen position
X+     5. Pen Width
X+ */
X  }
X
X
X! PCL_graphics()
X  {
X      fprintf(outfile,
X      "\033%0B\nIN;\nSC0,%d,0,%d;\nSR%f,%f;\n",
X!         PCL_XMAX,PCL_YMAX,
X!         ((double)(PCL_HCHAR)*200/3/PCL_XMAX),
X!         ((double)(PCL_VCHAR)*100/2/PCL_YMAX) );
X! /*     0         1    2             3
X!     0. enter HPGL/2 mode
X      1. reset to power-up defaults
X      2. set SCaling
X      3. set character size
X***************
X*** 90,96 ****
X  }
X
X
X! HPLJIII_text()
X  {
X      fputs("PU;\nSP0;\n\033.Z\0",outfile);
X  /*           1    2     3
X--- 119,125 ----
X  }
X
X
X! PCL_text()
X  {
X      fputs("PU;\nSP0;\n\033.Z\0",outfile);
X  /*           1    2     3
X***************
X*** 98,104 ****
X      2. park pen
X      3. disable eavesdropping
X  */
X!     fputs("\033%0A\033E\n",outfile);
X  }
X
X  HPGL_text()
X--- 127,138 ----
X      2. park pen
X      3. disable eavesdropping
X  */
X!     fputs("\n\033%1A\n\033&l0H\0",outfile);
X! /*               1    2      3
X!     1. enter PCL
X!     2. eject page
X!     3. reset printer
X! */
X  }
X
X  HPGL_text()
X***************
X*** 156,162 ****
X--- 190,207 ----
X      fprintf(outfile,"LB%s\003\n",str);
X  }
X
X+ PCL_put_text(x,y,str)
X+ int x, y;
X+ char *str;
X+ {
X+         if (HPGL_ang == 1)
X+                 HPGL_move(x + PCL_VCHAR/4,y);
X+         else
X+                 HPGL_move(x,y - PCL_VCHAR/4);
X+         fprintf(outfile,"LB%s\003\n",str);
X+ }
X
X+
X  int HPGL_text_angle(ang)
X  int ang;
X  {
X***************
X*** 170,181 ****
X      return TRUE;
X  }
X
X-
X  HPGL_reset()
X  {
X  }
X
X! HPLJIII_reset()
X  {
X!     fputs("\033%0A\033E\n",outfile);
X  }
X--- 215,229 ----
X      return TRUE;
X  }
X
X  HPGL_reset()
X  {
X+        fprintf(outfile,"PG;\n");
X+        /*  This HPGL command is ignored in HPGL/2 */
X  }
X
X!
X! PCL_reset()
X  {
X!     fputs("\033%0A\033&l0H\033E\n",outfile);
X! /*         PCL mode   eject reset  */
X  }
Xdiff -rc gnuplot/term/hpljii.trm gnuplot3.2/term/hpljii.trm
X*** gnuplot/term/hpljii.trm    Tue Jun 18 10:21:24 1991
X--- gnuplot3.2/term/hpljii.trm    Wed Mar 25 08:00:45 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - hpljii.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: hpljii.trm,v 3.26 92/03/24 22:34:57 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - hpljii.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 24,30 ****
X   *  Russell Lang
X   *  Maurice Castro
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 28,34 ----
X   *  Russell Lang
X   *  Maurice Castro
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/imagen.trm gnuplot3.2/term/imagen.trm
X*** gnuplot/term/imagen.trm    Tue Aug 13 15:26:35 1991
X--- gnuplot3.2/term/imagen.trm    Wed Mar 25 08:00:46 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - imagen.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: imagen.trm,v 3.26 92/03/24 22:35:33 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - imagen.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 22,28 ****
X   * AUTHORS
X   *   Paul E. McKenney, David Kotz
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 26,32 ----
X   * AUTHORS
X   *   Paul E. McKenney, David Kotz
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/impcodes.h gnuplot3.2/term/impcodes.h
X*** gnuplot/term/impcodes.h    Mon Mar 26 15:03:20 1990
X--- gnuplot3.2/term/impcodes.h    Wed Mar 25 08:00:46 1992
X***************
X*** 1,4 ****
X--- 1,8 ----
X  /*
X+  * $Id: impcodes.h,v 3.26 92/03/24 22:35:32 woo Exp Locker: woo $
X+  */
X+
X+ /*
X   * Copyright (c) 1985 Regents of the University of California.
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
Xdiff -rc gnuplot/term/iris4d.trm gnuplot3.2/term/iris4d.trm
X*** gnuplot/term/iris4d.trm    Fri Jul 12 10:57:02 1991
X--- gnuplot3.2/term/iris4d.trm    Wed Mar 25 08:00:47 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - iris4d.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: iris4d.trm,v 3.26 92/03/24 22:35:35 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - iris4d.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 24,30 ****
X   *           (Applied Research Corporation) 7/1/89
X   *           INTERNET: [e-mail]
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 28,34 ----
X   *           (Applied Research Corporation) 7/1/89
X   *           INTERNET: [e-mail]
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/kyo.trm gnuplot3.2/term/kyo.trm
X*** gnuplot/term/kyo.trm    Sun Dec  2 22:17:06 1990
X--- gnuplot3.2/term/kyo.trm    Wed Mar 25 08:00:48 1992
X***************
X*** 1,3 ****
X--- 1,7 ----
X+ /*
X+  * $Id: kyo.trm,v 3.26 92/03/24 22:35:36 woo Exp Locker: woo $
X+  */
X+
X  /* Prescribe (KYOCERA) driver - Michael Waldor */
X  /* Modified for gnuplot 2.0 sk@sun4 24-Apr-1990 13:23 */
X  #ifdef PRESCRIBE
Xdiff -rc gnuplot/term/latex.trm gnuplot3.2/term/latex.trm
X*** gnuplot/term/latex.trm    Sun Jan  5 21:33:34 1992
X--- gnuplot3.2/term/latex.trm    Wed Mar 25 08:00:49 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - latex.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: latex.trm,v 3.26 92/03/24 22:35:37 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - latex.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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,29 ****
X   * AUTHORS
X   *   David Kotz, Russell Lang
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 27,33 ----
X   * AUTHORS
X   *   David Kotz, Russell Lang
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
X***************
X*** 404,410 ****
X         /* first, figure out increments for x and y */
X         if (x2 == x1) {
X            xinc = 0.0;
X!           yinc = dotspace;
X         } else {
X            slope = ((float)y2-y1)/((float)x2-x1);
X            xinc = dotspace / sqrt(1 + slope*slope) * sign(x2-x1);
X--- 408,414 ----
X         /* first, figure out increments for x and y */
X         if (x2 == x1) {
X            xinc = 0.0;
X!           yinc = (y2-y1>0)?dotspace:-dotspace;
X         } else {
X            slope = ((float)y2-y1)/((float)x2-x1);
X            xinc = dotspace / sqrt(1 + slope*slope) * sign(x2-x1);
XOnly in gnuplot3.2/term: next.trm
Xdiff -rc gnuplot/term/object.h gnuplot3.2/term/object.h
X*** gnuplot/term/object.h    Mon Mar 26 15:03:24 1990
X--- gnuplot3.2/term/object.h    Wed Mar 25 08:00:49 1992
X***************
X*** 1,3 ****
X--- 1,7 ----
X+ /*
X+  * $Id: object.h,v 3.26 92/03/24 22:35:34 woo Exp Locker: woo $
X+  */
X+
X  /*
X   *    FIG : Facility for Interactive Generation of figures
X   *
XOnly in gnuplot3.2/term: pbm.trm
Xdiff -rc gnuplot/term/pc.trm gnuplot3.2/term/pc.trm
X*** gnuplot/term/pc.trm    Sun Aug  4 13:19:18 1991
X--- gnuplot3.2/term/pc.trm    Wed Mar 25 08:00:50 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - pc.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: pc.trm,v 3.26 92/03/24 22:35:39 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - pc.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 25,31 ****
X   * AUTHORS
X   *  Colin Kelley, Thomas Williams, William Wilson, Russell Lang
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 29,35 ----
X   * AUTHORS
X   *  Colin Kelley, Thomas Williams, William Wilson, Russell Lang
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/post.trm gnuplot3.2/term/post.trm
X*** gnuplot/term/post.trm    Sun Jan  5 21:33:35 1992
X--- gnuplot3.2/term/post.trm    Wed Mar 25 08:00:51 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - post.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: post.trm,v 3.26 92/03/24 22:35:40 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - post.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 22,28 ****
X   * AUTHORS
X   *  Russell Lang
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   * The 'postscript' driver produces landscape output 10" wide and 7" high.
X   * To change font to Times-Roman and font size to 20pts use
X--- 26,32 ----
X   * AUTHORS
X   *  Russell Lang
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   * The 'postscript' driver produces landscape output 10" wide and 7" high.
X   * To change font to Times-Roman and font size to 20pts use
Xdiff -rc gnuplot/term/qms.trm gnuplot3.2/term/qms.trm
X*** gnuplot/term/qms.trm    Mon Mar 26 15:03:06 1990
X--- gnuplot3.2/term/qms.trm    Wed Mar 25 08:00:52 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - qms.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: qms.trm,v 3.26 92/03/24 22:35:41 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - qms.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 22,28 ****
X   * AUTHORS
X   *  Colin Kelley, Thomas Williams, Russell Lang
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 26,32 ----
X   * AUTHORS
X   *  Colin Kelley, Thomas Williams, Russell Lang
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/regis.trm gnuplot3.2/term/regis.trm
X*** gnuplot/term/regis.trm    Mon Mar 26 15:03:08 1990
X--- gnuplot3.2/term/regis.trm    Wed Mar 25 08:00:53 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - regis.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: regis.trm,v 3.26 92/03/24 22:35:42 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - regis.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 22,28 ****
X   * AUTHORS
X   *  Colin Kelley, Thomas Williams
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 26,32 ----
X   * AUTHORS
X   *  Colin Kelley, Thomas Williams
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/sun.trm gnuplot3.2/term/sun.trm
X*** gnuplot/term/sun.trm    Mon Mar 26 15:02:46 1990
X--- gnuplot3.2/term/sun.trm    Wed Mar 25 08:00:54 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - sun.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: sun.trm,v 3.26 92/03/24 22:35:43 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - sun.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 22,28 ****
X   * AUTHORS
X   *  Maurice Castro
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 26,32 ----
X   * AUTHORS
X   *  Maurice Castro
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/t410x.trm gnuplot3.2/term/t410x.trm
X*** gnuplot/term/t410x.trm    Tue Sep 18 14:59:16 1990
X--- gnuplot3.2/term/t410x.trm    Wed Mar 25 08:00:54 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - t410x.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: t410x.trm,v 3.26 92/03/24 22:35:44 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - t410x.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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,27 ****
X   * AUTHORS
X   *   Colin Kelley, Thomas Williams
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 25,31 ----
X   * AUTHORS
X   *   Colin Kelley, Thomas Williams
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/tek.trm gnuplot3.2/term/tek.trm
X*** gnuplot/term/tek.trm    Tue Jun 18 10:00:02 1991
X--- gnuplot3.2/term/tek.trm    Wed Mar 25 08:00:55 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - tek.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: tek.trm,v 3.26 92/03/24 22:35:45 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - tek.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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,29 ****
X   * AUTHORS
X   *   Colin Kelley, Thomas Williams, Russell Lang
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 27,33 ----
X   * AUTHORS
X   *   Colin Kelley, Thomas Williams, Russell Lang
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
X***************
X*** 356,359 ****
X  {
X      fprintf(outfile,"\033[?38l");
X  }
X! #endif LN03P
X--- 360,363 ----
X  {
X      fprintf(outfile,"\033[?38l");
X  }
X! #endif /* LN03P */
Xdiff -rc gnuplot/term/unixpc.trm gnuplot3.2/term/unixpc.trm
X*** gnuplot/term/unixpc.trm    Fri Jul 26 09:36:50 1991
X--- gnuplot3.2/term/unixpc.trm    Wed Mar 25 08:00:56 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - unixpc.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: unixpc.trm,v 3.26 92/03/24 22:35:46 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - unixpc.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 22,28 ****
X   * AUTHORS
X   *    John Campbell
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 26,32 ----
X   * AUTHORS
X   *    John Campbell
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/unixplot.trm gnuplot3.2/term/unixplot.trm
X*** gnuplot/term/unixplot.trm    Mon Mar 26 15:03:16 1990
X--- gnuplot3.2/term/unixplot.trm    Wed Mar 25 08:00:57 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT -- unixplot.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: unixplot.trm,v 3.26 92/03/24 22:35:47 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT -- unixplot.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 22,28 ****
X   * AUTHORS
X   *  Colin Kelley, Thomas Williams, Russell Lang
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 26,32 ----
X   * AUTHORS
X   *  Colin Kelley, Thomas Williams, Russell Lang
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/v384.trm gnuplot3.2/term/v384.trm
X*** gnuplot/term/v384.trm    Mon Mar 26 15:03:18 1990
X--- gnuplot3.2/term/v384.trm    Wed Mar 25 08:00:58 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - v384.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: v384.trm,v 3.26 92/03/24 22:35:48 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - v384.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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*** 22,28 ****
X   * AUTHORS
X   *   [e-mail] (Roland Yap)
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 26,32 ----
X   * AUTHORS
X   *   [e-mail] (Roland Yap)
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/vws.trm gnuplot3.2/term/vws.trm
X*** gnuplot/term/vws.trm    Sun Sep  8 09:49:56 1991
X--- gnuplot3.2/term/vws.trm    Wed Mar 25 08:00:59 1992
X***************
X*** 1,6 ****
X  /* GNUPLOT - vws.trm */
X  /*
X!  * Copyright (C) 1990
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+ /*
X+  * $Id: vws.trm,v 3.26 92/03/24 22:35:51 woo Exp Locker: woo $
X+  */
X+
X  /* GNUPLOT - vws.trm */
X  /*
X!  * Copyright (C) 1990, 1991, 1992
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,29 ****
X   *   Walter Speth
X   *           BITNET: SPETH@DBNPIB5
X   *
X!  * send your comments or suggestions to (pixar![e-mail]).
X   *
X   */
X
X--- 27,33 ----
X   *   Walter Speth
X   *           BITNET: SPETH@DBNPIB5
X   *
X!  * send your comments or suggestions to ([e-mail]).
X   *
X   */
X
Xdiff -rc gnuplot/term/x11.trm gnuplot3.2/term/x11.trm
X*** gnuplot/term/x11.trm    Thu Jul 25 09:12:23 1991
X--- gnuplot3.2/term/x11.trm    Wed Mar 25 08:00:59 1992
X***************
X*** 1,4 ****
X--- 1,8 ----
X  /*
X+  * $Id: x11.trm,v 3.26 92/03/24 22:35:49 woo Exp Locker: woo $
X+  */
X+
X+ /*
X   *    x11.trm  --- inboard terminal driver for X11
X   */
X
X***************
X*** 11,18 ****
X  #define X11_VTIC (X11_YMAX/100)
X  #define X11_HTIC (X11_XMAX/150)
X
X! #define X11_nopts 22
X  char X11_opts[X11_nopts][20] = {
X     "-iconic", "-rv", "-reverse", "+rv", "-synchronous",
X     "-display", "-geometry", "-bg", "-background", "-bd", "-bordercolor", "-bw",
X     "-borderwidth", "-fg", "-foreground", "-fn", "-font", "-name",
X--- 15,23 ----
X  #define X11_VTIC (X11_YMAX/100)
X  #define X11_HTIC (X11_XMAX/150)
X
X! #define X11_nopts 25
X  char X11_opts[X11_nopts][20] = {
X+    "-mono", "-gray", "-clear",
X     "-iconic", "-rv", "-reverse", "+rv", "-synchronous",
X     "-display", "-geometry", "-bg", "-background", "-bd", "-bordercolor", "-bw",
X     "-borderwidth", "-fg", "-foreground", "-fn", "-font", "-name",
X***************
X*** 19,24 ****
X--- 24,30 ----
X     "-selectionTimeout", "-title", "-xnllanguage", "-xrm"
X     };
X  int X11_optarg[X11_nopts] = {
X+    0, 0, 0,
X     0, 0, 0, 0, 0,
X     1, 1, 1, 1, 1, 1, 1,
X     1, 1, 1, 1, 1, 1,
X***************
X*** 25,34 ****
X     1, 1, 1, 1
X     };
X
X! FILE *X11_pipe, *popen();
X! char X11_command[1024]= "gnuplot_x11 -name gnuplot";
X
X-
X  /*   X11_args - scan gnuplot command line for standard X Toolkit options */
X
X  X11_args(argc, argv) int argc; char *argv[]; {
X--- 31,39 ----
X     1, 1, 1, 1
X     };
X
X! FILE *X11_ipc;
X! char X11_command[1024]= "gnuplot_x11";
X
X  /*   X11_args - scan gnuplot command line for standard X Toolkit options */
X
X  X11_args(argc, argv) int argc; char *argv[]; {
X***************
X*** 54,83 ****
X     return(nx11);
X     }
X
X  #ifdef ULTRIX_KLUDGE
X! #define X11_ULTRIX_KLUDGE fprintf (X11_pipe, "E\n"); fflush (X11_pipe);
X! #else
X! #define X11_ULTRIX_KLUDGE
X  #endif
X
X! X11_init() { X11_pipe = popen(X11_command, "w"); }
X
X! X11_reset() { fprintf(X11_pipe, "R\n"); fflush(X11_pipe); pclose(X11_pipe); }
X
X! X11_text() { fprintf(X11_pipe, "E\n"); fflush(X11_pipe); X11_ULTRIX_KLUDGE }
X
X! X11_graphics() { fprintf(X11_pipe, "G\n"); }
X
X! X11_move(x,y) unsigned int x,y; { fprintf(X11_pipe, "M%04d%04d\n", x, y); }
X
X! X11_vector(x,y) unsigned int x,y; { fprintf(X11_pipe, "V%04d%04d\n", x, y); }
X
X! X11_linetype(lt) int lt; { fprintf(X11_pipe, "L%04d\n", lt); }
X
X  X11_put_text(x,y,str) unsigned int x,y; char str[]; {
X!    fprintf(X11_pipe, "T%04d%04d%s\n", x, y, str);
X     }
X  X11_justify_text(mode) enum JUSTIFY mode; {
X!    fprintf(X11_pipe, "J%04d\n", mode);
X     return(TRUE);
X     }
X--- 59,130 ----
X     return(nx11);
X     }
X
X+ #ifndef CRIPPLED_SELECT
X+ /*-----------------------------------------------------------------------------
X+  *   use pipe IPC on most platforms
X+  *---------------------------------------------------------------------------*/
X+ FILE *popen();
X+
X+ X11_init() { X11_ipc = popen(X11_command, "w"); }
X+
X+ X11_graphics() { fprintf(X11_ipc, "G\n"); }
X+
X+ X11_text() {
X+    fprintf(X11_ipc, "E\n"); fflush(X11_ipc);
X  #ifdef ULTRIX_KLUDGE
X!    fprintf(X11_ipc, "E\n"); fflush(X11_ipc);
X  #endif
X+    }
X
X! X11_reset() { fprintf(X11_ipc, "R\n"); fflush(X11_ipc); pclose(X11_ipc); }
X
X! #else   /* CRIPPLED_SELECT */
X! /*-----------------------------------------------------------------------------
X!  *   use file IPC on the others
X!  *---------------------------------------------------------------------------*/
X
X! char X11_tmp[32], X11_tmp0[32], X11_shutdown[32];
X! int X11_pid;
X
X! X11_init() {
X!    if (!(X11_pid = fork())) {
X!       execl("/bin/sh", "sh", "-c", X11_command, NULL);
X!       _exit(1);
X!       }
X!    sprintf(X11_tmp, "/tmp/Gnuplot_%d", X11_pid);
X!    sprintf(X11_tmp0, "%s-", X11_tmp);
X!    sprintf(X11_shutdown,  "echo R >%s",X11_tmp);
X!    }
X
X! X11_graphics() {
X!    X11_ipc = fopen(X11_tmp0, "w");
X!    if (!X11_ipc) { perror(X11_tmp0); system(X11_shutdown); exit(1); }
X!    fprintf(X11_ipc, "G\n");
X!    }
X
X! X11_text() {
X!    fprintf(X11_ipc, "E\n");
X! #ifdef ULTRIX_KLUDGE
X!    fprintf(X11_ipc, "E\n");
X! #endif
X!    fclose(X11_ipc);
X!    rename(X11_tmp0, X11_tmp);
X!    }
X
X! X11_reset() { system(X11_shutdown); }
X
X+ #endif  /* CRIPPLED_SELECT */ /*---------------------------------------------*/
X+
X+ X11_move(x,y) unsigned int x,y; { fprintf(X11_ipc, "M%04d%04d\n", x, y); }
X+
X+ X11_vector(x,y) unsigned int x,y; { fprintf(X11_ipc, "V%04d%04d\n", x, y); }
X+
X+ X11_linetype(lt) int lt; { fprintf(X11_ipc, "L%04d\n", lt); }
X+
X  X11_put_text(x,y,str) unsigned int x,y; char str[]; {
X!    fprintf(X11_ipc, "T%04d%04d%s\n", x, y, str);
X     }
X  X11_justify_text(mode) enum JUSTIFY mode; {
X!    fprintf(X11_ipc, "J%04d\n", mode);
X     return(TRUE);
X     }
END_OF_FILE
  if test 28597 -ne `wc -c <'patch.7'`; then
    echo shar: \"'patch.7'\" unpacked with wrong size!
  fi
  # end of 'patch.7'
fi
echo shar: End of archive 1 \(of 7\).
cp /dev/null ark1isdone
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...