diff -urN gnuplot-3.7/0FAQ gnuplot-3.7.1/0FAQ
--- gnuplot-3.7/0FAQ	Wed Jan  6 15:50:48 1999
+++ gnuplot-3.7.1/0FAQ	Wed Oct 20 17:35:42 1999
@@ -1,171 +1,133 @@
-* Please note that this is not the current official FAQ since
-* I have upgraded the info in answer 4.0 - dd
-* Made more changes - lh
-
-Archive-name: graphics/gnuplot-faq
-Version: Mon Sep 23 04:23:01 CES 1996
-Posting-frequency: every 14 days
-URL: http://www.uni-karlsruhe.de/~ig25/gnuplot-faq/
-
-   comp.graphics.apps.gnuplot
-
-        comp.graphics.apps.gnuplot FAQ (Frequent Answered Questions)
-
-   This is the FAQ (Frequently Answered Questions) list of the
-   comp.graphics.apps.gnuplot newsgroup, which discusses the gnuplot
-   program for plotting 2D - and 3D - graphs.
-
-   Most of the information in this document came from public discussion
-   on comp.graphics.apps.gnuplot; quotations are believed to be in the
-   public domain.
-
-   If you are reading this via WWW, and you can't access the individual
-   pages, please select here, then try again.
-
-   Here's a list of the questions. If you are looking for the answer for
-   a specific question, look for the string Qx.x: at the beginning of a
-   line, with x.x being the question number. Sections in this FAQ are
-     * 0. Meta-Questions
-     * 1. General Information
-     * 2. Setting it up
-     * 3. Working with it
-     * 4. Wanted features
-     * 5. Miscellaneous
-     * 6. Making life easier
-     * 7. Known problems
-     * 8. Credits
-
-
-Questions:
-
-  Section 0: Meta - Questions
-
-     * Q0.1: Where do I get this document?
-     * Q0.2: Where do I send comments about this document?
-
-  Section 1: General Information
-
-     * Q1.1: What is gnuplot?
-     * Q1.2: How did it come about and why is it called gnuplot?
-     * Q1.3: Does gnuplot have anything to do with the FSF and the
-       GNU project?
-     * Q1.4: What does gnuplot offer?
-     * Q1.5: Is gnuplot suitable for batch processing?
-     * Q1.6: Can I run gnuplot on my computer?
-
-  Section 2: Setting it up
-
-     * Q2.1: What is the current version of gnuplot?
-     * Q2.2: Where can I get gnuplot?
-     * Q2.3: How do I get gnuplot to compile on my system?
-     * Q2.4: What documentation is there, and how do I get it?
-
-  Section 3: Working with it
-
-     * Q3.1: How do I get help?
-     * Q3.2: How do I print out my graphs?
-     * Q3.3: How do I include my graphs in <word processor>?
-     * Q3.4: How do I post-process a gnuplot graph?
-     * Q3.5: How do I change symbol size, line thickness and the
-       like?
-     * Q3.6: How do I generate plots in GIF format?
-
-  Section 4: Wanted features
-
-     * Q4.0: What's new in gnuplot 3.7?
-     * Q4.1: Does gnuplot have hidden line removal?
-     * Q4.2: Does gnuplot support bar-charts/histograms/boxes?
-     * Q4.3: Does gnuplot support multiple y-axes on a single plot?
-     * Q4.4: Can I put multiple plots on a single page?
-     * Q4.5: Can I put both data files and commands into a single
-       file?
-     * Q4.6: Can I put Greek letters and super/subscripts into my
-       labels?
-     * Q4.7 Can I do 1:1 scaling of axes?
-     * Q4.8: Can I put tic marks for x and y axes into 3d plots?
-     * Q4.9: Does gnuplot support a driver for <graphics format>?
-     * Q4.10: Can I put different text sizes into my plots?
-     * Q4.11: How do I modify gnuplot?
-     * Q4.12: How do I skip data points?
-
-  Section 5: Miscellaneous
-
-     * Q5.1: I've found a bug, what do I do?
-     * Q5.2: Can I use gnuplot routines for my own programs?
-     * Q5.3: What extensions have people made to gnuplot? Where can I
-       get them?
-     * Q5.4: Can I do heavy-duty data processing with gnuplot?
-     * Q5.5: I have ported gnuplot to another system, or patched it.
-       What do I do?
-     * Q5.6: I want to help in developing gnuplot 3.7. What can I do?
-
-  Section 6: Making life easier
-
-     * Q6.1: How do I plot two functions in non-overlapping regions?
-     * Q6.2: How do I run my data through a filter before plotting?
-     * Q6.3: How do I make it easier to use gnuplot with LaTeX?
-     * Q6.4: How do I save and restore my settings?
-     * Q6.5: How do I plot lines (not grids) using splot?
-     * Q6.6: How do I plot a function f(x,y) which is bounded by
-       other functions in the x-y plain?
-     * Q6.7: How do I get rid of <feature in a plot>?
-     * Q6.8: How do I call gnuplot from my own programs ?
-
-  Section 7: Known Problems
-
-     * Q7.1: Gnuplot is not plotting any points under X11! How come?
-     * Q7.2: My isoline data generated by a Fortran program is not
-       handled correctly. What can I do?
-     * Q7.3: Why does gnuplot ignore my very small numbers?
-     * Q7.4: Gnuplot is plotting nothing when run via gnuplot
-       <filename>! What can I do?
-     * Q7.5: My formulas are giving me nonsense results! What's going
-       on?
-     * Q7.6: My Linux gnuplot complains about a missing gnuplot_x11.
-       What is wrong?
-     * Q7.7: set output 'filename' isn't outputting everything it
-       should!
-
-  Section 8: Credits
-
-  Section 0: Meta-Questions.
-
-   Q0.1: Where do I get this document?
-          This document is posted about once every two weeks to the
-          newsgroups comp.graphics.apps.gnuplot, comp.answers and
-          news.answers. Like many other FAQ's, its newest (plaintext)
-          version is available via anonymous ftp from
-          ftp://rtfm.mit.edu/pub/usenet/news.answers/graphics/gnuplot
-          -faq.
-
-          If you have access to the WWW, you can get the newest version
-          of this document from
-          http://www.uni-karlsruhe.de/~ig25/gnuplot-faq/
-
-   Q0.2: Where do I send comments about this document?
-          Send comments, suggestions etc. via e-mail to Thomas
-          Koenig, Thomas.Koenig@ciw.uni-karlsruhe.de or
-          ig25@dkauni2.bitnet.
-
-
-  Section 1: General Information
-
-   Q1.1: What is gnuplot?
-          Gnuplot is a command-driven interactive function plotting
-          program. It can be used to plot functions and data points in
-          both two- and three- dimensional plots in many different
-          formats, and will accommodate many of the needs of today's
-          scientists for graphic data representation. Gnuplot is
-          copyrighted, but freely distributable; you don't have to pay
-          for it.
+[next] [up] [previous]
 
-   Q1.2: How did it come about and why is it called gnuplot?
-          The authors of gnuplot are:
+                                 Gnuplot FAQ
 
-          Thomas Williams, Colin Kelley, Russell Lang, Dave Kotz, John
-          Campbell, Gershon Elber, Alexander Woo and many others.
+Contents
 
-          The following quote comes from Thomas Williams:
+   * Contents
+   * Meta - Questions
+        o 0.1 Where do I get this document?
+        o 0.2 Where do I send comments about this document?
+   * 1. General Information
+        o 1.1 What is gnuplot?
+        o 1.2 How did it come about and why is it called gnuplot?
+        o 1.3 Does gnuplot have anything to do with the FSF and the GNU
+          project?
+        o 1.4 What does gnuplot offer?
+        o 1.5 Is gnuplot suitable for batch processing?
+        o 1.6 Can I run gnuplot on my computer?
+        o 1.7 Legalize it!
+        o 1.8 Is gnuplot Y2K compliant?
+        o 1.9 Where do I get further information?
+   * 2. Setting it up
+        o 2.1 What is the current version of gnuplot?
+        o 2.2 Where can I get gnuplot?
+        o 2.3 How do I get gnuplot to compile on my system?
+        o 2.4 What documentation is there, and how do I get it?
+   * 3. Working with it.
+        o 3.1 How do I get help?
+        o 3.2 How do I print out my graphs?
+        o 3.3 How do I include my graphs in <word processor>?
+        o 3.4 How do I post-process a gnuplot graph?
+        o 3.5 How do I change symbol size, line thickness and the like?
+        o 3.6 How do I generate plots in the GIF format?
+        o 3.7 Can I animate my graphs?
+        o 3.8 How do I plot implicit defined graphs?
+   * 4. Wanted features
+        o 4.1 What's new in gnuplot 3.7?
+        o 4.2 Does gnuplot have hidden line removal?
+        o 4.3 Does gnuplot support bar-charts/histograms/boxes?
+        o 4.4 Does gnuplot support pie charts?
+        o 4.5 Does gnuplot quarterly time charts?
+        o 4.6 Does gnuplot support multiple y-axes on a single plot?
+        o 4.7 Can I put multiple pages on one page?
+        o 4.8 Can I put both data files and commands into a single file?
+        o 4.9 Can I put Greek letters and super/subscripts into my labels?
+        o 4.10 Can I do 1:1 scaling of axes?
+        o 4.11 Can I put tic marks for x and y axes into 3d plots?
+        o 4.12 Does gnuplot support a driver for <graphics format>?
+        o 4.13 Can I put different text sizes into my plots?
+        o 4.14 How do I modify gnuplot, and apply 'patches'?
+        o 4.15 How do I skip data points?
+        o 4.16 How do I plot every nth point?
+        o 4.17 How do I plot a vertical line?
+   * 5. Miscellaneous
+        o 5.1 I've found a bug, what do I do?
+        o 5.2 Can I use gnuplotroutines for my own programs?
+        o 5.3 What extensions have people made to gnuplot? Where can I get
+          them?
+        o 5.4 Can I do heavy-duty data processing with gnuplot?
+        o 5.5 I have ported gnuplotto another system, or patched it. What do
+          I do?
+        o 5.6 I want to help in developing the next version of gnuplot. What
+          can I do?
+   * 6. Making life easier
+        o 6.1 How do I plot two functions in non-overlapping regions?
+        o 6.2 How do I run my data through a filter before plotting?
+        o 6.3 How do I make it easier to use gnuplot with LATEX?
+        o 6.4 How do I save and restore my settings?
+        o 6.5 How do I plot lines (not grids) using splot?
+        o 6.6 How do I plot a function f(x,y) which is bounded by other
+          functions in the x-y plain?
+        o 6.7 How do I get rid of <feature in a plot>?
+        o 6.8 How do I call gnuplot from my own programs?
+        o 6.9 What if I need h-bar (Planck's constant)?
+   * 7. Known Problems
+        o 7.1 Gnuplot is not plotting any points under X11! How come?
+        o 7.2 My isoline data generated by a Fortran program is not handled
+          correctly. What can I do?
+        o 7.3 Why does gnuplot ignore my very small numbers?
+        o 7.4 Gnuplot is plotting nothing when run via gnuplot <filename>!
+          What can I do?
+        o 7.5 My formulas are giving me nonsense results! What's going on?
+        o 7.6 Set output 'filename' isn't outputting everything it should!
+        o 7.7 When using the LATEX-terminal, there is an error during the
+          LATEX-run!
+        o 7.8 The exit command does not work as documented!
+        o 7.9 I can't find the demos and example files at the URLs in the
+          documentation!
+        o 7.10 Calling gnuplot in a pipe or with a gnuplot-script doesn't
+          produce aplot!
+   * 8. Credits
+
+Meta - Questions
+
+0.1 Where do I get this document?
+
+This document is posted about once every two weeks to the newsgroups
+comp.graphics.apps.gnuplot . Its newest (plaintext) version is available via
+anonymous ftp from ftp.ucc.ie in /pub/gnuplot/faq/gnuplot-faq.txt .
+
+If you have access to the WWW, you can get the newest version of this
+document from ~http://www.ucc.ie/gnuplot/gnuplot-faq.html .
+
+Today's version is version Revision: 1.4, dated Date: 99/10/07 09:37:56
+
+0.2 Where do I send comments about this document?
+
+Send comments, suggestions etc via email to the developer newsgroup
+info-gnuplot-beta@Dartmouth.EDU and additionally to j.vonhagen@web.de .
+
+1. General Information
+
+1.1 What is gnuplot?
+
+gnuplot is a command-driven interactive function plotting program. It can be
+used to plot functions and data points in both two- and three-dimensional
+plots in many different formats, and will accommodate many of the needs of
+today's scientists for graphic data representation. gnuplot is copyrighted,
+but freely distributable; you don't have to pay for it.
+
+This document deals with gnuplot Version 3.7 which is the latest official
+release as of October 20, 1999. References to bug-fix versions or (recent)
+beta versions are explicitly marked.
+
+1.2 How did it come about and why is it called gnuplot?
+
+The authors of gnuplot are: Thomas Williams, Colin Kelley, Russell Lang,
+Dave Kotz, John Campbell, Gershon Elber, Alexander Woo and many others.
+
+The following quote comes from Thomas Williams:
 
      I was taking a differential equation class and Colin was taking
      Electromagnetics, we both thought it'd be helpful to visualize the
@@ -174,12 +136,12 @@
      some coding. The posting was better received than we expected, and
      prompted us to add some, albeit lame, support for file data.
 
-     Any reference to GNUplot is incorrect. The real name of the program
-     is "gnuplot". You see people use "Gnuplot" quite a bit because many
-     of us have an aversion to starting a sentence with a lower case
-     letter, even in the case of proper nouns and titles. Gnuplot is not
-     related to the GNU project or the FSF in any but the most
-     peripheral sense. Our software was designed completely
+     Any reference to GNUplot is incorrect. The real name of the
+     program is "gnuplot". You see people use "gnuplot" quite a bit
+     because many of us have an aversion to starting a sentence with a
+     lower case letter, even in the case of proper nouns and titles.
+     gnuplot is not related to the GNU project or the FSF in any but
+     the most peripheral sense. Our software was designed completely
      independently and the name "gnuplot" was actually a compromise. I
      wanted to call it "llamaplot" and Colin wanted to call it "nplot."
      We agreed that "newplot" was acceptable but, we then discovered
@@ -187,994 +149,910 @@
      that the Computer Science Dept. occasionally used. I decided that
      "gnuplot" would make a nice pun and after a fashion Colin agreed.
 
-   Q1.3: Does gnuplot have anything to do with the FSF and the GNU
-          project?
-          Gnuplot is neither written nor maintained by the FSF. It is not
-          covered by the General Public License, either.
+1.3 Does gnuplot have anything to do with the FSF and the GNU project?
+
+Gnuplot is neither written nor maintained by the FSF. It is not covered by
+the General Public License, either. It used to be distributed by the FSF,
+however, due to licensing issues it is no longer.
+
+Gnuplot is freeware in the sense that you don't have to pay for it. However
+it is not freeware in the sense that you would be allowed to distribute a
+modified version of your gnuplot freely. Please read and accept the
+Copyright file in your distribution.
+
+1.4 What does gnuplot offer?
+
+   * Plotting of two-dimensional functions and data points in many different
+     styles (points, lines, error bars)
+   * computations in integer, float and complex arithmetic
+   * plotting of three-dimensional data points and surfaces in many
+     different styles (contour plot, mesh).
+   * support for complex arithmetic
+   * self - defined functions
+   * support for a large number of operating systems, graphics file formats
+     and devices
+   * extensive on-line help
+   * labels for title, axes, data points
+   * command line editing and history on most platforms
+
+1.5 Is gnuplot suitable for batch processing?
+
+Yes. You can read in files from the command line, or you can redirect your
+standard input to read from a file. Both data and command files can be
+generated automatically, from data acquisition programs or whatever else you
+use.
+
+1.6 Can I run gnuplot on my computer?
+
+Gnuplot is available for a number of platforms. These are: Unix (X11 and
+NeXTSTEP), VAX/VMS, OS/2, MS-DOS, Amiga, MS-Windows, OS-9/68k, Atari ST,
+BeOS, and the Macintosh.
+
+Please notify the FAQ-maintainer of any further ports you might be aware of.
+
+You should be able to compile the gnuplot source more or less out of the box
+on any reasonable standard (ANSI/ISO C, POSIX) environment.
+
+1.7 Legalize it!
+
+Gnuplot is freeware authored by a collection of volunteers, who cannot make
+any legal statement about the compliance or non-compliance of gnuplot or its
+uses. There is also no warranty whatsoever. Use at your own risk.
+
+Citing from the README of a mathematical subroutine package by R. Freund:
+
+     For all intent and purpose, any description of what the codes are
+     doing should be construed as being a note of what we thought the
+     codes did on our machine on a particular Tuesday of last year. If
+     you're really lucky, they might do the same for you someday. Then
+     again, do you really feel *that* lucky?
+
+1.8 Is gnuplot Y2K compliant?
+
+Gnuplot's compliance depends in part on the compliance of the underlying
+operating system and hardware. The only use gnuplot makes of a system-
+supplied date is in the "set timestamp" command, which simply echos the date
+on the plot. If the underlying OS cannot produce an accurate time string,
+then the "set timestamp" command may fail to print the correct date on
+plots.
+
+In gnuplot 3.5, if the user chooses to use %y in a timestamp format, rather
+than %Y, it will print 2-digit rather than 4-digit years. The effects depend
+on the importance you place on the timestamps printed on plots.
+
+Gnuplot3.7 also allows the use of time/date data as variables, but the user
+has complete control over the input format of the data and the output format
+of the tic labels - the same 2-digit "%y" (interpreted as 1900+) and 4-digit
+"%Y" formats are both available. But again, these are user-specifiable, so
+if there is a Y2K problem here, it is the responsibility of the user.
+
+Of course, gnuplot is built by executing a makefile, which may well be
+date-dependent. So if the operating system has a Y2K problem, the process of
+building a new executable of gnuplot may be affected. But that wouldn't be a
+problem with gnuplot per se.
+
+IMPORTANT NOTICE
+
+As of gnuplot beta version 3.7.0.9, the interpretation of the "%y" two digit
+year specifier was changed in accordance with the recommendations of The
+Open Group and all major Unix vendors. When a century is not otherwise
+specified, values in the range 69-99 refer to the twentieth century and
+values in the range 00-68 refer to the twenty-first century. Be very careful
+when interpreting 2-digit year expressions.
+
+1.9 Where do I get further information?
+
+The following sites have more information about gnuplot.
+
+   * ~http://www.comnets.rwth-aachen.de/doc/gnu/gnuplot37/gnuplot.html an
+     online documentation in html-format
+   * ~http://www.usf.uni-osnabrueck.de/ breiter/tools/gnuplot/index.en.html
+     has many links to many features and add-ons for gnuplot
+   * ~http://web.math-cs.uni.edu/cs/Help/gnuplot/TOC.html contains an online
+     tutorial
+   * ~http://brian.me.tufts.edu/GnuplotInLaTeX/ contrains infos abount
+     gnuplot and LATEX
+   * ~http://www.eso.org/ ndevilla/gnuplot/ explains the use of a gnuplot
+     API in ANSI C (commonly known as gnuplot_(pipes)
+   * ~http://ricardo.ecn.wfu.edu/ cottrell/qplot/ on how to plot quarterly
+     time data
+   * ~http://monsoon.harvard.edu/ mhagger/download a Python interface for
+     gnuplot
+   * ftp.thewrittenword.com in /free/by-package/ contains Solaris, IRIX,
+     HP-UX and Digital Unix binaries
+   * ~http://www.sci.muni.cz/ mikulik/gnuplot.html has Petr's famous OS/2
+     mouse support and the pm3d terminal for colour 3d surfaces. Furthermore
+     some more links to other sites
+
+Some documentation is available in other languages than English. Those
+include:
+
+   * ~http://mucha.obspm.fr/ grouss/gnuplt/gnuplot.html contient des
+     informations dans la langue de Molière: les 1ers pas avec gnuplot,
+     malheureusement seulement version 3.5
+   * ~http://www.al.lu/euler/gnuplot.shtml encore des informations en langue
+     française avec possibilité de téléchargement des versions binaires
+
+Here are some more sites, however these are somewhat outdated in carrying
+still references to beta versions. If you download software from there you
+should be aware that beta versions are not officially endorsed.
+
+   * ~http://www.cs.dartmouth.edu/gnuplot_info.html slightly outdated site
+     for the 3.6 beta version, but also a web-gateway to the users'
+     newsgroup
+   * ~http://members.theglobe.com/gnuplot/ basically same as above.
+   * ~http://users.ece.gatech.edu/ schooley/gnuplot.html contains a
+     Macintosh version based on 3.6 beta 322
+
+The following sites were said to exist, howevere they seem to be down right
+now.
+
+   * ~http://www.geocities.com/SiliconValley/Foothills/6647/ the copyright
+     statement and some binaries contains ads
+   * ~http://www.delorie.com/gnu/docs/gnuplot/gplot_toc.html doesn't work
+   * picard.tamu.edu in /pub/gnuplot gives a tutorial
+   * ~http://feff.phys.washington.edu/ ravel/gnuplot has a new mode for the
+     users of (X)Emacs
+
+2. Setting it up
+
+2.1 What is the current version of gnuplot?
+
+The current version of gnuplot is 3.7, which has many improvements over 3.5.
+3.6 was never released to avoid confusions with the beta versions.
+
+
+2.2 Where can I get gnuplot?
+
+The source distribution ("gnuplot-3.7.tar.gz" or a similar name) is
+available from the official distribution site and its mirrors.
+
+The main server is ftp.ucc.ie in /pub/gnuplot/ . This server is mirrored by
+several others, among those are
+
+   * mirror.aarnet.edu.au in /pub/gnuplot/
+   * ftp.dartmouth.edu in /pub/gnuplot/
+   * ftp.irisa.fr in /pub/gnuplot/
+   * ftp.gnuplot.vt.edu in /pub/gnuplot/
+
+You can also have a look at the following WWW-pages which provide a source
+to obtain gnuplot:
+
+   * ~http://members.theglobe.com/gnuplot/
+   * ~http://www.geocities.com/SiliconValley/Foothills/6647/
+   * ~http://mirror.aarnet.edu.au/pub/gnuplot/
+
+The current version for the Macintosh is 2.04b, based on gnuplot 3.5
+pre3.6beta338, and is available from
+
+   * ~http://users.ece.gatech.edu/ schooley/ .
+
+Unfortunately, this version does not seem to be maintained anymore.
+
+Source and binary distributions for the Amiga are available on Aminet
+ftp.wustl.edu in  aminet/ and its mirrors, for example ftp.uni-kl.de,
+oes.orst.edu or ftp.luth.se.
+
+MS-DOS and MS-Windows binaries are available from the above servers and are
+called gp37dos.zip, gp37dj.zip, gp37w16.zip, gp37mgw.zip, gnuplot3.7cyg.zip.
+
+OS/2 binaries are called gp37os2.zip.
+
+An X11 Window System front-end is available at
+~http://www.flash.net/ dmishee/xgfe/xgfe.html .
+
+The NeXTSTEP front end can be found at next-ftp.peak.org in
+/pub/next/binaries/plotting/Gnuplot1.2_bin.tar.Z .
+
+A version for OS-9/68K can be found at cabrales.cs.wisc.edu in
+/pub/OSK/GRAPHICS/gnuplot32x.tar.Z ; it includes both an X-Window Systems
+and a non - X-Window Systems version.
+
+Versions for the Atari ST and TT, which include some GEM windowing support,
+are available from ftp.uni-kl.de in /pub/atari/graphics/ , as gplt35st.zip
+and gplt35tt.zip. They work best under MiNT.
+
+Executable files, plus documentation in Japanese, exist for the X680x0 on
+ftp.csis.oita-u.ac.jp in /pub/x68k/fj.binaries.x68000/vol2 .
+
+It is a good idea to look for a nearby ftp site when downloading things. You
+can use archie for this. See if an archie client is installed at your system
+(by simply typing archie at the command prompt), or send mail to
+archie@sura.net with the word 'help' in both the subject line and the body
+of the mail. However, be aware that the version you find at a near ftp site
+may well be out of date; check the last modification date and the number of
+bytes against the newest release at one of the official servers.
+
+If you can't locate a working archie server, you can use other web-based
+search engines for searching for gnuplot. One of these would be Lycos at
+~http://ftpsearch.lycos.com/ .
+
+As of June 1999, the gnuplot distribution is also mirrored at the
+Comprehensive TeX Archive Network (CTAN) in the graphics/gnuplot directory.
+See
+
+   * ~http://www.ctan.org/ .
+
+Bug fixes can also be found at gnuplot distribution sites in the patches
+directory.
+
+2.3 How do I get gnuplot to compile on my system?
+
+As you would any other installation. Read the files README.1ST and README.
+
+For Unix, use configure and make. For DOS, if you are using bash and DJGPP,
+you can just run djconfig.sh. For other platforms, copy the relevant
+makefile from config/ to src, change to src and run make.
+
+2.4 What documentation is there, and how do I get it?
+
+The documentation is included in the source distribution. Look at the docs
+subdirectory, where you'll find
+
+   * a Unix man page, which says how to start gnuplot
+   * a help file, which also can be printed as a manual
+   * a tutorial on using gnuplot with LATEX
+   * a quick reference summary sheet for TEXonly
+
+PostScript copies of the documentation can be ftp'd from ftp.dartmouth.edu
+in /pub/gnuplot , as manual.ps.Z and tutorial.ps.Z
+
+The documentation is built during the installation if you have LATEX
+installed on your system, look in the directories docs and tutorial.
+
+Documentation about gnuplot is available in the most common formats at the
+gnuplot distribution sites in the files gpdoc.zip and gpdoc2.zip.
+
+3. Working with it.
+
+3.1 How do I get help?
+
+Read this document.
+
+Give the 'help' command at the initial prompt. After that, keep looking
+through the keywords. Good starting points are 'plot' and 'set'.
+
+Read the manual, if you have it.
+
+Look through the demo subdirectory; it should give you some ideas.
+
+Ask your colleagues, the system administrator or the person who set up
+gnuplot.
+
+If all these fail, please upgrade to the newest version of gnuplot or urge
+your system-administrator to do so. Then post a question to
+comp.graphics.apps.gnuplot or send mail to the gatewayed mailing list
+info-gnuplot@dartmouth.edu . Do not forget to cite the version number and
+the operating system. If you want to subscribe to the mailing list, send a
+mail to majordomo@dartmouth.edu with the body of the message being
+'subscribe info-gnuplot'. Please don't do this if you can get
+comp.graphics.apps.gnuplot directly. If you post a question there, it is
+considered good form to solicit e-mail replies and post a summary.
+
+3.2 How do I print out my graphs?
+
+The kind of output produced is determined by the 'set terminal' command; for
+example, 'set terminal postscript' will produce the graph in PostScript
+format. Output can be redirected using the 'set output' command.
+
+As an example, the following prints out a graph of sin(x) on a Unix machine
+running the X-Window System.
+
+gnuplot> plot [-6:6] sin(x)
+gnuplot> set terminal postscript
+Terminal type set to 'postscript'
+Options are 'landscape monochrome "Courier" 14'
+gnuplot> set output "sin.ps"
+gnuplot> replot
+gnuplot> set output              # set output back to default
+gnuplot> set terminal x11        # ditto for terminal type
+gnuplot> ! lp -ops sin.ps        # print PS File (site dependent)
+request id is lprint-3433 (standard input)
+lp: printed file sin.ps on fg20.rz.uni-karlsruhe.de (5068 Byte)
+!
+gnuplot>
+
+In Microschrott Windows you click in the upper left corner of the graph
+window and print directly from there.
+
+3.3 How do I include my graphs in <word processor>?
+
+Basically, you save your plot to a file in a format your word processor can
+understand (using "set term" and "set output", see above), and then you read
+in the plot from your word processor. Vector formats should be prefered, as
+you can scale your graph later to the right size.
+
+Details depend on the kind of word processor you use; use "set term" to get
+a list of available file formats.
+
+Many word processors can use Encapsulated PostScript for graphs. This can be
+generated by the "set terminal postscript eps" command. Most MS-DOS word
+processors understand HPGL (terminal type hpgl).
+
+With TeX, it depends on what you use to print your dvi files. If you use
+dvips or dvi2ps, you can use Encapsulated PostScript. For emTeX (popular for
+MS-DOSns OS/2), you can use emTeX, otherwise use the LATEXterminal type,
+which generates a picture environment.
+
+If nothing else helps, try using the pgm or ppm format and converting it to
+a bitmap format your favourite word processor can understand. An invaluable
+tool for this is Jef Poskanzer's PBMPLUS package.
+
+The PBMPLUS package is available in the contrib distribution for the
+X-Window System. The original site for this is ftp.x.org in /contrib/ .
+There are many mirrors, e.g. ftp.tu-darmstadt.de in /pub/X11/contrib/ or .
+sunsite.unc.edu in /pub/X11/contrib/ .
+
+The most recent release of pbm by the author is dated December 91 and is
+called pbmplus10dec91.tar.Z.
+
+There is new version including lots of patches from the net that is not
+maintained by the author called netpbm, with the newest version called
+netpbm-1mar1994.tar.gz.
+
+Check archie (see Q2.2) for an archive site near you.
+
+For Microso$t Windows and MacOS you can use the clip board to copy your
+graph and paste it into your favourite Windows or MacOS word processor.
+
+3.4 How do I post-process a gnuplot graph?
+
+This depends on the terminal type you use.
+
+You can use the terminal type fig (you may need to recompile gnuplot to
+enable this terminal type, by putting #define FIG into <term.h>), and use
+the xfig drawing program to edit the plot afterwards. You can obtain the
+xfig program from its web site ~http://www.xfig.org/ . More information
+about the text-format used for fig can be found in the fig-package.
+
+You may use the tgif terminal, which creates output suitable for reading
+within tgif (~http://bourbon.cs.umd.edu:8001/tgif/ ), an interactive 2-D
+drawing tool under X11.
+
+Both tgif and xfig can also be obtained from the X Window contrib
+distribution (see Q3.3).
+
+Pstoedit can convert Postscript into a wide variety of formats. Pstoedit is
+available a ~http://www.geocities.com/SiliconValley/Nework/1958/pstoedit/ .
+
+Gimp may be able to post-process pixel graphics generated with gnuplot.
+
+In general, you should use a vector graphics program to post-process vector
+graphic formats, and pixel based programs for pixel graphics.
+
+3.5 How do I change symbol size, line thickness and the like?
+
+Again, this depends on the terminal type. For PostScript, you can edit the
+generated PostScript file. An overview of what means what in the PostScript
+files gnuplot generates can be found at picard.tamu.edu in /pub/gnuplot/ as
+gs-ps.doc. A general introduction to PostScript can be found at
+unix.hensa.ac.uk in /pub/misc/ukc.reports/comp.sci/reports/ as 11-92.ps.Z.
+
+3.6 How do I generate plots in the GIF format?
 
-          However, the FSF has decided to distribute gnuplot as part of
-          the GNU system, because it is useful, redistributable software.
+If gnuplot was compiled with the external GD library, there is a gif
+terminal.
 
-   Q1.4: What does gnuplot offer?
+As of version 1.6, gd library dropped support for gif in favour of the
+superior png format. For those who absolutely need gif support in gnuplot,
+we are providing older versions of gd library at the gnuplot distribution
+sites which are free of Unisys patented code. Please read also the file
+README a the ftp-sites.
 
-          + Plotting of two-dimensional functions and data points in many
-            different styles (points, lines, error bars)
-          + plotting of three-dimensional data points and surfaces in
-            many different styles (contour plot, mesh).
-          + support for complex arithmetic
-          + self - defined functions
-          + support for a large number of operating systems, graphics
-            file formats and devices
-          + extensive on-line help
-          + labels for title, axes, data points
-          + command line editing and history on most platforms
-
-   Q1.5: Is gnuplot suitable for batch processing?
-          Yes. You can read in files from the command line, or you can
-          redirect your standard input to read from a file. Both data and
-          command files can be generated automatically, from data
-          acquisition programs or whatever else you use.
-
-   Q1.6: Can I run gnuplot on my computer?
-          Gnuplot is available for a number of platforms. These are: Unix
-          (X11 and NeXTSTEP), VAX/VMS, OS/2, MS-DOS, Amiga, MS-Windows,
-          OS-9/68k, Atari ST and the Macintosh. Modifications for NEC
-          PC-9801 are said to exist (where?).
-
-
-  Section 2: Setting it up
-
-   Q2.1: What is the current version of gnuplot?
-          The current version of gnuplot is 3.7, which has many
-          improvements over 3.5
-
-   Q2.2: Where can I get gnuplot?
-          All of the later addresses refer to ftp sites. Please note that
-          it is preferable for you to use the symbolic name, rather than
-          the IP address given in brackets, because that address is much
-          more subject to change.
-
-          The official distribution site for the gnuplot source is
-          ftp.dartmouth.edu [129.170.16.4, soon to be 129.170.8.11],
-          the file is called /pub/gnuplot/gnuplot-3.7.tar.Z. Official
-          mirrors of that distribution are (for Australia)
-          ftp.monash.edu.au [130.194.11.18] and (for Europe)
-          ftp.irisa.fr [131.254.254.10]. You can also get it from your
-          friendly neighbourhood comp.sources.misc archive.
-
-          MS-DOS and MS-Windows binaries are available from
-
-          + oak.oakland.edu (North America) [141.210.10.117] as
-            /Simtel/msdos/plot/gpt35*.zip,
-          + garbo.uwasa.fi (Europe) [193.166.120.5] as
-            /pc/plot/gpt35*.zip and
-          + archie.au (Australia) [139.130.4.6] as
-            micros/pc/oak/plot/gpt35*.zip.
-
-          The files are: gpt35doc.zip, gpt35exe.zip, gpt35src.zip and
-          gpt35win.zip.
-
-          There is a special MS-DOS version for 386 or better processors;
-          it is available from the official gnuplot sites as DOS34.zip.
-
-          OS/2 2.x binaries are at ftp-os2.nmsu.edu [128.123.35.151],
-          in /os2/2.x/unix/gnuplt35.zip.
-
-          Amiga sources and binaries are available from ftp.wustl.edu
-          [128.252.135.4] as /pub/aminet/util/gnu/gnuplot-3.5.lha; there
-          are numerous mirrors of this distribution, for example
-          ftp.uni-kl.de, oes.orst.edu or ftp.luth.se.
-
-          The NeXTSTEP front end can be found at
-          ftp://next-ftp.peak.org/pub/next/binaries/plotting/ as
-          Gnuplot1.2_bin.tar.Z.
-
-          A version for OS-9/68K can be found at cabrales.cs.wisc.edu
-          [128.105.36.20] as /pub/OSK/GRAPHICS/gnuplot32x.tar.Z; it
-          includes both X-Windows and non - X-windows versions.
-
-          There is a version for the Macintosh at
-          ftp://ftp.ee.gatech.edu/pub/mac/gnuplot/ which includes
-          binaries for 68000-based Macs with and without FPU and native
-          support for PowerMacs.
-
-          Versions for the Atari ST and TT, which include some GEM
-          windowing support, are available from
-          ftp://ftp.uni-kl.de/pub/atari/graphics/, as gplt35st.zip
-          and gplt35tt.zip. They work best under MiNT.
-
-          Executable files, plus documentation in Japanese, exist for the
-          X680x0 on
-          ftp://ftp.csis.oita-u.ac.jp/pub/x68k/fj.binaries.x68000/vol
-          2.
-
-          People without ftp access can use an ftp-mail server; send a
-          message saying 'help' to bitftp@pucc.bitnet (for BITNET only)
-          or to ftpmail@ftp.dartmouth.edu.
-
-          For a uuencoded copy of the the gnuplot sources (compressed tar
-          file), send this as the body of a message to
-          ftpmail@ftp.dartmouth.edu:
-
-
-        open
-        cd pub/gnuplot
-        mode binary
-        get gnuplot3.5.tar.Z
-        quit
-
-   If you have some problem, you might need to stick
-
-        reply-to  <your-email-address-here>
-
-   before all the above.
-
-          It is a good idea to look for a nearby ftp site when
-          downloading things. You can use archie for this. See if an
-          archie client is installed at your system (by simply typing
-          archie at the command prompt), or send mail to archie@sura.net
-          with the word 'help' in both the subject line and the body of
-          the mail. However, be aware that the version you find at a near
-          ftp site may well be out of date; check the last modification
-          date and the number of bytes against the newest release at one
-          of the official servers.
-
-   Q2.3: How do I get gnuplot to compile on my system?
-          As you would any other installation. Read the files README and
-          README.Install, edit the Makefile according to taste, and run
-          make or whatever is suitable for your operating system.
-
-          If you get a complaint about a missing file libplot.a or
-          something similar when building gnuplot for X11, remove
-          -DUNIXPLOT from the TERMFLAGS= line, remove -lplot from the
-          DTBS= line and run again. If you are making X11 on a sun, type
-          'make x11_sun'.
-
-          For compiling gnuplot under Irix 5.2 and Irix 5.3, there is a
-          patch in the file lvs.zip in the contrib directory at
-          ftp.dartmouth.edu.
-
-   Q2.4: What documentation is there, and how do I get it?
-          The documentation is included in the source distribution. Look
-          at the docs subdirectory, where you'll find
-
-          + a Unix man page, which says how to start gnuplot
-          + a help file, which also can be printed as a manual
-          + a tutorial on using gnuplot with LaTeX
-          + a quick reference summary sheet for TeX only
-
-          PostScript copies of the documentation can be ftp'd from
-          ftp.dartmouth.edu, in pub/gnuplot, as manual.ps.Z and
-          tutorial.ps.Z
-
-          Andy Liaw and Dick Crawford have written a 16-page user's
-          guide. It is available from
-          ftp://picard.tamu.edu/pub/gnuplot/ as gptug.tex (also get
-          example.tex from the same directory), gptug.dvi or gptug.ps.
-
-          At the same site, there's a two- page instruction sheet for the
-          enhpost PostScript driver (see Q4.6 ) as enhpost.guide.ps
-          and a short guide to gnuplot PostScript files, as gp-ps.doc.
-
-          A Chinese translation of the gnuplot manual can be found on
-          ftp://servers.nctu.edu.tw/misc/environment/NCTU_EV/classnot
-          e/gnuplot.ps.gz .
-
-          There is a WWW hompepage for gnuplot at
-          http://www.cs.dartmouth.edu/gnuplot_info.html, which
-          includes the reference manual and a demo.
-
-          There are two more Chinese documents about gnuplot: a 72 - page
-          User's guide
-          ftp://phi.sinica.edu.tw/pub/aspac/doc/94/94002.ps.gz and a
-          28 - page Touring Guide
-          ftp://phi.sinica.edu.tw/pub/aspac/doc/95/95006.ps.gz. Both
-          documents are in PostScript format and gzipped.
-
-
-  Section 3: Working with it
-
-   Q3.1: How do I get help?
-          Give the 'help' command at the initial prompt. After that, keep
-          looking through the keywords. Good starting points are 'plot'
-          and 'set'.
-
-          Read the manual, if you have it.
-
-          Look through the demo subdirectory; it should give you some
-          ideas.
-
-          Ask your colleagues, the system administrator or the person who
-          set up gnuplot.
-
-          Post a question to comp.graphics.apps.gnuplot or send mail
-          to the gatewayed mailing list info-gnuplot@dartmouth.edu. If
-          you want to subscribe to the mailing list, send a mail to
-          majordomo@dartmouth.edu with the body of the message being
-          'subscribe info-gnuplot'. Please don't do this if you can get
-          comp.graphics.apps.gnuplot directly. If you pose a
-          question there, it is considered good form to solicit e-mail
-          replies and post a summary.
-
-   Q3.2: How do I print out my graphs?
-          The kind of output produced is determined by the 'set terminal'
-          command; for example, 'set terminal postscript' will produce
-          the graph in PostScript format. Output can be redirected using
-          the 'set output' command.
-
-          As an example, the following prints out a graph of sin(x) on a
-          Unix machine running the X Window system.
-
-
-        gnuplot> plot [-6:6] sin(x)
-        gnuplot> set terminal postscript
-        Terminal type set to 'postscript'
-        Options are 'landscape monochrome "Courier" 14'
-        gnuplot> set output "sin.ps"
-        gnuplot> replot
-        gnuplot> set output              # set output back to default
-        gnuplot> set terminal x11        # ditto for terminal type
-        gnuplot> ! lp -ops sin.ps        # print PS File (site dependent)
-        request id is lprint-3433 (standard input)
-        lp: printed file sin.ps on fg20.rz.uni-karlsruhe.de (5068 Byte)
-        !
-        gnuplot>
-
-   Q3.3: How do I include my graphs in <word processor>?
-          Basically, you save your plot to a file in a format your word
-          processor can understand (using "set term" and "set output",
-          see above), and then you read in the plot from your word
-          processor.
-
-          Details depend on the kind of word processor you use; use "set
-          term" to get a list of available file formats.
-
-          Many word processors can use Encapsulated PostScript for
-          graphs. This can be generated by the "set terminal postscript
-          eps" command. Most MS-DOS word processors understand HPGL
-          (terminal type hpgl).
-
-          With TeX, it depends on what you use to print your dvi files.
-          If you use dvips or dvi2ps, you can use Encapsulated
-          PostScript. For emTeX (popular for MS-DOS), you can use emTeX,
-          otherwise use the LaTeX terminal type, which generates a
-          picture environment.
-
-          If nothing else helps, try using the pgm or ppm format and
-          converting it to a bitmap format your favourite word processor
-          can understand. An invaluable tool for this is Jef Poskanzer's
-          PBMPLUS package.
-
-          The PBMPLUS package is available in the contrib distribution
-          for the X Window System. The original site for this is
-          ftp://ftp.x.org/contrib/. There are many mirrors, e.g.
-          ftp://ftp.th-darmstadt.de/pub/X11/contrib/ or .
-          ftp://sunsite.unc.edu/pub/X11/contrib/.
-
-          The most recent release of pbm by the author is dated December
-          91 and is called pbmplus10dec91.tar.Z
-
-          There is new version including lots of patches from the net
-          that is not maintained by the author called netpbm, with the
-          newest version called netpbm-7dec1993.tar.gz.
-
-          Check archie (see Q2.2 ) for an archive site near you.
-
-   Q3.4: How do I post-process a gnuplot graph?
-          This depends on the terminal type you use.
-
-          You can use the terminal type fig (you may need to recompile
-          gnuplot to enable this terminal type, by putting #define FIG
-          into <term.h>), and use the xfig drawing program to edit the
-          plot afterwards.
-
-          For PostScript output, you may be able to use the pstotgif
-          script (which calls GhostScript) to convert PostScript into the
-          format of the tgif drawing program. Tgif is also able to save
-          in PostScript format.
-
-          Both tgif and xfig can be obtained from the X Window contrib
-          distribution (see Q3.3).
-
-          Another possibility for modifying PostScript output appears to
-          be IslandDraw, a commercial drawing program for UNIX
-          workstations.
-
-          For Windows, there is another alternative, PageDraw. It can
-          post-process AI (Adobe Illustrator) files, and has a converter
-          from PostScript to AI. It can be downloaded from
-          http://www.wix.com/PageDraw/.
-
-   Q3.5: How do I change symbol size, line thickness and the like?
-          Again, this depends on the terminal type. For PostScript, you
-          can edit the generated PostScript file. An overview of what
-          means what in the PostScript files gnuplot generates can be
-          found at ftp://picard.tamu.edu/pub/gnuplot/ as gs-ps.doc.
-          A general introduction to PostScript can be found at
-          ftp://unix.hensa.ac.uk/pub/misc/ukc.reports/comp.sci/repor
-          ts/ as 11-92.ps.Z.
-
-   Q3.6: How do I generate plots in GIF format?
-          In gnuplot version 3.5, use the pbm terminal and use the
-          PBMPLUS package or other utilities to convert the resulting
-          bitmap (see Q 3.3 for how to get the PBMPLUS package).
-
-          From 3.7 on, there is a gif terminal.
-
-
-  Section 4: Wanted features
-
-   Q4.0: What's new in gnuplot 3.7?
-          Please refer to the NEWS file in the source distribution.
-
-   Q4.1: Does gnuplot have hidden line removal?
-          Version 3.5 supports hidden line removal on all platforms
-          except MS-DOS; use the command
-
-
-        set hidden3d
-
-   If someone can solve the 64K DGROUP memory problem, gnuplot would
-          support hidden line removal on MS-DOS as well. Version 3.2
-          supports limited hidden line removal.
-
-   Q4.2: Does gnuplot support bar-charts/histograms/boxes?
-          As of version 3.4, it does; use the style "with boxes" for bar
-          charts. To get filled boxes, you can try a modification by
-          Steve Cumming, available via ftp from
-          ftp://grebe.geog.ubc.ca/pub/gnuplot as box.tar.
-
-   Q4.3: Does gnuplot support multiple y-axes on a single plot?
-          Yes, with two unofficial mods, multiplot.shar and borders.shar.
-          They can be obtained from
-          ftp://ftp.dartmouth.edu/pub/gnuplot/contrib/multi_woo.zip
-          or ftp://ftp.cygnus.edu/incoming/gpx38.zip.
-
-          Also, 3.7 supports this capability.
-
-   Q4.4: Can I put multiple plots on a single page?
-          Yes, with the multiplot.shar mod, or if you are running gnuplot
-          3.7. If you are using PostScript output, check out mpage, which
-          can be ftp'd from ftp.eng.umd.edu:pub/misc/mpage-2.tar.Z
-
-   Q4.5: Can I put both data files and commands into a single file?
-          This feature is in gnuplot 3.7.
-
-   Q4.6: Can I put Greek letters and super/subscripts into my labels?
-          You might try using the LaTeX terminal type and putting text
-          like \alpha_{3} into it.
-
-          David Denholm has written a PostScript terminal which allows
-          for super/and subscripts, such as a^x or {/Symbol a }. Ftp to
-          sotona.phys.soton.ac.uk [152.78.192.42] and get enhpost.trm,
-          written by David Denholm and Matt Heffron. To install it,
-          follow the instructions at the top of the file, then recompile.
-          enhpost is also included in gnuplot 3.7.
-
-   Q4.7: Can I do 1:1 scaling of axes?
-          Not easily in 3.5; in 3.7, you can use "set size square".
-
-   Q4.8: Can I put tic marks for x and y axes into 3d plots?
-          In version 3.5, you can; use the "with boxes" option.
-
-   Q4.9: Does gnuplot support a driver for <graphics format>?
-          To see a list of the available graphic drivers for your
-          installation of gnuplot, type "set term".
-
-          Some graphics drivers are included in the normal distribution,
-          but are uncommented by default. If you want to use them, you'll
-          have to change ~gnuplot/term.h, and recompile.
-
-   Q4.10: Can I put different text sizes into my plots?
-          If you use PostScript output, you can use Dave Denholm's and
-          Matt Heffron's updated PostScript driver,
-          /sotona.phys.soton.ac.uk:/enhpost.trm (see also Q4.6 ).
-          Else, use 3.7.
-
-   Q4.11 How do I modify gnuplot, and apply 'patches'?
-          For this, you will need to recompile gnuplot.
-
-          Modifications people make are either done by replacing files,
-          such as terminal drivers, or by 'patching'. If a file is a
-          replacement, it will probably tell you in its README or in the
-          lines at the beginning.
-
-          To patch a file, you need Larry Wall's patch utility. On many
-          UNIX systems, it is already installed; do a man patch to check.
-          If it isn't, you'll have to get it; it can be found wherever
-          GNU software is archived.
+3.7 Can I animate my graphs?
 
-   Q4.12 How do I skip data points?
-          By specifying ? as a data value, as in
+First have a look at animate.dem in the demo directory of gnuplot.
+Basically, animated graphs are a sequence of plots in a suitable format.
 
+Then have a look at the tool whirlgif 3.04, available at
+~http://www.danbbs.dk/ dineo/whirlgif . It reads run-length encoded gifs and
+packs them into a minimal animation. On the web-pages you will find a manual
+and an example.
+
+You can also write a small script to get gnuplot to output a family of GIF
+files, then have it execute some animator such as gifsicle:
+~http://http://www.lcdf.org/ eddietwo/gifsicle or gifmerge
+~http://http://the-labs.com/GIFMerge
+
+mpeg_encode will encode a sequence of images into the mpeg-format.
+
+3.8 How do I plot implicit defined graphs?
+
+Implicit graphs or curves cannot be plotted directly in gnuplot. However
+there is a workaround.
+
+gnuplot> # as example. Place your definition in the following line
+gnuplot> f(x,y) = y - x**2 / tan(y)
+gnuplot> set contour base
+gnuplot> set cntrparam levels discrete 0.0
+gnuplot> set nosurface
+gnuplot> set term table
+gnuplot> set out 'curve.dat'
+gnuplot> splot f(x,y)
+gnuplot> set out
+gnuplot> set term {your usual terminal for interactive work}
+gnuplot> plot 'curve.dat' w l
+
+The trick is to draw the single contour line z=0 of the surface z=f(x,y),
+and store the resulting contour curve to a gnuplot datafile.
+
+4. Wanted features
+
+4.1 What's new in gnuplot 3.7?
+
+Too many things to be named here. Please refer to the NEWS file in the
+source distribution.
+
+4.2 Does gnuplot have hidden line removal?
+
+Version 3.7 supports hidden line removal on all platforms; use the command
+set hidden3d.
+
+The 16-bit binaries of gnuplot support the hidden line removal only
+partially as the hidden-line algorithm may hit the 640k memory limit.
+
+4.3 Does gnuplot support bar-charts/histograms/boxes?
+
+Use the style "with boxes" for bar charts. To get filled boxes, you can try
+a modification by Steve Cumming and jturk, available via ftp from the
+contrib directory ftp.ucc.ie in /pub/gnuplot/contrib/gpl37fboxpatch.tar.gz .
+
+Bernhard Reiter wrote an AWK script to post-process the fig-terminal output.
+Please have a look at
+~http://www.usf.uni-osnabrueck.de/ breiter/tools/gnuplot/barcharts.en.html .
+
+4.4 Does gnuplot support pie charts?
+
+It's not possible in gnuplot, but have a look at
+~http://www.usf.uni-osnabrueck.de/ breiter/tools/piechart/piecharts.en.html
+
+4.5 Does gnuplot quarterly time charts?
+
+It's not possible in gnuplot, but have a look at
+~http://ricardo.ecn.wfu.edu/ cottrell/qplot . The corresponding file
+qplot.zip can be obtained from the contrib directory on any gnuplot server.
+
+4.6 Does gnuplot support multiple y-axes on a single plot?
+
+Yes. You can have 2 x- and 2 y-axes per plot. See "plot".
+
+4.7 Can I put multiple pages on one page?
+
+Yes. "set multiplot"
+
+If you use the postscript terminal and plot one graph per page you can use
+the program mpage (~http://www.mesa.nl/pub/mpage ) to print multiple logical
+pages per physical page. A similar program is the psnup program in the
+psutils package. This package is available at any CTAN mirror.
+
+4.8 Can I put both data files and commands into a single file?
+
+This feature is in gnuplot 3.7 when using the set multiplot command.
+
+4.9 Can I put Greek letters and super/subscripts into my labels?
+
+You might try using the LATEXterminal type and putting text like
+"\alpha_{3}" into it.
+
+The enhanced option in the postscript terminal is also able to use sub- and
+superscripts.
+
+If you include your gnuplot-graphs into a LATEX document you can use the
+LATEX-package psfrag to typeset any characters into your graphs.
+
+4.10 Can I do 1:1 scaling of axes?
+
+Use "set size square".
+
+4.11 Can I put tic marks for x and y axes into 3d plots?
+
+Use the "with boxes" option.
+
+4.12 Does gnuplot support a driver for <graphics format>?
+
+To see a list of the available graphic drivers for your installation of
+gnuplot, type "set term".
+
+Some graphics drivers are included in the normal distribution, but are
+uncommented by default. If you want to use them, you'll have to change
+ gnuplot/term.h, and recompile.
+
+4.13 Can I put different text sizes into my plots?
+
+Some terminals, like the postscript terminal can, others can't. Look at the
+help for the different terminals.
+
+4.14 How do I modify gnuplot, and apply 'patches'?
+
+For this, you will need to recompile gnuplot.
+
+Modifications people make are either done by replacing files, such as
+terminal drivers, or by 'patching'. If a file is a replacement, it will
+probably tell you in its README or in the lines at the beginning.
+
+To patch a file, you need Larry Wall's patch utility. On many UNIX systems,
+it is already installed; do a man patch to check. If it isn't, you'll have
+to get it; it can be found wherever GNU software is archived.
+
+4.15 How do I skip data points?
+
+By specifying ? as a data value, as in
 
         1 2
         2 3
         3 ?
         4 5
 
-   Q4.13 How do I plot every nth point?
-          You can apply the patch point_skip from the contrib section
-          (see Q5.3 or, assuming you have awk installed on your
-          system, you can use the following line:
-
-
-        gnuplot> plot "< awk '{if(NR%5==0)print}' file.dat"
-
-   plots every 5th line, and
-
-        gnuplot> plot "< awk '$0 !~ /^#/ {if(NR%40==0)print $1, $4}' file.dat"
-
-   plots every 40th line while skipping commented lines.
-
-
-  Section 5: Miscellaneous
-
-   Q5.1: I've found a bug, what do I do?
-          First, try to see whether it actually is a bug, or whether it
-          is a feature which may be turned off by some obscure set -
-          command.
-
-          Next, see wether you have an old version of gnuplot; if you do,
-          chances are the bug has been fixed in a newer release.
-
-          If, after checking these things, you still are convinced that
-          there is a bug, proceed as follows. If you have a fairly
-          general sort of bug report, posting to
-          comp.graphics.apps.gnuplot is probably the way to go. If
-          you have investigated a problem in detail, especially if you
-          have a context diff that fixes the problem, please e-email a
-          report to bug-gnuplot@dartmouth.edu. The bug-gnuplot list is
-          for reporting and collecting bug fixes, the
-          comp.graphics.apps.gnuplot newsgroup will be more help for
-          finding work arounds or actually solving gnuplot related
-          problems. If you do send in a bug report, be sure and include
-          the version of gnuplot (including patchlevel), terminal driver,
-          operating system, an exact description of the bug and input
-          which can reproduce the bug. Also, any context diffs should be
-          referenced against the latest official version of gnuplot if at
-          all possible.
-
-   Q5.2: Can I use gnuplot routines for my own programs?
-          Yes. John Campbell <jdc@nauvax.ucc.nau.edu> has written
-          gplotlib, a version of gnuplot as C subroutines callable from a
-          C program. This is available as gplotlib.tar.Z on the machine
-          ftp.nau.edu in the directory /pub/gplotlib.tar.Z. This library
-          has been updated to be compatible with version 3.5.
+4.16 How do I plot every nth point?
 
-   Q5.3: What extensions have people made to gnuplot? Where can I get
-          them?
-          __Extensions are available from
-          ftp://ftp.dartmouth.edu/pub/gnuplot/contrib/ . It contains
-          the following files:
-
-    Point Skips
-
-          + _Data Filtering_ Instead of just having two params
-            following the style param, there are now 4:
-               o 1: line_type
-               o 2: point_type
-               o 3: point_skip - gives the number of data samples per
-                 plotted point
-               o 4: point_offs - gives the sample number on which to plot
-                 the first point
-            Thus points are plotted only for the samples n satisfying n =
-            point_skip*i + point_offs for some non-negative integer i.
-            From:
-            pixar!sun!prony.Colorado.EDU!clarkmp@ucbvax.berkeley.edu
-            (Michael Clark)
-          + _Point Skip with Awk_ With UNIX,
-
-gnuplot> plot "< awk '{if(NR%5==0)print$0}' file.dat"
-        From: James Darrell McCauley, mccauley@ecn.purdue.edu
-          + _New Xlib mods._ From: gregg hanna
-            (gregor@kafka.saic.com)
-
-    Vectors and Arrows
-          + _Program to convert lines to vectors_ This program turns
-            line segments into line segments with a half-arrow at the
-            head: by uncommenting two lines below, the arrowhead will be
-            a triangle. optional arguments: size angle where size is a
-            fraction of each vector's magnitude and angle is in degrees
-            all data taken from standard input, and output to standard
-            output. typical invocation:
-
-arrow 0.2 15 <vector.lin >vector.heads
-        From: andrew@jarthur.claremont.edu (Andrew M. Ross)
-          + _Vect2gp_, an awk script to make gnuplot command script
-            to draw a vector field map. From: hiro@ice3.ori.u-tokyo.ac.jp
-            (Yasu-Hiro YAMAZAKI)
-          + _GNUPLOT to SIPP_ This is a "far from perfect" converter
-            that takes gnuplot table output and splits it in polygons.
-            Then it calls sipp to render it. You get sipp from
-            isy.liu.se:/pub/sipp or ask archie. From:
-            chammer@POST.uni-bielefeld.de (Carsten Hammer)
-
-    Histograms and Pie Charts
-          + _Histogram C program_ The short C program below is a
-            filter that calculates a histogram from a sequence of numbers
-            and prints the output in such a format that Gnuplot can plot
-            the histogram by the command sequence
-
-    !histogram < datain > tmp;
-    plot "tmp" with impulses
-            From: mustafa@seas.smu.edu (Mustafa Kocaturk)
-          + _HG_ is an automatic histogram generator. it reads a
-            column of data from an input file and emits a [log] histogram
-            ks does ks or chi^2 tests on a set of input arrays. you need
-            the "numerical recipes in C" library somewhere on your system
-            to link this one. I can not undertake to fix bugs or add
-            features, but I might do it if asked. From: Steve Cumming
-            stevec@geog.ubc.ca
-          + _Piechart C program_ The short C program below formats
-            data for display as a piechart. From: mccauley@ecn.purdue.edu
-            (James Darrell McCauley)
-
-    Interprocess Communications
-          + _Notes of Windows Hooks_ From: Maurice
-            Castro,maurice@bruce.cs.monash.edu.au
-          + _Named Pipes Example _From:
-            dtaber@deathstar.risc.rockwell.com (Don Taber)
-          + _PipeLib_ What the library does is set up to 20 programs
-            going (like gnuplot), then allows you to send to them as if
-            the program were typing on the command line. I've included a
-            brief set of docs after the source code, in latex format.
-            There is no facility to watch the output of a program. From:
-            ssclift@neumann.uwaterloo.ca (Simon Clift)
-          + _Popen example from lsqrfit_ The following function
-            sends a command to gnuplot. Gnuplot will execute the command
-            just as if you typed it at the gnuplot command line. This
-            example is adapted from my least squares fitting program
-            which is located at ftp.cdrom.com in
-            pub/os2/2_x/unix/lsqrft14.zip. Complete source is included.
-            From: michael@krypton.mit.edu (Michael Courtney)
-
-    Multiple logical plots on a single page
-          + _Gawk script for multiple encapsulated postscript on a
-            page_ It's slightly more flexible than mpage, because it
-            changes the aspect ratio of the plots; mpage according to the
-            documentation only allows 1, 2, 4, or 8 plots on a page. This
-            script works for unix with encapsulated postscript (eps)
-            output. It should work with gawk or nawk, although I've only
-            tested it with gawk. (Gawk is GNU's version of awk and is
-            available from prep.ai.mit.edu.) You just specify how many
-            rows and columns of plots you want and it does the rest. For
-            example, gnuplot_eps rows=3 cols=2 *.eps | lpr will print all
-            eps files in your current directory with 6 on a page. Also,
-            see the comments in the file. From:
-            holt@goethe.cns.caltech.edu (Gary Holt)
-          + _Sed script for multiple encapsulated postscript on a
-            page_ You have MULTIPLE postscript files each containing a
-            single plot. From: wgchoe@scoupe.postech.ac.kr (Choe Won Gyu)
-          + _Massive patch_ with add multiplotcapability to all
-            devices and a lot more. The reason it is offered in this form
-            is because the original multiplot.pat did not patch correctly
-            into gnuplot version 3.5. This mod also add borders options,
-            financial plots, multiple line titles and other asundry
-            items. Use at your own risk. Look at the top of makefile.r
-            for a more complete list of changes.
-            From: Alex Woo, woo@playfair.stanford.edu
-
-    lvs.zip
-            This contains miscellaneous, modifications, which include:
-          + Label positioning using either plot or device-relative
-            coodinates
-          + Portability to Irix-5.2 and Irix-5.3
-          + The "thru" keyword has been extended to include "thrux" for
-            the X - Coordinate
-          + Capability to read a ordinary Fortran-style unformatted file
-          + A Perl script for better handling of eps
-          + Modifications to docs/doc2info to generate "next", "prev",
-            and "up" data for each node.
-          + Changes in the documentation to reflect the above.
-
-    Miscellaneous Mods
-          + _Congp3d3_ is a preprocessor to draw contour plots on
-            irregular regions. From: mrb2@nrc.gov (Margaret Rose Byrne)
-          + _Sockpipe_ is a socket based pipe needed for the
-            Stardent OS. From: Mike Hallesy, Stardent Computer Product
-            Support, hal@stardent.com
-          + _Time Series_ is a patch to add multiline titles and
-            labels, time series x and y data and tic marks, and automatic
-            resizing of plots and much more. From: Hans Olav Eggestad,
-            olav@jordforsk.nlh.no
-
-    Other Operationing Systems
-          + _MacIntosh Port of Version 3.2_ From: Noboru Yamamoto,
-            sun!kekvax.kek.jp!YAMAMOTO@pixar.com
-          + _MacIntosh Port of Version 3.5_ From:
-            laval@londres.cma.fr (Philippe LAVAL)
-          + _OS-9 Port of Version 3.2_
-
-
-   Q5.4: Can I do heavy - duty data processing with gnuplot?
-          Gnuplot alone is not suited very well for this. One thing you
-          might try is fudgit, an interactive multi-purpose fitting
-          program written by Martin-D. Lacasse
-          (isaac@frodo.physics.mcgill.ca). It can use gnuplot as its
-          graphics back end and is available from ftp.physics.mcgill.ca
-          in /pub/Fudgit/fudgit_2.33.tar.Z [132.206.9.13], and from the
-          main Linux server, tsx-11.mit.edu [18.172.1.2] and its numerous
-          mirrors around the world as
-          /pub/linux/sources/usr.bin/fudgit-2.33.tar.z. Versions are
-          available for AIX, Data General, HP-UX, IRIX 4, Linux, NeXT,
-          Sun3, Sun4, Ultrix, OS/2 and MS-DOS. The MS-DOS version is
-          available on simtel20 mirrors (simtel20 itself has closed down)
-          in the "math" subdirectory as fudg_231.zip.
-
-          Carsten Grammes has written a fitting program which goes
-          together with gnuplot; it is called gnufit and is available
-          from the official gnuplot sites, as the files gnufit12.info,
-          gnufit12.tar.gz (source) and gft12dos.zip (MS-DOS). It has been
-          merged into gnuplot 3.7.
-
-          Michael Courtney has written a program called lsqrft, which
-          uses the Levenberg - Marquardt - Algorithm for fitting data to
-          a function. It is avialiable from ftp.cdrom.com as
-          /pub/os2/2_x/unix/lsqrft13.zip; sources, which should compile
-          on Unix, and executables for MS-DOS and OS/2 2.x are included.
-          There is an interface to the OS/2 presentation manager.
-
-          You might also want to look at the applications developed by
-          the Software Tools Group (STG) at the National Center for
-          Supercomputing Applications. Ftp to ftp.ncsa.uiuc.edu
-          [141.142.20.50] and get the file README.BROCHURE for more
-          information.
-
-          You can also try pgperl, an integration of the PGPLOT plotting
-          package with Perl 5. Information can be found at
-          http://www.ast.cam.ac.uk/~kgb/pgperl.html, the source is
-          available from ftp://ftp.ast.cam.ac.uk/pub/kgb/pgperl/ or
-          ftp://linux.nrao.edu/pub/packages/pgperl/.
-
-          Another possibility is Octave. To quote from its README: Octave
-          is a high-level language, primarily intended for numerical
-          computations. It provides a convenient command line interface
-          for solving linear and nonlinear problems numerically.
-
-          The latest released version of Octave is always available via
-          anonymous ftp from bevo.che.wisc.edu in the directory
-          /pub/octave.
+This can be specified with the various options for the command "plot".
 
-   Q5.5: I have ported gnuplot to another system, or patched it. What do
-          I do?
-          If your patch is small, mail it to bug-gnuplot@dartmouth.edu,
-          with a thorough description of what the patch is supposed to
-          do, which version of gnuplot it is relative to, etc. Also, you
-          can send notification of the patch to the FAQ maintainer, if
-          you want a mention. Please don't send the patch itself to me
-          :-)
-
-          If your modifications are extensive (such as a port to another
-          system), upload your modifications to
-          ftp://ftp.dartmouth.edu/pub/dropoff. Please drop a note to
-          David.Kotz@dartmouth.edu, the maintainer of the gnuplot
-          subdirectory there, plus a note to bug-gnuplot@dartmouth.edu.
-
-   Q5.6: I want to help in developing gnuplot 3.7. What can I do?
-          Join the gnuplot beta test mailing list by sending a mail
-          containing the line
-
-
-subscribe info-gnuplot-beta
-
-   in the body (not the subject) of the mail to Majordomo@Dartmouth.EDU.
-
-
-  Section 6: Making life easier
-
-   Q6.1: How do I plot two functions in non - overlapping regions?
-          Use a parametric plot. An example:
-
-
-        set parametric
-        a=1
-        b=3
-        c=2
-        d=4
-        x1(t) = a+(b-a)*t
-        x2(t) = c+(d-c)*t
-        f1(x) = sin(x)
-        f2(x) = x**2/8
-        plot [t=0:1] x1(t),f1(x1(t)) title "f1", x2(t), f2(x2(t)) title "f2"
-
-   Q6.2: How do I run my data through a filter before plotting?
-          If your system supports the popen() function, as Unix does, you
-          should be able to run the output through another process, for
-          example a short awk program, such as
-
-
-        gnuplot> plot "< awk ' { print $1, $3/$2 } ' file.in"
-
-   Unfortunately, in 3.2, there is a rather short limitation on the
-          maximum argument length, so your command line may be truncated
-          (usually, this will mean that awk cannot find the filename).
-          Also, you may need to escape the $ - characters in your awk
-          programs.
-
-          As of version 3.4, gnuplot includes the thru - keyword for the
-          plot command for running data files through a gnuplot - defined
-          function.
-
-          You can also get divhack.patch from
-          sotona.phys.soton.ac.uk[152.78.192.42] via anonymous ftp. It
-          allows expressions of the kind
-
-
-        gnuplot> plot "datafile" using A:B:C
-
-   where A,B,C,... are now either a column number, as usual, or an
-          arbitrary expression enclosed in ()'s, and using $1,$2,etc to
-          access the data columns.
-
-   Q6.3: How do I make it easier to use gnuplot with LaTeX?
-          There is a set of LaTeX macros and shell scripts that are meant
-          to make your life easier when using gnuplot with LaTeX. This
-          package can be found on ftp.dartmouth.edu [129.170.16.54, soon
-          to be 129.170.8.11] in pub/gnuplot/latex.shar, by David Kotz.
-          For example, the program "plotskel" can turn a gnuplot-output
-          file plot.tex into a skeleton file skel.tex, that has the same
-          size as the original plot but contains no graph. With the right
-          macros, the skeleton can be used for preliminary LaTeX passes,
-          reserving the full graph for later passes, saving tremendous
-          amounts of time.
-
-   Q6.4: How do I save and restore my settings?
-          Use the "save" and "load" commands for this; see "help save"
-          and "help load" for details.
-
-   Q6.5: How do I plot lines (not grids) using splot?
-          If the data in a data file for splot is arranged in such a way
-          that each one has the same number of data points (using blank
-          lines as delimiters, as usual), splot will plot the data with a
-          grid. If you want to plot just lines, use a different number of
-          data entries (you can do this by doubling the last data point,
-          for example). Don't forget to set parametric mode, of course.
+4.17 How do I plot a vertical line?
 
-   Q6.6: How do I plot a function f(x,y) which is bounded by other
-          functions in the x-y plain?
-          An example:
+Depending on context, the main methods are:
+
+   * set arrow .... .... nohead where you have to compute explicitly the
+     start and the end of the arrow.
+   * generate (inlined) datapoints and plot them
+   * switch to parametric mode
+
+5. Miscellaneous
+
+5.1 I've found a bug, what do I do?
+
+First, try to see whether it actually is a bug, or whether it is a feature
+which may be turned off by some obscure set-command.
+
+Next, see whether you have an old version of gnuplot; if you do, chances are
+the bug has been fixed in a newer release.
+
+Fixes for bugs reported since the release of the current version are held in
+the patches directory at gnuplotdistribution sites. Before submitting a bug
+report, please check whether the bug in question has already been fixed.
+
+If, after checking these things, you still are convinced that there is a
+bug, proceed as follows. If you have a fairly general sort of bug report,
+posting to comp.graphics.apps.gnuplot is probably the way to go. If you have
+investigated a problem in detail, especially if you have a context or
+unified diff that fixes the problem, please e-email a report to
+bug-gnuplot@dartmouth.edu .
+
+The bug-gnuplot list is for reporting and collecting bug fixes, the
+comp.graphics.apps.gnuplot newsgroup will be more help for finding work
+arounds or actually solving gnuplotrelated problems. If you do send in a bug
+report, be sure and include the version of gnuplot (including patchlevel) as
+shown by the command "show version long", terminal driver, operating system,
+an exact description of the bug and input which can reproduce the bug.
+Failure to indicate these details can render a solution to your problem
+almost impossible. Also, any context diffs should be referenced against the
+latest official version of gnuplotif at all possible.
+
+5.2 Can I use gnuplotroutines for my own programs?
+
+Yes. John Campbell jdc@nauvax.ucc.nau.edu has written gplotlib, a version of
+gnuplotas C subroutines callable from a C program. This is available as
+gplotlib.tar.Z at ftp.nau.edu in /pub/gplotlib.tar.Z . This library has been
+updated to be compatible with version 3.5.
+
+On systems supporting the pipes, you can pipe commands to gnuplotfrom other
+programs.
+
+5.3 What extensions have people made to gnuplot? Where can I get them?
+
+Extensions are available from ftp.ucc.ie in /pub/gnuplot/contrib/
 
+Some extensions available:
 
-        f(x,y) = x**2 + y **2
-        x(u) = 3*u
-        yu(x) = x**2
-        yl(x) = -x**2
-        set parametric
-        set cont
-        splot [0:1] [0:1] u,yl(x(u))+(yu(x(u)) - yl(x(u)))*v,\
-        f(x(u), (yu(x(u)) - yl(x(u)))*v)
-
-   Q6.7: How do I get rid of <feature in a plot>?
-          Usually, there is a set command to do this; do a
-
-
-        gnuplot> ?set no
-
-   for a short overview.
-
-   Q6.8: How do I call gnuplot from my own programs?
-          Here's code which works for a UNIX system, using (efficient)
-          named pipes.
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <unistd.h>
-
-#define PANIC(a) do { \
-                perror(a); \
-                if (temp_name) unlink(temp_name);\
-                exit(1);\
-        } while(0)
-
-int main() {
-    FILE *command,*data;
-    char *temp_name = NULL;
-    double a,b;
-    int i;
-
-    if ((temp_name = tmpnam((char *) 0)) == 0) PANIC("tmpnam failed");
-    if(mkfifo(temp_name, S_IRUSR | S_IWUSR) != 0) PANIC("mkfifo failed");
-    command = popen("gnuplot","w");
-    fprintf(command,"plot \"%s\" with lines\n",temp_name); fflush(command);
-    data = fopen(temp_name,"w");
-    for (i=0; i<20; i++) {
-        a = i/10.0;
-        b = sin(a);
-        fprintf(data,"%f %f\n",a,b);
-    }
-    fclose(data);
-    fprintf(stderr,"press enter to continue..."); fflush(stderr);
-    getchar();
-
-    fprintf(command,"plot \"%s\" with lines\n",temp_name); fflush(command);
-    data = fopen(temp_name,"w");
-    for (i=0; i<20; i++) {
-        a = i/10.0;
-        b = cos(a);
-        fprintf(data,"%f %f\n",a,b);
-    }
-    fclose(data);
-    fprintf(stderr,"press enter to continue..."); fflush(stderr);
-    getchar();
-    pclose(command);
-    unlink(temp_name);
-    return 0;
-}
-
-   Here's code for OS/2, again using named pipes; I'm unable to check
-          this out myself. This code is care of fearick@physci.uct.ac.za
-          (Roger Fearick).
-
-
-#include <stdio.h>
-#define INCL_DOS
-#define INCL_DOSPROCESS
-#define INCL_DOSNMPIPES
-#include <os2.h>
-
-main()
-    {
-    HPIPE hpipe ;
-    FILE *hfile, *hgnu ;
-        /* create a named pipe. Use NP_WAIT so that DosConnect...
-           blocks until client (gnuplot) opens, and client reads
-           are blocked until data is available */
-    DosCreateNPipe( "\\pipe\\gtemp",
-                    &hpipe,
-                    NP_ACCESS_OUTBOUND,
-                    NP_WAIT|NP_TYPE_BYTE|1,
-                    256,
-                    256,
-                    -1 ) ;
-        /* use stream i/o */
-    hfile = fdopen( hpipe, "w" ) ;
-
-        /* start gnuplot; use unbuffered writes so we don't need to
-           flush buffer after a command */
-    hgnu = popen( "gnuplot", "w" ) ;
-    setvbuf( hgnu, NULL, _IONBF, 0 ) ;
-
-        /* plot a set of data */
-
-    fprintf( hgnu, "plot '/pipe/gtemp'\n" ) ;  /* issue plot command */
-    DosConnectNPipe( hpipe ) ;              /* wait until 'file' opened */
-    fprintf( hfile, "1 1\n" ) ;             /* write data to 'file' */
-    fprintf( hfile, "2 2\n" ) ;
-    fprintf( hfile, "3 3\n" ) ;
-    fprintf( hfile, "4 4\n" ) ;
-    fflush( hfile ) ;                       /* flush buffer forces read */
-    DosSleep( 500 ) ;                       /* allow gnuplot to catch up */
-    DosDisConnectNPipe( hpipe ) ;           /* disconnect this session */
-    fprintf( hgnu, "pause -1\n" ) ;         /* admire plot */
-
-        /* plot another set of data */
-
-    fprintf( hgnu, "plot '/pipe/gtemp'\n" ) ;
-    DosConnectNPipe( hpipe ) ;
-    fprintf( hfile, "1 4\n" ) ;
-    fprintf( hfile, "2 3\n" ) ;
-    fprintf( hfile, "3 2\n" ) ;
-    fprintf( hfile, "4 1\n" ) ;
-    fflush( hfile ) ;
-    DosSleep( 500 ) ;
-    DosDisConnectNPipe( hpipe ) ;
-    fprintf( hgnu, "pause -1\n" ) ;
-
-    DosClose( hpipe ) ;
-    pclose( hgnu ) ;
-    }
-
-   ; The above code works for gnuplot 3.5. In gnuplot 3.7, this can be
-          greatly simplified, since data can be fed 'inline, as in
-
-
-plot '-' w l
-1 1
-2 3
-3 4
-e
-
-
-  Section 7: Known problems
-
-   Q7.1: Gnuplot is not plotting any points under X11! How come?
-          Very probably, you still are using an old version of
-          gnuplot_x11. Remove that, then do a full installation.
+   * barchart_via_fig: awk scripts to produce barcharts with filled boxes.
+   * date-errorbar: allows dates in the hi/lo fields for errorbars.
+   * gp37os2-mouse: OS/2 binaries with mouse support (feature included in
+     current beta versions).
+   * perltk: A perl/tk canvas widget.
+   * polyg.patch: Implements a polygon plotting style.
+   * xgfe: graphical front end using the Qt widgets available at
+     ~http://lnc.usc.edu/docs/xgfe/xgfe.html .
 
-          On VMS, you need to make several symbols:
+5.4 Can I do heavy-duty data processing with gnuplot?
+
+gnuplotalone is not suited very well for this. One thing you might try is
+fudgit, an interactive multi-purpose fitting program written by Martin-D.
+Lacasse (isaac@frodo.physics.mcgill.ca). It can use gnuplotas its graphics
+back end and is available from ftp.physics.mcgill.ca in
+/pub/Fudgit/fudgit_2.33.tar.Z and from the main Linux server, tsx-11.mit.edu
+and its numerous mirrors around the world as
+/pub/linux/sources/usr.bin/fudgit-2.33.tar.z. Versions are available for
+AIX, Data General, HP-UX, IRIX 4, Linux, NeXT, Sun3, Sun4, Ultrix, OS/2 and
+MS-DOS. The MS-DOS version is available on simtel20 mirrors (simtel20 itself
+has closed down) in the "math" subdirectory as fudg_231.zip.
+
+Carsten Grammes has written a fitting program which has been merged into
+gnuplot3.7.
+
+Michael Courtney has written a program called lsqrft, which uses the
+Levenberg-Marquardt - Algorithm for fitting data to a function. It is
+available from hobbes.nmsu.edu in /pub/os2/apps/analysis/lsqrft15.zip ;
+sources, which should compile on Unix, and executables for MS-DOS and OS/2
+are available. There is an interface to the OS/2 presentation manager.
+
+You might also want to look at the applications developed by the Software
+Tools Group (STG) at the National Center for Supercomputing Applications.
+Ftp to ftp.ncsa.uiuc.edu and get the file README.BROCHURE for more
+information.
+
+You can also try pgperl, an integration of the PGPLOT plotting package with
+Perl 5. Information can be found at
+~http://www.ast.cam.ac.uk/AAO/local/www/kgb/pgperl , the source is available
+from ftp.ast.cam.ac.uk in /pub/kgb/pgperl/ or linux.nrao.edu in
+/pub/packages/pgperl/ .
+
+Another possibility is Octave. To quote from its README: Octave is a
+high-level language, primarily intended for numerical computations. It
+provides a convenient command line interface for solving linear and
+nonlinear problems numerically. The latest released version of Octave is
+always available from ~http://www.che.wisc.edu/octave/ and via anonymous ftp
+from bevo.che.wisc.edu in /pub/octave .
+
+5.5 I have ported gnuplotto another system, or patched it. What do I do?
+
+If your patch is small, mail it to info-gnuplot-beta@dartmouth.edu , with a
+thorough description of what the patch is supposed to do, which version of
+gnuplotit is relative to, etc. Also, you can send notification of the patch
+to the FAQ maintainer, if you want a mention. Please don't send the patch
+itself to me.
+
+If your modifications are extensive (such as a port to another system),
+place them on a web/ftp site for download. There is currently no possibility
+to upload patches. Send a note to info-gnuplot-beta@dartmouth.edu on where
+to find the patch, what it is supposed to do, which version of gnuplotit is
+to be applied against. For the time being (summer 1999) you can also send
+the patch to gnuplot@ftp.ucc.ie .
+
+5.6 I want to help in developing the next version of gnuplot. What can I do?
+
+Join the gnuplotbeta test mailing list by sending a mail containing the line
+subscribe info-gnuplot-beta in the body (not the subject) of the mail to
+Majordomo@Dartmouth.EDU .
+
+6. Making life easier
+
+6.1 How do I plot two functions in non-overlapping regions?
+
+Use a parametric plot. An example:
+
+gnuplot> set parametric
+gnuplot> a=1
+gnuplot> b=3
+gnuplot> c=2
+gnuplot> d=4
+gnuplot> x1(t) = a+(b-a)*t
+gnuplot> x2(t) = c+(d-c)*t
+gnuplot> f1(x) = sin(x)
+gnuplot> f2(x) = x**2/8
+gnuplot> plot [t=0:1] x1(t),f1(x1(t)) title "f1", x2(t), f2(x2(t)) title "f2"
+
+You can also use gnuplot's ability to ignore mathematically undefined
+expressions: the expression 1/0 is silently ignored, thus a construction
+like
+
+gnuplot> set xran [-10:10]
+gnuplot> plot (abs(x)>0.5?1/0: x**2)
+
+plots a quadratic function only for |x| < 0.5.
+
+6.2 How do I run my data through a filter before plotting?
+
+If your system supports the popen() function, as Unix does, you should be
+able to run the output through another process, for example a short awk
+program, such as
+
+gnuplot> plot "< awk ' { print $1, $3/$2 } ' file.in"
+
+The plot command is very powerful and is able to do some arithmetic on
+datafiles. See "help plot".
+
+6.3 How do I make it easier to use gnuplot with LATEX?
+
+There is a set of LATEX macros and shell scripts that are meant to make your
+life easier when using gnuplot with LaTeX. This package can be found on
+ftp.dartmouth.edu in pub/gnuplot/latex.shar , by David Kotz. For example,
+the program "plotskel" can turn a gnuplot-output file plot.tex into a
+skeleton file skel.tex, that has the same size as the original plot but
+contains no graph. With the right macros, the skeleton can be used for
+preliminary LATEX passes, reserving the full graph for later passes, saving
+tremendous amounts of time.
+
+6.4 How do I save and restore my settings?
+
+Use the "save" and "load" commands for this; see "help save" and "help load"
+for details.
+
+6.5 How do I plot lines (not grids) using splot?
+
+If the data in a data file for splot is arranged in such a way that each one
+has the same number of data points (using blank lines as delimiters, as
+usual), splot will plot the data with a grid. If you want to plot just
+lines, use a different number of data entries (you can do this by doubling
+the last data point, for example). Don't forget to set parametric mode, of
+course.
+
+6.6 How do I plot a function f(x,y) which is bounded by other functions in
+the x-y plain?
+
+An example:
+
+gnuplot> f(x,y) = x**2 + y **2
+gnuplot> x(u) = 3*u
+gnuplot> yu(x) = x**2
+gnuplot> yl(x) = -x**2
+gnuplot> set parametric
+gnuplot> set cont
+gnuplot> splot [0:1] [0:1] u,yl(x(u))+(yu(x(u)) - yl(x(u)))*v,\
+> f(x(u), (yu(x(u)) - yl(x(u)))*v)
+
+6.7 How do I get rid of <feature in a plot>?
+
+Usually, there is a set command to do this; do a gnuplot> ?set no for a
+short overview.
+
+6.8 How do I call gnuplot from my own programs?
+
+There's a code which works for a UNIX system, using (efficient) named pipes.
+On M$ Windows platforms, due to the lacking standard input of GUI programs,
+you need to use the C-code pgnuplot written by Hans-Bernhard Broeker
+broeker@physik.rwth-aachen.de . You can obtain this file on a ftp-server
+carrying the source for gnuplot.
+
+6.9 What if I need h-bar (Planck's constant)?
+
+There is no predefined variable like pi. However to put h-bar as a character
+into the label, you must use the PostScript terminal. You can play around
+with constructs like @{/=56 -} {/=24 h} or {/=8 @{/Symbol=24 -} _{/=14 h}}
+In the latter, the "-" (a long one in /Symbol) is non-spacing and 24-pt. The
+14-pt "h" is offset by an 8-pt space (which is the space preceding the "_")
+but smaller, since it's written as a subscript. But these don't look too
+much like the hbar we're used to, since the bar is horizontal instead of
+sloped. I don't see a way to get that. I tried using an accent (
+264 in isoLatin encoding), but I haven't found a way to scale and position
+the pieces correctly.
+
+One more possibility would be {/=14 @^{/Symbol=10 -}{/=14 h}}.
+
+(This is a hint by Richard Crawford).
+
+7. Known Problems
+
+7.1 Gnuplot is not plotting any points under X11! How come?
+
+On VMS, you need to make several symbols:
 
         $ gnuplot_x11 :== $disk:[directory]gnuplot_x11
         $ gnuplot :== $disk:[directory]gnuplot.exe
         $ def/job GNUPLOT$HELP disk:[directory]gnuplot.hlb
 
-   Then run gnuplot from your command line, and use
-
-        gnuplot> set term x11
-
-   Q7.2: My isoline data generated by a Fortran program is not handled
-          correctly. What can I do?
-          One known cause for this is the use of list-directed output (as
-          in WRITE(10,*) for generating blank lines. Fortran uses ASA
-          carriage control characters, and for list - directed output
-          this results in a space being output before the newline.
-          Gnuplot does not like this. The solution is to generate blank
-          lines using formatted output, as in WRITE(10,'()'). If you use
-          carriage return files in VMS Fortran, you may have to open the
-          file with OPEN(...,CARRIAGECONTROL='DTST') or convert it using
-          the DECUS utility ATTRIB.EXE:
+Then run gnuplot from your command line, and use "set term x11".
 
+7.2 My isoline data generated by a Fortran program is not handled correctly.
+What can I do?
 
-        VMS> ATTRIB/RATTRIB=IMPDTED FOR010.DAT
+Update to the newest gnuplot. Gnuplot 3.7 is able to read Fortran-style
+files where a blanc line can contain more than a linefeed.
 
-   Q7.3: Why does gnuplot ignore my very small numbers?
-          Gnuplot treats all numbers less than 1e-08 as zero, by default.
-          Thus, if you are trying to plot a collection of very small
-          numbers, they may be plotted as zero. Worse, if you're plotting
-          on a log scale, they will be off scale. Or, if the whole set of
-          numbers is "zero", your range may be considered empty:
+7.3 Why does gnuplot ignore my very small numbers?
 
+Gnuplot treats all numbers less than 1e-08 as zero, by default. Thus, if you
+are trying to plot a collection of very small numbers, they may be plotted
+as zero. Worse, if you're plotting on a log scale, they will be off scale.
+Or, if the whole set of numbers is "zero", your range may be considered
+empty:
 
-        gnuplot> plot 'test1'
-        Warning: empty y range [4.047e-19:3e-11], adjusting to [-1:1]
-        gnuplot> set yrange [4e-19:3e-11]
-        gnuplot> plot 'test1'
-                     ^
-         y range is less than `zero`
+gnuplot> plot 'test1'
+Warning: empty y range [4.047e-19:3e-11], adjusting to [-1:1]
+gnuplot> set yrange [4e-19:3e-11]
+gnuplot> plot 'test1'
+              ^
+y range is less than `zero`
 
-   The solution is to change gnuplot's idea of "zero":
+The solution is to change gnuplot's idea of "zero":
 
-        gnuplot> set zero 1e-20
+gnuplot> set zero 1e-20
 
-   For more information,
+For more information, "help set zero"
 
-        gnuplot> help set zero
+7.4 Gnuplot is plotting nothing when run via gnuplot <filename>! What can I
+do?
 
-   Q7.4: Gnuplot is plotting nothing when run via gnuplot <filename>!
-          What can I do?
-          Put a pause -1 after the plot command in the file.
+Put a pause -1 after the plot command in the file. On an X-Window System
+system, you can also use the -persist option, the X11 window is then not
+closed. Close the X11 window by typing "q" when the focus is on it.
 
-   Q7.5: My formulas are giving me nonsense results! What's going on?
-          Gnuplot does integer, and not floating point, arithmetic on
-          integer expressions. For example, the expression 1/3 evaluates
-          to zero. If you want floating point expressions, supply
-          trailing dots for your floating point numbers. Example:
+7.5 My formulas are giving me nonsense results! What's going on?
 
+Gnuplot does integer, and not floating point, arithmetic on integer
+expressions. For example, the expression 1/3 evaluates to zero. If you want
+floating point expressions, supply trailing dots for your floating point
+numbers. Example:
 
-        gnuplot> print 1/3
+gnuplot> print 1/3
                 0
-        gnuplot> print 1./3.
+gnuplot> print 1./3.
                 0.333333
 
-   This way of evaluating integer expressions is shared by both C and
-          Fortran.
+This way of evaluating integer expressions is shared by both C and Fortran.
+
+7.6 Set output 'filename' isn't outputting everything it should!
+
+You need to flush the output with a closing 'set output'.
+
+7.7 When using the LATEX-terminal, there is an error during the LATEX-run!
+
+Please upgrade to gnuplot 3.7. Some versions of its beta-release had a
+problem in the LATEX-terminal.
+
+7.8 The exit command does not work as documented!
+
+This is a known bug and is fixed in the latest release. If you need the
+feature please upgrade to the latest release.
+
+7.9 I can't find the demos and example files at the URLs in the
+documentation!
+
+The examples have been removec from the NASA site. You can find the examples
+now at ~http://www.gnuplot.vt.edu/gnuplot/gpdocs . There you will find both
+PNG and GIF versions of the demo plots. There are some licensing problems
+with GIF images, so you should probably prefer the PNG ones. They also have
+the advantage to be much smaller in size.
+
+7.10 Calling gnuplot in a pipe or with a gnuplot-script doesn't produce
+aplot!
+
+You can call gnuplot by using a short Perl-script like the following:
+
+#!/usr/bin/perl
+open GP, "/usr/local/bin/gnuplot";
+print GP,"plot '/tmp/data.dat' with lines\n";
+close GP
+
+Gnuplot closes its plot window on exit. The close GP command is executed,
+and the plot window is closed even before you have a chance to look at it.
+
+There are thre solutions to this: first, use the pause -1 command in gnuplot
+before closing the pipe. Second, close the pipe only if you are sure that
+you don't need gnuplot and its plot window anymore. Last, you can use the
+command line option -persist: this option leaves the X-Window System plot
+window open.
+
+8. Credits
 
-   Q7.6: My Linux gnuplot complains about a missing gnuplot_x11. What is
-          wrong?
-          The binary gnuplot distribution from sunsite.unc.edu and its
-          mirrors in Linux/apps/math/gplotbin.tgz is missing one
-          executable that is necessary to access the x11 terminal. Please
-          install gnuplot from another Linux distribution, e.g.
-          Slackware.
+Gnuplot 3.7's main contributors are (in alphabetical order) Hans-Bernhard
+Broeker, John Campbell, Robert Cunningham, David Denholm, Gershon Elber,
+Roger Fearick, Carsten Grammes, Lucas Hart, Lars Hecking, Thomas Koenig,
+David Kotz, Ed Kubaitis, Russell Lang, Alexander Lehmann, Alexander Mai,
+Carsten Steger, Tom Tkacik, Jos Van der Woude, James R. Van Zandt, and Alex
+Woo.
 
-   Q7.7: set output 'filename' isn't outputting everything it should!
-          You need to flush the output with a closing 'set output'.
+This list was initially compiled by John Fletcher with contributions from
+Russell Lang, John Campbell, David Kotz, Rob Cunningham, Daniel Lewart and
+Alex Woo. Reworked by Thomas Koenig from a draft by Alex Woo, with
+corrections and additions from Alex Woo, John Campbell, Russell Lang, David
+Kotz and many corrections from Daniel Lewart. Again reworked for gnuplot 3.7
+by Alexander Mai and Jürgen v.Hagen with corrections by , Lars Hecking,
+Hans-Bernhard Broecker and other people.
 
-  Section 8: Credits
+About this document ...
 
-   This list was initially compiled by John Fletcher with contributions
-   from Russell Lang, John Campbell, David Kotz, Rob Cunningham, Daniel
-   Lewart and Alex Woo. Reworked by Thomas Koenig from a draft
-   by Alex Woo, with corrections and additions from Alex Woo, John
-   Campbell, Russell Lang, David Kotz and many corrections from Daniel
-   Lewart; Axel Eble and Jutta Zimmermann helped with the
-   conversion to HTML.
+Gnuplot FAQ
 
+This document was generated using the LaTeX2HTML translator Version 98.1p1
+release (March 2nd, 1998)
 
+Copyright © 1993, 1994, 1995, 1996, 1997, Nikos Drakos, Computer Based
+Learning Unit, University of Leeds.
 
-    Thomas Koenig, ig25@rz.uni-karlsruhe.de, 1994-03-28
+The command line arguments were:
+latex2html -split 0 -show_section_numbers -html_version 3.2 gnuplot-faq.tex.
 
+The translation was initiated by Juergen von Hagen on 1999-10-20
+  ------------------------------------------------------------------------
+[next] [up] [previous]
+Juergen von Hagen
+1999-10-20
diff -urN gnuplot-3.7/0INSTALL gnuplot-3.7.1/0INSTALL
--- gnuplot-3.7/0INSTALL	Wed Jan 13 21:48:06 1999
+++ gnuplot-3.7.1/0INSTALL	Wed Oct 20 22:19:22 1999
@@ -52,13 +52,16 @@
 
  o with configure's --prefix= option, eg.
    ./configure --prefix=/gnuplot
-   Attention: This affects the location of *all* installed files!
+   gnuplot will look for the online help file, gnuplot.gih, in /gnuplot/share.
+   Attention: This option affects the location of *all* installed files!
 
  o with configure's --datadir= option, eg.
    ./configure --datadir='/gnuplot/docs'
+   gnuplot will look for the online help file, gnuplot.gih, in /gnuplot/docs.
 
  o at make time, eg.
    make HELPFILE='/gnuplot/docs/gnuplot.gih'
+   gnuplot will look for the online help file /gnuplot/docs/gnupot.gih.
 
  o at execution time by specifying the helpfile with the environment
    variable GNUHELP (see "Environment Variables" below).
@@ -68,13 +71,16 @@
 
  o with configure's --prefix= option, eg.
    ./configure --prefix=/gnuplot
+   gnuplot will be installed as /gnuplot/bin/gnuplot.
    Attention: This affects the location of *all* installed files!
 
  o with configure's --bindir= option, eg.
    ./configure --bindir='/gnuplot/bin'
+   gnuplot will be installed as /gnuplot/bin/gnuplot.
 
  o at make time, eg.
-   make GNUPLOT_BINDIR='/gnuplot/bin'
+   make BINDIR='/gnuplot/bin'
+   gnuplot will be installed as /gnuplot/bin/gnuplot.
 
    If the executables are not installed in the default location, files
 written by the `save' command cannot be used as scripts on Un*x platforms.
@@ -121,12 +127,10 @@
   --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
   --includedir=DIR        C header files in DIR [PREFIX/include]
   --mandir=DIR            Man documentation in DIR [PREFIX/man]
-  --without-readline      Do not use the included readline function
-  --with-gnu-readline     Use the GNU readline version  If you don't use this,
-                          you won't have file name completion.
-  --with-gnu-readline=PATH        Specify the location of libreadline.
-                          Use this form if your libreadline is not installed
-                          where your linker can find it.
+  --with-readline (*)     use the builtin minimal readline function
+  --without-readline      do not use the builtin readline function
+  --with-readline=gnu     use the GNU readline library
+  --with-readline=PATH            Specify the location of GNU readline
   --with-plot             use the Unix plot library
   --with-plot=PATH                Specify the location of GNU libplot
   --with-gd (*)           Enable gif terminal with Tom Boutell's gd library
@@ -135,13 +139,11 @@
   --with-png (*)          Enable png terminal
                           (requires libpng and libz)
   --with-png=PATH                 Specify the location of libpng
-  --with-cwdrc            Check current directory for .gnuplotrc file,
-                          normally disabled for security reasons. However,
-                          the home directory is always checked for a
-                          .gnuplotrc file.
-  --with-lasergnu         Install lasergnu printer script
-  --without-linux-vga (*) Do not use the Linux console driver
-                          (requires Linux SVGAlib /usr/lib/libvga)
+  --with-cwdrc            check current directory for .gnuplot file,
+                          normally disabled for security reasons
+  --with-lasergnu         install lasergnu printer script
+  --with-linux-vga        use the Linux SVGA console driver
+                          (requires /usr/lib/libvga)
   --enable-apollo         Apollo Graphics Primitive Resource
   --enable-gpr            Apollo Graphics Primitive Resource (fixed-size window)
   --enable-cgi            enable CGI terminal (SCO only)
@@ -184,22 +186,36 @@
 VMS
 ---
 
-   On VMS, invoke MAKE_VMS.COM (or BUILDVMS.COM if you have MMS or MMK
-but don't want to use the supplied DESCRIP.MMS).  You may get warnings
-or more serious errors depending on the versions of the C compiler, the 
-C run-time libraries, and {Open}VMS on your system.  
-
-
-  To compile using DEC MMS or MMK (PD clone),
-     invoke MMS or MMK with the supplied descrip.mms
-  Or if you have a unix-like make utility
-     copy makefile.vms makefile
-     make
+   On VMS, you can use MMS, MMK, or another make utility, or you can
+use BUILDVMS.COM.  The supplied files work with Alpha/VMS V6.2 and
+DECC V5.7; you may get warnings or more serious errors depending on
+the versions of the C compiler, the C run-time libraries, and VMS on
+your system.
+
+  To compile using MMK:
+     MMK/DESCRIPTION=MAKEFILE.VMS
+  To compile using MMS on VAX:
+     MMS/DESCRIPTION=MAKEFILE.VMS
+  To compile using MMS on Alpha:
+     MMS/DESCRIPTION=MAKEFILE.VMS/MACRO=__ALPHA__=1
+
+  Alternatively, you can use MAKE_VMS.COM.  This command file will run
+MMK or MMS to build gnuplot.  If you don't have either one installed, it
+will use the command file.  The first parameter on the command line is
+the compiler you want to use (default DECC).
+
+  It may sometimes be useful to add  `/IGNORE=WARNING' to the `MMS' call.
+
+  To compile using GNUC or VAXC:
+     add /MACRO=GNUC or /MACRO=VAXC to the above command
+  To compile with another make utility:
+     check the documentation of your utility to specify the description
+     file and any necessary macros (__ALPHA__, GNUC, or VAXC)
   Or if you don't have a suitable make:
-     @buildvms
+     @BUILDVMS
   To tell gnuplot where to find the help library:
-      $ define gnuplot$help disk:[directory]gnuplot.hlb
-  Alternatively (and preferably) put the help in the main system help library.
+     $ define gnuplot$help disk:[directory]gnuplot.hlb
+  Alternatively, put the help in the main system help library.
 
 AmigaOS
 -------
@@ -208,6 +224,18 @@
       make -f makefile.ami
 Using SAS/C 6.1 or later versions
       smake -f makefile.amg
+      You can also copy makefile.amg to smakefile and just type `smake'.
+
+      At the beginning of makefile.amg you will find a configuration
+      section where you have to adjust all settings which control the build
+      process. Most important is probably to select the terminal devices
+      which should be supported. You can create a version offering
+      png graphics as well as gif support. Use the appropriate settings
+      for CPU and MATH to compile for a specific machine type.
+      Be sure to enable only those devices for which you have the 
+      necessary software already installed. Also ensure that the
+      libraries and the sources are all compiled using the same
+      settings for CPU and MATH.
 Using gcc: see Unix
 
 Atari/TOS
@@ -238,6 +266,12 @@
   Put wgnuplot.exe, wgnuplot.dll, wgnuplot.hlp and wgnuplot.mnu
   in the windows directory.
 
+Using Visual C++ and compiling for Windows NT/95/98
+      nmake -f makefile.nt
+ or
+      copy makefile.nt makefile
+      nmake
+
 Using the MinGW32 port of egcs: you need the Micrsoft SDK for the
 moment.
       copy makefile.mgw makefile
@@ -335,10 +369,12 @@
 to the CGI agents, and the CGIDISP and/or CGIPRNT environment variables
 to set the output devices.
 
- If using dynamically linked executables with the X11 Window System, it
-may be necessary to define LD_LIBRARY_PATH - see man ld for details.
-It is, however, prefered to use the appropriate linker options, eg.
--R under Solaris, or -rpath under DEC Unix and Irix.
+ If creating dynamically linked executables for the X11 Window System, it
+may be necessary to add flags to the LIBS variable in Makefile
+to make sure gnuplot finds all required libraries at runtime.  Systems like
+SunOS and Solaris use -R to specify the runtime library search path, whereas
+OSF/Dec Unix, Irix and Linux use -rpath. If this is not possible, the
+LD_LIBRARY_PATH environment variable should be set.
 
 About --with-PACKAGE[=PATH]
 ***************************
@@ -570,7 +606,7 @@
 
         G N U P L O T
         Unix version 3.7
-        patchlevel 0
+        patchlevel 1
         last modified Tue Jan 12 13:48:06 BST 1999
 
         Copyright(C) 1986 - 1993, 1998
diff -urN gnuplot-3.7/0README gnuplot-3.7.1/0README
--- gnuplot-3.7/0README	Wed Jan 13 21:48:26 1999
+++ gnuplot-3.7.1/0README	Wed Oct 20 22:19:23 1999
@@ -184,11 +184,12 @@
 Date: Fri Aug 27 05:21:33 GMT 1993
 
 
-Version: 3.7
+Version: 3.7.1
 
-In general, GNUPLOT 3.7 is available as the file gnuplot-3.7.tar.gz.
+In general, GNUPLOT 3.7.1 is available as the file gnuplot-3.7.1.tar.gz.
 Because of the numerous changes since version 3.5, no patch files
-will be available to bring 3.5 to 3.7.
+will be available to bring 3.5 to 3.7. But there is a patch relative
+to version 3.7.
 (Version 3.6 was skipped because of possible confusion
 with the numerous BETA releases.)  It will be made available at web
 and ftp sites listed below, along with DOS, MS-Windows 3.1,
@@ -205,17 +206,17 @@
 NORTH AMERICA:
 
      Anonymous ftp to ftp.gnuplot.vt.edu:
-     ftp://ftp.gnuplot.vt.edu/pub/gnuplot/gnuplot-3.7.tar.gz
+     ftp://ftp.gnuplot.vt.edu/pub/gnuplot/gnuplot-3.7.1.tar.gz
 
      Alternatively, you can use your web browser to get gnuplot
      from the gnuplot web pages at
 
-     http://members.theglobe.com/gnuplot/gp37tar.gz
-     http://www.geocities.com/SiliconValley/Foothills/6647/gp37tar.gz
+     http://members.theglobe.com/gnuplot/gp371tar.gz
+     http://www.geocities.com/SiliconValley/Foothills/6647/gp371tar.gz
 
      Anonymous ftp to ftp.dartmouth.edu. Please try the
      other sites first!
-     ftp://ftp.dartmouth.edu/pub/gnuplot/gnuplot-3.7.tar.gz
+     ftp://ftp.dartmouth.edu/pub/gnuplot/gnuplot-3.7.1.tar.gz
 
 [ At time of release, we are not sure whether this service
   is still available. -lh
@@ -227,7 +228,7 @@
         open
         cd pub/gnuplot
         mode binary
-        get gnuplot-3.7.tar.Z
+        get gnuplot-3.7.1.tar.Z
         quit
 
      If you have some problem, you might need to stick 
@@ -239,18 +240,24 @@
 
 AUSTRALIA:
 
+     From the AARNet Mirror Project:
+     ftp://mirror.aarnet.edu.au/pub/gnuplot/
+     http://mirror.aarnet.edu.au/pub/gnuplot/
+
      Anonymous ftp to ftp.cc.monash.edu.au:
-     ftp://ftp.cc.monash.edu.au/pub/gnuplot/gnuplot-3.7.tar.gz
+     ftp://ftp.cc.monash.edu.au/pub/gnuplot/gnuplot-3.7.1.tar.gz
 
 
 EUROPE:
 
      Anonymous ftp to ftp.irisa.fr:
-     ftp://ftp.irisa.fr/pub/gnuplot/gnuplot-3.7.tar.gz
+     ftp://ftp.irisa.fr/pub/gnuplot/gnuplot-3.7.1.tar.gz
+
+     Anonymous ftp to ftp.ucc.ie:
+     ftp://ftp.ucc.ie/pub/gnuplot/gnuplot-3.7.1.tar.gz
+
 
 ----
 
                                         -Thomas Williams-
-                                        -Alex Woo-
-                                        -David Denholm-
                                         -Lars Hecking-
diff -urN gnuplot-3.7/ChangeLog gnuplot-3.7.1/ChangeLog
--- gnuplot-3.7/ChangeLog	Thu Jan 14 19:33:43 1999
+++ gnuplot-3.7.1/ChangeLog	Thu Oct 21 15:15:07 1999
@@ -1,3 +1,371 @@
+1999-10-21  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* configure.in: Fix compile/link on NeXT without side effects ...
+
+1999-10-20  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* 0INSTALL, 0README, NEWS: Updated for 3.7.1.
+
+	* configure.in: Fix for linking gnuplot_x11 on LynxOS 3.0.1.
+
+1999-10-20  John Hasstedt  <manager@nuclear.physics.sunysb.edu>
+
+	* buildvms.com, makefile.vms: Updated. Create binary data files in
+	the right directory.
+
+1999-10-19  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* term/png.trm: Back out Eric and HBB's changes (back to 16 colours,
+	no transparency).
+
+	* term/tkcanvas.trm: More fixes by Thomas Sefzick and Matt Willis.
+
+1999-10-19  Hans-Bernhard Broeker  <broeker@physik.rwth-aachen.de>
+
+	* graph3d.c(boundary3d): Fix division by zero problem.
+
+	* makefile.win, plot.h: Changes for compilation with newer Borland
+	Win32 compilers.
+
+	* win/pgnuplot.c: Changes to enable compilation with more compilers.
+
+	* win/wgnuplot.def: Reduce stacksize by 500 bytes to fix
+	'DGROUP exceeds 64K' problem.
+
+1999-10-16  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* syscfg.h: cc on NetBSD doesn't define unix anymore.
+
+1999-10-15  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* Makefile.in: Add m4/select.m4 to ETC.
+
+	* configure.in: AC_FUNC_SELECT replaces AC_FUNC_SELECT_ARGTYPES.
+
+	* gplt_x11.c, stdfn.h: Updated for new select argtype macro.
+
+	* m4/select.m4: New macro for select argtypes.
+
+1999-10-11  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* help.c: Change subtopic help entry formatting to skip next column
+	if very long entries are encountered.
+
+1999-10-11  Thomas Sefzick  <t.sefzick@fz-juelich.de>
+
+	* term/tkcanvas.trm: Bug fix, some comments added.
+
+1999-10-11  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* help.c: Change help index formatting to start in column 4
+ 	(instead 6) and use column length of 18 (instead 15).
+
+1999-10-11  "Eric S. Raymond"  <esr@thyrsus.com>
+
+	* demo/airfoil.dem, demo/animate.dem, demo/binary.dem,
+	demo/controls.dem, demo/electron.dem, demo/fit.dem, demo/hidden.dem,
+	demo/mgr.dem, demo/param.dem, demo/polar.dem, demo/prob.dem,
+	demo/prob2.dem, demo/scatter.dem, demo/simple.dem, demo/spline.dem,
+	demo/steps.dem, demo/surface1.dem, demo/surface2.dem, demo/timedat.dem,
+	demo/using.dem: Demo directory cleanup patch. Box a bunch of legends
+	and use reset instead of ad-hoc set statements.
+
+1999-10-11  Hans-Bernhard Broeker  <broeker@physik.rwth-aachen.de>
+
+	* bitmap.c, term/png.trm: Fix some shortcomings of ESR's png patches.
+
+	* plot2d.c: Bugfix for logscale plots with unused y2 axis.
+
+1999-10-01  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* fit.c, docs/Makefile.in: Fix typos.
+
+	* term/pslatex.trm(PSLATEX_graphics): Fix segfault when `auxfile'
+	option is not used.
+
+1999-10-01  John Hasstedt  <manager@nuclear.physics.sunysb.edu>
+
+	* 0INSTALL, make_vms.com: Make VMS builds easier and add note
+	about make_vms.com.
+
+1999-10-01  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* fit.c: Backported some fixes from -current, including the time
+	series fit code by Remko Scharroo.
+
+	* protos.h, term.c: Add new tewrm_count() function.
+
+	* syscfg.h: Update FAQ location.
+
+1999-09-29  Hans-Bernhard Broeker  <broeker@physik.rwth-aachen.de>
+
+	* misc.c, show.c: In the SAVE/SHOW_NUM_OR_TIME macro, add a '#'
+	to the format specifier in the fprintf() call. This adds a decimal
+	point to the saved 'set ?range' commands to prevent integer
+	overflow on 16 bit platforms when the saved commands are loaded.
+
+1999-09-29  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* bitmap.c, bitmap.h: RGB colour table moved from term/gif.trm.
+
+	* docs/Makefile.in: Add rules to generate gnuplot.pdf. Requires
+	pdflatex.
+
+	* term/driver.h: Fix typo.
+
+	* term/gif.trm, term/png.trm: Remove unused vars.
+
+1999-09-29  "Eric S. Raymond"  <esr@thyrsus.com>
+
+	* term/png.trm: Add transparency support for color images. Update
+	for pnglib-1.0.3.
+
+	* term/gif.trm, term/png.trm: Remove RGB colour table from gif.trm,
+	let both drivers share the table in bitmap.c.
+
+1999-09-28  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* term/gif.trm: Backport from -current. New "tiny" and "giant"
+	font size options.
+
+1999-09-27  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* term/tkcanvas.trm: Backport from -current, integrated perltk and
+	extended interactive Tk/Tcl capabilities.
+
+1999-09-24  Hans-Bernhard Broeker  <broeker@physik.rwth-aachen.de>
+
+	* plot2d.c(get_data): Check for minimum number of required data
+	columns.
+
+1999-09-23  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* 0FAQ: Updated.
+
+	* gplt_x11.c(record): read_input() takes no arguments.
+
+	* plot.c: Remove nested comment.
+
+1999-09-21  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* Makefile.in, configure.in, m4/next.m4: Remove references to NEXTOBJS.
+
+	* aclocal.m4, configure: Regenerated.
+
+	* win/wgnuplib.h, win/wgnuplot.def, win/winmain.c, win/wtext.c:
+	Update from gnuplot-current.
+
+1999-09-16  "Daniel H. Luecking"  <luecking@comp.uark.edu>
+
+	* term/metapost.trm: Minor updates.
+
+1999-09-15  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* graph3d.c, graphics.c: write_multiline() is not modifying its
+	char *text argument anymore, so that no temporary strings must
+	be allocated before calling write_multiline(). Backported from
+	gnuplot-current.
+
+1999-09-14  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* FAQ: Updated.
+
+	* term.c(test_term): Fix bug where test pattern is drawn before
+	line properties are fully specified. Combined effort by
+	"Jürgen v.Hagen" <vonhagen@ihefiji.etec.uni-karlsruhe.de> and
+	Dick Crawford <crawford@arete.com>.
+
+	* util.c: Fix quoting bug, minor changes (backported from -current).
+
+1999-09-14  Hans-Bernhard Broeker  <broeker@physik.rwth-aachen.de>
+
+	* graph3d.c: Fix old bug which caused 'xzeroaxis' and 'yzeroaxis' to
+	mean the opposite of each other in splots.
+
+1999-08-25  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* Makefile.in, makefile.all: Updated.
+
+1999-08-25  John Hasstedt  <manager@nuclear.physics.sunysb.edu>
+
+	* 0INSTALL: VMS section updated.
+
+	* descrip.mms: Removed.
+
+	* buildvms.com, gnuplot.opt, makefile.vms: Updated.
+
+	* gplt_x11.c: Use strnicmp() instead of strncasecmp().
+
+	* x11.opt: New file.
+
+	* term/x11.trm: Fix order of arguments in os_error() in VMS part.
+
+1999-08-25  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* term.h: Updated from current development version.
+
+	* term/metapost.trm: There is no gp_strdup() in this version.
+	Replaced with gp_alloc() and strcpy().
+
+1999-08-24  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* makefile.cyg: Updated version from W. Kirby.
+
+1999-08-21  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* docs/latextut/header.tex: Modified for LaTeX2e.
+
+	* term/fig.trm, term/object.h: Change O_TEXT to OBJ_TEXT. The former
+	is declared in system header files on DOS/Windows platforms.
+
+1999-08-20  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* docs/Makefile.in: Fix INCLUDES line.
+
+	* Makefile.in, docs/Makefile.in, makefile.all: Add metapost.trm and
+	openstep.trm to CORETERM.
+
+	* term/be.trm, term/metapost.trm, term/openstep.trm: New drivers,
+	imported from current dev tree.
+
+1999-08-19  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* command.c, makefile.os2, makefile.unx, plot.c, protos.h, readline.c,
+	show.c: GNU_READLINE symbol replaced with HAVE_LIBREADLINE.
+
+	* configure.in: Update errno check. Remove readline header checks.
+
+	* configure: Regenerated.
+
+	* docs/Makefile.in: Fix dependencies.
+
+1999-08-17  Lars Hecking  <lhecking@nmrc.ucc.ie>
+
+	* Prepare for 3.7.1 release: create branch-pre-3-7-1.
+
+	* 0FAQ: Update to current version.
+
+	* 0INSTALL, Makefile.in, NEWS: Updated.
+
+	* acconfig.h: Remove unnecessary defines, now generated by
+	autoheader from configure.in.
+
+	* aclocal.m4, config.hin, configure: Regenerated.
+
+	* ansichek.h: Fix inconsistency with ANSI_C definition.
+
+	* configure.in, docs/Makefile.in, docs/doc2info.c, gplt_x11.c:
+	Mostly backported from current development source.
+
+	* command.c, time.c: Y2K fixes.
+
+	* datafile.c: Various bugfixes.
+
+	* demo/contours.dem, demo/singulr.dem, demo/surface2.dem,
+	demo/world.dem: Demos fixed for the 'set view <z_scale>' problem.
+
+	* docs/gnuplot.doc: Update for postscript driver linewidth fix.
+
+	* docs/gnuplot.doc: Add argument list to function names. Add
+	better documentation for margins and tics.
+
+	* docs/doc2info.c: Add info menu entry.
+
+	* fit.c: Value of last parameter is not stored in its
+	variable as it should.
+
+	* gplt_x11.c: Buffering bug fixed.
+
+	* graph3d.c: Fix 'set view <z_scale>' problem, fix crash with
+	empty key and 'set nosurface'.
+
+	* graphics.c: Fix negative aspect ratio. Fix for '"set lmargin"
+	fails when the specified margin is too small'. Fix multiline xlabel.
+	Fix bug in multiplot with eps output.
+
+	* hidden3d.c: Fix bug with surface plots and negative ticslevel.
+
+	* interpol.c: Rewrite 'bezier' interpolation routine, to prevent
+	numerical overflow and other undesirable things happening for
+	large data files.
+
+	* m4/*.m4: Updated from current development sources.
+
+	* makefile.amg: Improved makefile for Amiga SAS/C.
+
+	* misc.c, src/show.c: Fix bug in 'save format'.
+
+	* misc.c: In batch mode, gnuplot does not exit when either the
+ 	'exit' or 'quit' command is encountered. Work around bug in
+	egcs on LinuxPPC.
+
+	* plot.c: Let gnuplot pass the correct exit status back to the
+	calling environment. Add better handling of root privilege.
+
+	* plot2d.c: Fix bug in x2/y2 logscale/autoscale.
+
+	* set.c: Fix 'set noautoscale' for x2/y2/z axis.
+
+	* show.c: Fix 'show autoscale' for x2/y2/z axis.
+
+	* syscfg.h: Fix incomplete version string on HP-UX.
+
+	* term/cgm.trm: Numerous bugfixes in the cgm driver:
+	(1) The parameter list length of the CGM record is including padding
+	length (must NOT include the padding length).
+	(2) The format of 'color table' (class 5 id 34) is wrong.  The first
+	element is the starting index (usually 0), NOT the number of colors.
+	(3) The format of 'font table' (class 1 id 13) is wrong.  This is the
+	list of 'String Fixed Data'. Do NOT include the total length.
+	(4) Transparency (class 3 id 4) is set to 'off' but I think it is
+	better to set 'on' because sometimes character cells are overlapped.
+
+	Allow < 1.0 values for linewidth.
+
+	* term/gif.trm: Fix off-by-one yscale problem.
+
+	* term/gnugraph.trm: Add GNU plotutils 2.2+ support.
+
+	* term/latex.trm: Add prototypes for EEPIC functions. Embedding
+	document font is now default font.
+
+	* term/linux.trm: Code added to handle root privilege properly.
+
+	* term/next.trm: Fix typo.
+
+	* term/png.trm: Reorder case statements, add default cases.
+
+	* term/post.trm: Fix to allow "set border ... lw ..." and
+	"set grid ... lw ..." to work correctly.
+
+	* term/pslatex.trm: Fix off-by-one error and creation of ps auxfile
+	name.
+
+	* term/pstricks.trm: Fix off-by-one error.
+
+	* term/x11.trm: Rewrite option handling. Use execvp() instead of
+	execl().
+
+	* term.c: Fix for NeXT driver initialisation.
+
+	* term.h: Add missing define.
+
+	* version.c: Updated.
+
+	* win/pgnuplot.c: Add new file to allow use of stdin under Windows.
+
+	* win/wgnuplib.h, win/wgraph.c: Someone had complained that modifying
+	the width of linestyle 1 in Windows gnuplot (via the context menu of
+	the graph window) caused all the point symbols to be drawn with wide
+	lines of linetype 1, as well. This turned out to be a rather, well,
+	silly decision regarding the effect of line style changes on the
+	drawing of point symbols, having been unchanged ever since gnuplot
+	3.5 was ported to Windoze: the point symbols would be drawn in
+	another color than the corresponding sample lines, in the 'test'
+	page, if any linestyle was changed to 'dotted'. I now use the same
+	color as the corresponding line for all plot symbols, but without
+	the dashing/dotting or widening.
+
 1999-01-14  Lars Hecking  <lhecking@nmrc.ucc.ie>
 
 	* Makefile.in, makefile.all: Add PGPKEYS to ETC.
diff -urN gnuplot-3.7/CodeStyle gnuplot-3.7.1/CodeStyle
--- gnuplot-3.7/CodeStyle	Fri Nov 20 22:20:20 1998
+++ gnuplot-3.7.1/CodeStyle	Fri Nov 20 22:20:20 1998
@@ -1,4 +1,4 @@
-$Id: CodeStyle,v 1.9 1996/12/19 19:12:28 drd Exp $
+$Id: CodeStyle,v 1.5 1998/11/20 22:20:20 lhecking Exp $
 
 The following things have be observed when writing new code for gnuplot:
 (this file is currently under construction)  Some of the following is
diff -urN gnuplot-3.7/Makefile.in gnuplot-3.7.1/Makefile.in
--- gnuplot-3.7/Makefile.in	Thu Jan 14 19:34:08 1999
+++ gnuplot-3.7.1/Makefile.in	Wed Oct 27 12:15:10 1999
@@ -1,6 +1,6 @@
 ############################################################
 #
-# $Id: Makefile.in,v 1.50 1998/06/18 14:55:00 ddenholm Exp $
+# $Id: Makefile.in,v 1.42.2.7 1999/10/27 11:15:10 lhecking Exp $
 #
 # GNUPLOT Makefile.in for autoconf (Unix X11 support)
 # Adapted from makefile.unx by djm@gnu.ai.mit.edu
@@ -151,7 +151,7 @@
 D=$(srcdir)/docs/
 L=$(srcdir)/docs/latextut/
 Q=$(srcdir)/docs/old/
-S=$(srcdir)/docs/ps/
+S=$(srcdir)/docs/psdoc/
 M=$(srcdir)/demo/
 N=$(srcdir)/NeXT/
 P=$(srcdir)/os2/
@@ -165,7 +165,7 @@
 #<<<makefile.all>>>
 ########################################################
 #
-# $Id: Makefile.in,v 1.50 1998/06/18 14:55:00 ddenholm Exp $
+# $Id: Makefile.in,v 1.42.2.7 1999/10/27 11:15:10 lhecking Exp $
 #
 ########################################################
 #
@@ -191,7 +191,7 @@
 # D as the prefix for docs (eg docs/)
 # L as the prefix for latex tutorial (eg docs/latextut/ or [.docs.latextut])
 # Q as the prefix for old doc files (eg docs/old)
-# S as the prefix for postscript docs (eg docs/ps)
+# S as the prefix for postscript docs (eg docs/psdoc)
 # M as the prefix for demos (eg demo/)
 # N as the prefix for NeXT (eg NeXT/)
 # P as the prefix for OS/2 (eg os2/)
@@ -220,19 +220,19 @@
 	  matrix.h national.h plot.h protos.h setshow.h stdfn.h syscfg.h term.h
 
 CORETERM = $(T)aed.trm $(T)ai.trm $(T)amiga.trm $(T)apollo.trm \
-	   $(T)atariaes.trm $(T)atarivdi.trm $(T)cgi.trm $(T)cgm.trm \
-	   $(T)compact.c $(T)corel.trm $(T)debug.trm $(T)djsvga.trm \
-	   $(T)driver.h $(T)dumb.trm $(T)dxf.trm $(T)dxy.trm $(T)eepic.trm \
-	   $(T)emxvga.trm $(T)epson.trm $(T)excl.trm $(T)fg.trm $(T)fig.trm \
-	   $(T)gif.trm $(T)gnugraph.trm $(T)gpic.trm $(T)gpr.trm \
+	   $(T)atariaes.trm $(T)atarivdi.trm $(T)be.trm $(T)cgi.trm \
+	   $(T)cgm.trm $(T)compact.c $(T)corel.trm $(T)debug.trm \
+	   $(T)djsvga.trm $(T)driver.h $(T)dumb.trm $(T)dxf.trm $(T)dxy.trm \
+	   $(T)eepic.trm $(T)emxvga.trm $(T)epson.trm $(T)excl.trm $(T)fg.trm \
+	   $(T)fig.trm $(T)gif.trm $(T)gnugraph.trm $(T)gpic.trm $(T)gpr.trm \
 	   $(T)grass.trm $(T)hp26.trm $(T)hp2648.trm $(T)hp500c.trm \
 	   $(T)hpgl.trm $(T)hpljii.trm $(T)hppj.trm $(T)imagen.trm \
 	   $(T)impcodes.h $(T)iris4d.trm $(T)kyo.trm $(T)latex.trm \
-	   $(T)linux.trm $(T)mac.trm $(T)metafont.trm $(T)mgr.trm \
-	   $(T)mif.trm $(T)multitos.trm $(T)next.trm $(T)object.h \
-	   $(T)pbm.trm $(T)pc.trm $(T)pm.trm $(T)png.trm $(T)post.trm \
-	   $(T)pslatex.trm $(T)pstricks.trm $(T)qms.trm $(T)regis.trm \
-	   $(T)rgip.trm $(T)sun.trm $(T)t410x.trm $(T)table.trm \
+	   $(T)linux.trm $(T)mac.trm $(T)metafont.trm $(T)metapost.trm \
+	   $(T)mgr.trm $(T)mif.trm $(T)multitos.trm $(T)next.trm $(T)object.h \
+	   $(T)openstep.trm $(T)pbm.trm $(T)pc.trm $(T)pm.trm $(T)png.trm \
+	   $(T)post.trm $(T)pslatex.trm $(T)pstricks.trm $(T)qms.trm \
+	   $(T)regis.trm $(T)rgip.trm $(T)sun.trm $(T)t410x.trm $(T)table.trm \
 	   $(T)tek.trm $(T)texdraw.trm $(T)tgif.trm $(T)tkcanvas.trm \
 	   $(T)tpic.trm $(T)unixpc.trm $(T)unixplot.trm $(T)v384.trm \
 	   $(T)vws.trm $(T)win.trm $(T)x11.trm $(T)xlib.trm
@@ -256,10 +256,10 @@
 	 $(P)gnupmdrv.c $(P)gnupmdrv.def $(P)gnupmdrv.h $(P)gnupmdrv.ipf \
 	 $(P)gnupmdrv.rc $(P)print.c
 
-WINDOWS = $(W)geticon.c $(W)wcommon.h $(W)wgnupl32.def $(W)wgnuplib.c \
-	  $(W)wgnuplib.def $(W)wgnuplib.h $(W)wgnuplib.rc $(W)wgnuplot.def \
-	  $(W)wgnuplot.hpj $(W)wgnuplot.mnu $(W)wgnuplot.rc $(W)wgraph.c \
-	  $(W)winmain.c $(W)wmenu.c $(W)wpause.c $(W)wprinter.c \
+WINDOWS = $(W)pgnuplot.c $(W)geticon.c $(W)wcommon.h $(W)wgnupl32.def \
+	  $(W)wgnuplib.c $(W)wgnuplib.def $(W)wgnuplib.h $(W)wgnuplib.rc \
+	  $(W)wgnuplot.def $(W)wgnuplot.hpj $(W)wgnuplot.mnu $(W)wgnuplot.rc \
+	  $(W)wgraph.c $(W)winmain.c $(W)wmenu.c $(W)wpause.c $(W)wprinter.c \
 	  $(W)wresourc.h $(W)wtext.c $(W)wtext.h
 
 # not C code, but still needed
@@ -283,7 +283,7 @@
 ETC =   0BUGS 0FAQ 0INSTALL 0PORTING 0README ChangeLog CodeStyle Copyright \
 	INSTALL.gnu Makefile.in NEWS PGPKEYS TODO acconfig.h $(ACLOCAL_M4) \
 	amiga.c buildvms.com commitvers $(CONFIG_HEADER_IN) configure \
-	configure.in corgraph.asm corplot.c ctrl87.c ctrl87.h descrip.mms \
+	configure.in corgraph.asm corplot.c ctrl87.c ctrl87.h \
 	djconfig.sh errorfix.sh genopt.com gnuplot.def gnuplot.el gnuplot.opt \
 	gnuplot.prj header.mac hrcgraph.asm install-sh intergra.x11 lasergnu \
 	lineproc.mac linkopt.vms linkopt.ztc make_vms.com makefile.286 \
@@ -292,16 +292,17 @@
 	makefile.msw makefile.mto makefile.nt makefile.os2 makefile.os9 \
 	makefile.st makefile.tc makefile.unx makefile.vms makefile.wc \
 	makefile.win makefile.ztc missing mkinstalldirs os9.c pcgraph.asm \
-	rgipgnu stamp-h.in strftime.c vms.c m4/msdos.m4 m4/next.m4 \
-	m4/search-hdr.m4 m4/search-lib.m4 $(T)README 
+	rgipgnu stamp-h.in strftime.c vms.c x11.opt m4/msdos.m4 m4/next.m4 \
+	m4/path-hdr.m4 m4/path-lib.m4 m4/select.m4 $(T)README
 
 # Documentation and help files
 DOCS1 = $(D)Makefile.in $(D)README $(D)checkdoc.c $(D)doc2gih.c \
 	$(D)doc2hlp.c $(D)doc2hlp.com $(D)doc2html.c $(D)doc2info.c \
 	$(D)doc2ipf.c $(D)doc2ms.c $(D)doc2rnh.c $(D)doc2rtf.c $(D)doc2tex.c \
-	$(D)doc2texi.pl $(D)doc2x.h $(D)gnuplot.1 $(D)lasergnu.1 \
-	$(D)makefile.dst $(D)makefile.ami $(D)termdoc.c $(D)titlepag.ms \
-	$(D)titlepag.tex $(D)toc_entr.sty $(D)xref.c $(D)xref.h
+	$(D)doc2texi.el $(D)doc2texi.pl $(D)doc2x.h $(D)gnuplot.1 \
+	$(D)gnuplot.texi $(D)lasergnu.1 $(D)makefile.dst $(D)makefile.ami \
+	$(D)termdoc.c $(D)titlepag.ms $(D)titlepag.tex $(D)toc_entr.sty \
+	$(D)xref.c $(D)xref.h
 DOCS2 = $(D)gnuplot.doc $(D)gpcard.tex
 DOCS3 = $(L)Makefile.in $(L)eg1.plt \
 	$(L)eg2.plt $(L)eg3.dat $(L)eg3.plt \
@@ -345,7 +346,7 @@
 
 # List of object files except version.o
 
-OBJS = $(COREOBJS) @NEXTOBJS@
+OBJS = $(COREOBJS)
 
 ################################################################
 
@@ -423,8 +424,8 @@
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): configure.in m4/msdos.m4 m4/next.m4 m4/search-hdr.m4 \
-		m4/search-lib.m4
+$(ACLOCAL_M4): configure.in m4/msdos.m4 m4/next.m4 m4/path-hdr.m4 \
+		m4/path-lib.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -456,7 +457,7 @@
 
 SUBDIRS = NeXT NeXT/English.lproj NeXT/English.lproj/GnuTerm.nib \
 	  NeXT/English.lproj/gnuview.nib demo docs docs/latextut docs/old \
-	  docs/ps m4 os2 term win
+	  docs/psdoc m4 os2 term win
 
 clean:
 	rm -f gnuplot gnuplot_x11 bf_test *.o core *~
diff -urN gnuplot-3.7/NEWS gnuplot-3.7.1/NEWS
--- gnuplot-3.7/NEWS	Mon Dec  7 22:11:39 1998
+++ gnuplot-3.7.1/NEWS	Wed Oct 27 11:10:42 1999
@@ -1,3 +1,33 @@
+Changes in release 3.7.1:
+* Updated makefiles and autoconf files
+* Updated documentation and FAQ
+* Added Windows stdin wrapper
+* New drivers for Be, metapost, MacOS X Server
+* Improved configuration of GNU readline support
+* Security: the Linux SVGAlib driver is now disabled by default
+* Support for GNU plotutils 2.2
+* Improved tkcanvas driver (extend interactive capabilities, integrated
+  perltk driver)
+* Fixed compiling on IRIX 6.5, LynxOS 3.0.1
+* Bug fix for negative aspect ratio
+* Bug fixes in the cgm, eepic, png, and pslatex drivers
+* Bug fix in the data fitting code (store value of last parameter)
+* Bug fixes for HP-UX, NEXT, and Windows
+* Bug fixes for save and set lmargin commands
+* Bug fix for 'set view <z_scale>' (compressed z-axis) problem
+* Bug fix for surface plots and negative ticslevel
+* Bug fix for multiline labels
+* Bug fix for multiplot and eps output
+* Improved makefile for Amiga SAS/C
+* Bug fixed with exit/quit in batch mode
+* Return proper exit status
+* Buffering bug in X11 driver fixed
+* Added fitting of time series data
+* Embedding document font is now default font in latex output
+* Y2K: "%y" date format interpretation is now in line with
+  Open Group recommendations
+* Bugfix for logscale with unused y2 axis
+
 What's new in 3.7 ?
 
 from 315 to 348
diff -urN gnuplot-3.7/acconfig.h gnuplot-3.7.1/acconfig.h
--- gnuplot-3.7/acconfig.h	Tue Jan 12 14:03:28 1999
+++ gnuplot-3.7.1/acconfig.h	Thu Aug 19 15:42:42 1999
@@ -14,90 +14,6 @@
    Leave the following blank line there!!  Autoheader needs it.  */
 
 
-/* Define if you want to use the Apollo Graphics Primitive Resource.  */
-#undef APOLLO
-
-/* Define if you want to use the CGI terminal under SCO.  */
-#undef CGI
-
-/* Define if you want to use libgrx20 with MSDOS/djgpp.  */
-#undef DJSVGA
-
-/* Define if this system uses a 32-bit DOS extender (djgpp/emx).  */
-#undef DOS32
-
-/* Define if <errno.h> declares errno.  */
-#undef EXTERN_ERRNO
-
-/* Define if you are using the GNU readline library.  */
-#undef GNU_READLINE
-
-/* Define if your libplot.a is from GNU plotutils.  */
-#undef GNU_PLOTUTILS
-
-/* Define if you want to use the GNU version of the Unix plot library.  */
-#undef GNUGRAPH
-
-/* Define if you want to use the Apollo Graphics Primitive Resource (fixed-size window.  */
-#undef GPR
-
-/* Define if you want to use a newer version of libgrx under MSDOS/djgpp.  */
-#undef GRX21
-
-/* Define if you have Thomas Boutell's gd library.  */
-#undef HAVE_LIBGD
-
-/* Define if you have the png library.  */
-#undef HAVE_LIBPNG
-
-/* Define if you want to use the IRIS terminal on IRIS4D series computers.  */
-#undef IRIS
-
-/* Define if this is a Linux system with SuperVGA library.  */
-#undef LINUXVGA
-
-/* Define if you want to use the MGR Window system.  */
-#undef MGR
-
-/* Define if this is an MSDOS system with djgpp.  */
-#undef MSDOS
-
-/* Define if you do not want to read .gnuplot in the current directory.  */
-#undef NOCWDRC
-
-/* Define to the name of the distribution.  */
-#undef PACKAGE
-
-/* Define if you do have the popen and pclose functions.  */
-#undef PIPES
-
-/* Define if you have the function prototypes.  */
-#undef PROTOTYPES
-
-/* Define if you want to use the included readline function.  */
-#undef READLINE
-
-/* Define if you want to use the Redwood Graphics Interface Protocol.  */
-#undef RGIP
-
-/* Define if you want to use the sunview terminal (sun).  */
-#undef SUN
-
-/* Define if you want to use the unixpc terminal (ATT 3b1 or ATT 7300.  */
-#undef UNIXPC
-
-/* Define if you want to use the standard Unix plot library.  */
-#undef UNIXPLOT
-
-/* Define if you want to use the system time routines.  */
-#undef USE_SYSTEM_TIME
-
-/* Define to the version of the distribution.  */
-#undef VERSION
-
-/* Define if you are using the X11 window system.  */
-#undef X11
-
 /* Define to `long' if <sys/types.h> doesn't define.  */
 #undef time_t
 
diff -urN gnuplot-3.7/aclocal.m4 gnuplot-3.7.1/aclocal.m4
--- gnuplot-3.7/aclocal.m4	Thu Jan 14 19:43:21 1999
+++ gnuplot-3.7.1/aclocal.m4	Sun Nov  7 15:57:20 1999
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3d
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -21,6 +21,8 @@
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -41,6 +43,23 @@
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+dnl Set install_sh for make dist
+install_sh="$missing_dir/install-sh"
+test -f "$install_sh" || install_sh="$missing_dir/install.sh"
+AC_SUBST(install_sh)
+dnl We check for tar when the user configures the end package.
+dnl This is sad, since we only need this for "dist".  However,
+dnl there's no other good way to do it.  We prefer GNU tar if
+dnl we can find it.  If we can't find a tar, it doesn't really matter.
+AC_CHECK_PROGS(AMTAR, gnutar gtar tar)
+AMTARFLAGS=
+if test -n "$AMTAR"; then
+  if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then
+    dnl We have GNU tar.
+    AMTARFLAGS=o
+  fi
+fi
+AC_SUBST(AMTARFLAGS)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
 #
@@ -160,9 +179,10 @@
 # breaks some systems' header files.
 # AIX			-qlanglvl=ansi
 # Ultrix and OSF/1	-std1
-# HP-UX			-Aa -D_HPUX_SOURCE
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
 # SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   AC_TRY_COMPILE(
@@ -215,31 +235,38 @@
 
 # serial 1
 
-AC_DEFUN(gp_MSDOS,
+AC_DEFUN(GP_MSDOS,
 [AC_MSG_CHECKING(for MS-DOS/djgpp/libGRX)
 AC_EGREP_CPP(yes,
 [#if __DJGPP__ && __DJGPP__ == 2
   yes
 #endif
-], AC_MSG_RESULT(yes)
-   LIBS="-lpc $LIBS"
-   AC_DEFINE(MSDOS)
-   AC_DEFINE(DOS32)
-   with_linux_vga=no
-   AC_CHECK_LIB(grx20,GrLine,dnl
-      LIBS="-lgrx20 $LIBS"
-      CFLAGS="$CFLAGS -fno-inline-functions"
-      AC_DEFINE(DJSVGA)
-      AC_CHECK_LIB(grx20,GrCustomLine,AC_DEFINE(GRX21))),dnl
-   AC_MSG_RESULT(no)
-   )dnl 
+],AC_MSG_RESULT(yes)
+  LIBS="-lpc $LIBS"
+  AC_DEFINE(MSDOS, 1,
+            [ Define if this is an MSDOS system. ])
+  AC_DEFINE(DOS32, 1,
+            [ Define if this system uses a 32-bit DOS extender (djgpp/emx). ])
+  with_linux_vga=no
+  AC_CHECK_LIB(grx20,GrLine,dnl
+    LIBS="-lgrx20 $LIBS"
+    CFLAGS="$CFLAGS -fno-inline-functions"
+    AC_DEFINE(DJSVGA, 1,
+              [ Define if you want to use libgrx20 with MSDOS/djgpp. ])
+    AC_CHECK_LIB(grx20,GrCustomLine,dnl
+      AC_DEFINE(GRX21, 1,
+                [ Define if you want to use a newer version of libgrx under MSDOS/djgpp. ])dnl
+    )dnl
+  ),dnl
+  AC_MSG_RESULT(no)
+  )dnl 
 ])
 
 
 
 # serial 1
 
-AC_DEFUN(gp_NEXT,
+AC_DEFUN(GP_NEXT,
 [AC_MSG_CHECKING(for NeXT)
 AC_EGREP_CPP(yes,
 [#if __NeXT__
@@ -247,20 +274,106 @@
 #endif
 ], AC_MSG_RESULT(yes)
    LIBS="$LIBS -lsys_s -lNeXT_s"
-   NEXTOBJS=epsviewe.o
    CFLAGS="$CFLAGS -ObjC",dnl
-   NEXTOBJS=
    AC_MSG_RESULT(no))
 ])
 
 
+dnl testing new version of FUNC_SELECT
+
+AC_DEFUN(AC_FUNC_SELECT,
+[AC_CHECK_FUNCS(select)
+if test "$ac_cv_func_select" = yes; then
+  AC_CHECK_HEADERS(unistd.h sys/types.h sys/time.h sys/select.h sys/socket.h)
+  AC_MSG_CHECKING([argument types of select()])
+  AC_CACHE_VAL(ac_cv_type_fd_set_size_t,dnl
+    [AC_CACHE_VAL(ac_cv_type_fd_set,dnl
+      [for ac_cv_type_fd_set in 'fd_set' 'int' 'void'; do
+        for ac_cv_type_fd_set_size_t in 'int' 'size_t' 'unsigned long' 'unsigned'; do
+	  for ac_type_timeval in 'struct timeval' 'const struct timeval'; do
+            AC_TRY_COMPILE(dnl
+[#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif],
+[#ifdef __STDC__
+extern int select ($ac_cv_type_fd_set_size_t, 
+ $ac_cv_type_fd_set *,	$ac_cv_type_fd_set *, $ac_cv_type_fd_set *,
+ $ac_type_timeval *);
+#else
+extern int select ();
+  $ac_cv_type_fd_set_size_t s;
+  $ac_cv_type_fd_set *p;
+  $ac_type_timeval *t;
+#endif],
+[ac_found=yes ; break 3],ac_found=no)
+          done
+        done
+      done
+    ])dnl AC_CACHE_VAL
+  ])dnl AC_CACHE_VAL
+  if test "$ac_found" = no; then
+    AC_MSG_ERROR([can't determine argument types])
+  fi
+
+  AC_MSG_RESULT([select($ac_cv_type_fd_set_size_t,$ac_cv_type_fd_set *,...)])
+  AC_DEFINE_UNQUOTED(fd_set_size_t, $ac_cv_type_fd_set_size_t,
+                     [ First arg for select(). ])
+  ac_cast=
+  if test "$ac_cv_type_fd_set" != fd_set; then
+    # Arguments 2-4 are not fd_set.  Some weirdo systems use fd_set type for
+    # FD_SET macros, but insist that you cast the argument to select.  I don't
+    # understand why that might be, but it means we cannot define fd_set.
+    AC_EGREP_CPP(dnl
+changequote(<<,>>)dnl
+<<(^|[^a-zA-Z_0-9])fd_set[^a-zA-Z_0-9]>>dnl
+changequote([,]),dnl
+[#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif],dnl
+    # We found fd_set type in a header, need special cast
+    ac_cast="($ac_cv_type_fd_set *)",dnl
+    # No fd_set type; it is safe to define it
+    AC_DEFINE_UNQUOTED(fd_set,$ac_cv_type_fd_set,
+                       [ Define if the type in arguments 2-4 to select() is fd_set. ]))
+  fi
+  AC_DEFINE_UNQUOTED(SELECT_FD_SET_CAST,$ac_cast,
+                     [ Define if the type in arguments 2-4 to select() is fd_set. ])
+fi
+])
 
-# serial 1
 
-AC_DEFUN(gp_CHECK_LIB_QUIET,
+
+# serial 2
+
+dnl AC_CHECK_LIB(LIBRARY, FUNCTION [, OTHER-LIBRARIES])
+AC_DEFUN(GP_CHECK_LIB_QUIET,
 [ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
 ac_save_LIBS="$LIBS"
-LIBS="$TERMLIBS $TERMXLIBS -l$1 $5 $LIBS"
+LIBS="$TERMLIBS $TERMXLIBS -l$1 $3 $LIBS"
 AC_TRY_LINK(dnl
 ifelse([$2], [main], , dnl Avoid conflicting decl of main.
 [/* Override any gcc2 internal prototype to avoid an error.  */
@@ -277,47 +390,47 @@
             eval "ac_cv_lib_$ac_lib_var=no")
 LIBS="$ac_save_LIBS"
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  ifelse([$3], ,
-[changequote(, )dnl
+changequote(, )dnl
   ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
 changequote([, ])dnl
-  LIBS="$LIBS -l$1"
-], [$3])
-else
-  ifelse([$4], , , [$4
-])dnl
+dnl  LIBS="$LIBS -l$1"
 fi
 ])
 
 
-# serial 1
+# serial 2
 
-dnl gp_SEARCH_LIBDIRS(LIBRARY, FUNCTION [, OTHER-LIBRARIES])
-AC_DEFUN(gp_SEARCH_LIBDIRS,
-[AC_MSG_CHECKING([for $2 in -l$1])
-gp_save_TERMLIBS="$TERMLIBS"
+dnl GP_PATH_LIB(LIBRARY, FUNCTION, SEARCH-DIRS [, OTHER-LIBRARIES])
+AC_DEFUN(GP_PATH_LIB,
+[ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
 changequote(, )dnl
   gp_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
 changequote([, ])dnl
-dnl The "no" case is just a safety net
-case "$with_$1" in
-  yes|no)
-    gp_lib_list="";;
-  *)
-    gp_lib_path=`echo $with_$1 | sed -e 's%/lib$1\.a$%%'`
-    gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'`
-    gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path"
-esac
-for ac_dir in '' /usr/local/lib $gp_lib_list ; do
-  TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS"
-  gp_CHECK_LIB_QUIET($1,$2,dnl
-    TERMLIBS="$TERMLIBS -l$1"; break, dnl ACTION-IF-FOUND
-    TERMLIBS="$gp_save_TERMLIBS",     dnl ACTION-IF-NOT-FOUND
-    $3)                               dnl OTHER-LIBRARIES
+AC_MSG_CHECKING([for $2 in -l$1])
+AC_CACHE_VAL(ac_cv_lib_$ac_lib_var,
+[gp_save_TERMLIBS="$TERMLIBS"
+if test "$3" != yes && test "$3" != no; then
+  gp_l_path=`echo "$3" | sed -e 's%/lib$1\.a$%%'`
+  gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path"
+fi
+for ac_dir in $gp_l_list '' /usr/local/lib ; do
+  test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS"
+  GP_CHECK_LIB_QUIET($1,$2,$4)
+  TERMLIBS="$gp_save_TERMLIBS"
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    eval "ac_cv_lib_$ac_lib_var=${ac_dir}"
+    break
+  fi
 done
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+])
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then
+    eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\""
+  fi
+  TERMLIBS="$TERMLIBS -l$1"
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
@@ -326,30 +439,44 @@
 
 
 
-# serial 1
+# serial 2
 
-dnl gp_SEARCH_HEADERDIRS(HEADER-FILE [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
-AC_DEFUN(gp_SEARCH_HEADERDIRS,
-[AC_REQUIRE([gp_SEARCH_LIBDIRS])
+dnl GP_PATH_HEADER(HEADER-FILE, SEARCH-DIRS [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
+AC_DEFUN(GP_PATH_HEADER,
+[ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
+changequote(, )dnl
+  ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+changequote([, ])dnl
 AC_MSG_CHECKING([for $1])
-ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
-gp_save_CPPFLAGS="$CPPFLAGS"
-for ac_dir in '' /usr/local/include $gp_lib_prefix $gp_lib_prefix/include ; do
-  CPPFLAGS="$gp_save_CPPFLAGS `test x${ac_dir} != x && echo -I${ac_dir}`"
-  AC_TRY_CPP([#include <$1>], eval "ac_cv_header_$ac_safe=yes",
+AC_CACHE_VAL(ac_cv_header_$ac_safe,
+[gp_save_CPPFLAGS="$CPPFLAGS"
+if test "$2" != yes && test "$2" != no; then
+  gp_h_path=`echo "$2" | sed -e 's%/lib$1\.a$%%'`
+  gp_h_prfx=`echo "$gp_h_path" | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_h_list="$gp_h_prfx $gp_h_prfx/include $gp_h_path"
+else
+  gp_h_list=''
+fi
+for ac_dir in $gp_h_list '' /usr/local/include ; do
+  test x${ac_dir} != x && CPPFLAGS="$gp_save_CPPFLAGS -I${ac_dir}"
+  AC_TRY_CPP([#include <$1>], eval "ac_cv_header_$ac_safe=${ac_dir}",
     eval "ac_cv_header_$ac_safe=no")
-  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  CPPFLAGS="$gp_save_CPPFLAGS"
+  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
     break
-  else
-    CPPFLAGS="${ac_save_CPPFLAGS}"
   fi
 done
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+])
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != x" && eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != xyes"; then
+    eval "CPPFLAGS=\"$gp_save_CPPFLAGS -I`echo '$ac_cv_header_'$ac_safe`\""
+  fi
+  AC_DEFINE_UNQUOTED($ac_tr_hdr)
   AC_MSG_RESULT(yes)
-  ifelse([$2], , :, [$2])
+  ifelse([$3], , :, [$3])
 else
   AC_MSG_RESULT(no)
-ifelse([$3], , , [$3
+ifelse([$4], , , [$4
 ])dnl
 fi
 ])
diff -urN gnuplot-3.7/alloc.c gnuplot-3.7.1/alloc.c
--- gnuplot-3.7/alloc.c	Wed Apr 15 20:21:56 1998
+++ gnuplot-3.7.1/alloc.c	Wed Apr 15 20:21:56 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: alloc.c,v 1.12 1998/03/22 22:31:16 drd Exp $";
+static char *RCSid = "$Id: alloc.c,v 1.1.1.2 1998/04/15 19:21:56 lhecking Exp $";
 #endif
 
 /* GNUPLOT - alloc.c */
diff -urN gnuplot-3.7/alloc.h gnuplot-3.7.1/alloc.h
--- gnuplot-3.7/alloc.h	Wed Apr 15 20:21:58 1998
+++ gnuplot-3.7.1/alloc.h	Wed Apr 15 20:21:58 1998
@@ -1,4 +1,4 @@
-/* $Id: alloc.h,v 1.6 1998/03/22 22:31:17 drd Exp $ */
+/* $Id: alloc.h,v 1.1.1.2 1998/04/15 19:21:58 lhecking Exp $ */
 
 /* GNUPLOT - alloc.h */
 
diff -urN gnuplot-3.7/amiga.c gnuplot-3.7.1/amiga.c
--- gnuplot-3.7/amiga.c	Wed Apr 15 20:21:59 1998
+++ gnuplot-3.7.1/amiga.c	Wed Apr 15 20:21:59 1998
@@ -1,4 +1,4 @@
-/* $Id: amiga.c,v 1.3 1998/03/22 22:31:17 drd Exp $ */
+/* $Id: amiga.c,v 1.1.1.2 1998/04/15 19:21:59 lhecking Exp $ */
 
 /* GNUPLOT - amiga.c */
 
diff -urN gnuplot-3.7/ansichek.h gnuplot-3.7.1/ansichek.h
--- gnuplot-3.7/ansichek.h	Fri Nov 20 12:13:23 1998
+++ gnuplot-3.7.1/ansichek.h	Thu Aug 19 15:42:08 1999
@@ -1,4 +1,4 @@
-/* $Id: ansichek.h,v 1.14 1998/06/18 14:55:01 ddenholm Exp $ */
+/* $Id: ansichek.h,v 1.8.2.1 1999/08/19 14:42:08 lhecking Exp $ */
 
 /* GNUPLOT - ansichek.h */
 
@@ -44,14 +44,14 @@
 #ifndef ANSI_CHECK_H
 # define ANSI_CHECK_H
 
+# if defined(__STDC__) && __STDC__
+#  ifndef ANSI_C
+#   define ANSI_C
+#  endif
+# endif /* __STDC__ */
+
 # ifndef HAVE_CONFIG_H
 /* Only relevant for systems which don't run configure */
-
-#  if defined(__STDC__) && __STDC__
-#   ifndef ANSI_C
-#    define ANSI_C
-#   endif
-#  endif /* __STDC__ */
 
 /* are all these compiler tests necessary ? - can the makefiles not
  * just set ANSI_C ?
diff -urN gnuplot-3.7/bf_test.c gnuplot-3.7.1/bf_test.c
--- gnuplot-3.7/bf_test.c	Wed Dec  2 18:38:13 1998
+++ gnuplot-3.7.1/bf_test.c	Wed Dec  2 18:38:13 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: bf_test.c,v 1.11 1998/04/14 00:14:48 drd Exp $";
+static char *RCSid = "$Id: bf_test.c,v 1.9 1998/12/02 18:38:13 lhecking Exp $";
 #endif
 
 
diff -urN gnuplot-3.7/binary.c gnuplot-3.7.1/binary.c
--- gnuplot-3.7/binary.c	Wed Nov  4 14:52:39 1998
+++ gnuplot-3.7.1/binary.c	Wed Nov  4 14:52:39 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: binary.c,v 1.10 1998/04/14 00:14:49 drd Exp $";
+static char *RCSid = "$Id: binary.c,v 1.4 1998/11/04 14:52:39 lhecking Exp $";
 #endif
 
 /*
diff -urN gnuplot-3.7/binary.h gnuplot-3.7.1/binary.h
--- gnuplot-3.7/binary.h	Mon Sep 21 22:07:00 1998
+++ gnuplot-3.7.1/binary.h	Mon Sep 21 22:07:00 1998
@@ -1,4 +1,4 @@
-/* $Id: binary.h,v 1.4 1998/03/22 22:31:18 drd Exp $ */
+/* $Id: binary.h,v 1.2 1998/09/21 21:07:00 lhecking Exp $ */
 
 /* GNUPLOT - binary.h */
 
diff -urN gnuplot-3.7/bitmap.c gnuplot-3.7.1/bitmap.c
--- gnuplot-3.7/bitmap.c	Wed Nov  4 14:52:55 1998
+++ gnuplot-3.7.1/bitmap.c	Mon Oct 11 18:10:54 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: bitmap.c,v 1.16 1998/03/22 22:31:19 drd Exp $";
+static char *RCSid = "$Id: bitmap.c,v 1.2.2.2 1999/10/11 17:10:54 lhecking Exp $";
 #endif
 
 /* GNUPLOT - bitmap.c */
@@ -678,6 +678,110 @@
           0x1249,000000,000000,0x1249,000000,000000,0x1249},
 };
 
+/* Moved here from gif.trm */
+struct rgb web_color_rgbs[] =
+{
+    { 0xff, 0xff, 0xff },		/* background: white         */
+    { 0x00, 0x00, 0x00 },		/*    borders: black         */
+    { 0xa0, 0xa0, 0xa0 },		/* x & y axes: grey          */
+    { 0xff, 0x00, 0x00 },		/*   color 01: red           */
+    { 0x00, 0xc0, 0x00 },		/*   color 02: dark green    */
+    { 0x00, 0x80, 0xff },		/*   color 03: dark blue     */
+    { 0xc0, 0x00, 0xff },		/*   color 04: dark magenta  */
+    { 0xc0, 0xff, 0x40 },		/*   color 05: yellow        */
+    { 0xc0, 0x40, 0x00 },		/*   color 06: orange        */
+    { 0x40, 0xff, 0x80 },		/*   color 07: sea green     */
+    { 0x20, 0x20, 0xc0 },		/*   color 08: royal blue    */
+    { 0x80, 0x00, 0xc0 },		/*   color 09: dark violet   */
+    /* please note: these colors are optimized for web216 compatibility */
+    { 0x00, 0x60, 0x80 },		/* DeepSkyBlue4 */
+    { 0x00, 0x80, 0x00 },		/* green4 */
+    { 0x00, 0x80, 0x40 },		/* SpringGreen4 */
+    { 0x00, 0x80, 0x80 },		/* dark cyan, turquoise4 */
+    { 0x00, 0xc0, 0x60 },		/* SpringGreen3 */
+    { 0x00, 0xc0, 0xc0 },		/* cyan3, turquoise3 */
+    { 0x00, 0xff, 0x00 },		/* green */
+    { 0x20, 0x80, 0x20 },		/* forest green */
+    { 0x30, 0x60, 0x80 },		/* SteelBlue4 */
+    { 0x40, 0x40, 0x40 },		/* grey25-31 */
+    { 0x40, 0x80, 0x00 },		/* chartreuse4 */
+    { 0x00, 0x00, 0x80 },		/* dark blue, navy blue */
+    { 0x80, 0x60, 0x00 },		/* DarkGoldenrod4 */
+    { 0x80, 0x60, 0x10 },		/* goldenrod4 */
+    { 0x80, 0x60, 0x60 },		/* pink4 */
+    { 0x80, 0x60, 0x80 },		/* plum4 */
+    { 0x00, 0x00, 0xc0 },		/* medium blue */
+    { 0x00, 0x00, 0xff },		/* blue */
+    { 0x00, 0x60, 0x00 },		/* dark green */
+    { 0x40, 0xc0, 0x80 },		/* SeaGreen3 */
+    { 0x60, 0xa0, 0xc0 },		/* SkyBlue3 */
+    { 0x60, 0xc0, 0x00 },		/* chartreuse3 */
+    { 0x60, 0xc0, 0xa0 },		/* medium aquamarine */
+    { 0x80, 0x00, 0x00 },		/* dark red */
+    { 0x80, 0x00, 0x80 },		/* dark magenta */
+    { 0x60, 0x20, 0x80 },		/* DarkOrchid4 */
+    { 0x60, 0x60, 0x60 },		/* dim grey */
+    { 0x00, 0xff, 0xff },		/* cyan1, turquoise1 */
+    { 0x20, 0x20, 0x20 },		/* grey13-18 */
+    { 0x20, 0x40, 0x40 },		/* dark slate grey */
+    { 0x20, 0x40, 0x80 },		/* RoyalBlue4 */
+    { 0x60, 0x80, 0x20 },		/* olive drab */
+    { 0x60, 0x80, 0x60 },		/* DarkSeaGreen4 */
+    { 0x60, 0x80, 0x80 },		/* LightBlue4, PaleTurquoise4 */
+    { 0x80, 0x80, 0x40 },		/* LightGoldenrod4, khaki4 */
+    { 0x80, 0x80, 0x80 },		/* grey51-56 */
+    { 0xa0, 0xa0, 0xa0 },		/* dark grey, grey63-68 */
+    { 0xa0, 0xd0, 0xe0 },		/* light blue */
+    { 0xc0, 0x20, 0x20 },		/* firebrick3 */
+    { 0xc0, 0x60, 0x00 },		/* DarkOrange3 */
+    { 0x80, 0xc0, 0xe0 },		/* sky blue */
+    { 0xc0, 0x60, 0xc0 },		/* orchid3 */
+    { 0xc0, 0x80, 0x00 },		/* orange3 */
+    { 0xc0, 0x80, 0x60 },		/* LightSalmon3 */
+    { 0xff, 0x40, 0x00 },		/* orange red */
+    { 0xff, 0x40, 0x40 },		/* brown1, tomato */
+    { 0x80, 0xc0, 0xff },		/* light sky blue */
+    { 0xff, 0x80, 0x60 },		/* salmon */
+    { 0xff, 0x80, 0x80 },		/* light coral */
+    { 0xc0, 0xa0, 0x00 },		/* gold3 */
+    { 0xc0, 0xc0, 0xc0 },		/* grey76-81, honeydew3, ivory3, snow3 */
+    { 0xc0, 0xff, 0xc0 },		/* DarkSeaGreen1 */
+    { 0xff, 0x00, 0x00 },		/* red */
+    { 0xff, 0x00, 0xff },		/* magenta */
+    { 0xff, 0x80, 0xa0 },		/* PaleVioletRed1 */
+    { 0xff, 0x80, 0xff },		/* orchid1 */
+    { 0xc0, 0xc0, 0xa0 },		/* LemonChiffon3 */
+    { 0xff, 0x60, 0x60 },		/* IndianRed1 */
+    { 0xff, 0x80, 0x00 },		/* dark orange */
+    { 0xff, 0xa0, 0x00 },		/* orange */
+    { 0x80, 0xe0, 0xe0 },		/* CadetBlue2, DarkSlateGray2 */
+    { 0xa0, 0xe0, 0xe0 },		/* pale turquoise */
+    { 0xa0, 0xff, 0x20 },		/* green yellow */
+    { 0xc0, 0x00, 0x00 },		/* red3 */
+    { 0xc0, 0x00, 0xc0 },		/* magenta3 */
+    { 0xa0, 0x20, 0x20 },		/* brown */
+    { 0xa0, 0x20, 0xff },		/* purple */
+    { 0x80, 0x20, 0x00 },		/* OrangeRed4 */
+    { 0x80, 0x20, 0x20 },		/* brown4 */
+    { 0x80, 0x40, 0x00 },		/* DarkOrange4 */
+    { 0x80, 0x40, 0x20 },		/* sienna4 */
+    { 0x80, 0x40, 0x80 },		/* orchid4 */
+    { 0x80, 0x60, 0xc0 },		/* MediumPurple3 */
+    { 0x80, 0x60, 0xff },		/* SlateBlue1 */
+    { 0x80, 0x80, 0x00 },		/* yellow4 */
+    { 0xa0, 0x80, 0xff },		/* MediumPurple1 */
+    { 0xc0, 0x60, 0x80 },		/* PaleVioletRed3 */
+    { 0xc0, 0xc0, 0x00 },		/* yellow3 */
+    { 0xff, 0x80, 0x40 },		/* sienna1 */
+    { 0xff, 0xa0, 0x40 },		/* tan1 */
+    { 0xff, 0xa0, 0x60 },		/* sandy brown */
+    { 0xff, 0xa0, 0x70 },		/* light salmon */
+    { 0xff, 0xc0, 0x20 },		/* goldenrod1 */
+    { 0xff, 0xc0, 0xc0 },		/* RosyBrown1, pink */
+    { 0xff, 0xff, 0x00 },		/* yellow */
+    { 0xff, 0xff, 0x80 },		/* khaki1 */
+    { 0xff, 0xff, 0xc0 }		/* lemon chiffon */
+};
 
 /*
    ** The plotting area is defined as a huge bitmap.
@@ -743,7 +847,7 @@
 
 
 /* Currently unused */
-#if 0
+#if 1 /* HBB 991008: used by PNG, now */
 /*
  * get pixel (x,y) value
  */
diff -urN gnuplot-3.7/bitmap.h gnuplot-3.7.1/bitmap.h
--- gnuplot-3.7/bitmap.h	Wed Apr 15 20:22:07 1998
+++ gnuplot-3.7.1/bitmap.h	Wed Sep 29 14:48:16 1999
@@ -1,4 +1,4 @@
-/* $Id: bitmap.h,v 1.11 1998/03/22 22:31:19 drd Exp $ */
+/* $Id: bitmap.h,v 1.1.1.2.2.1 1999/09/29 13:48:16 lhecking Exp $ */
 
 /* GNUPLOT - bitmap.h */
 
@@ -81,6 +81,19 @@
 extern unsigned int b_pattern[];
 extern int b_maskcount;
 extern unsigned int b_lastx, b_lasty;	/* last pixel set - used by b_line */
+
+/* RGB colour table moved out of gif.trm */
+/*
+ * Common RGB color table for use by all devices.
+ * It's a subset of the 216-color Web palette.
+ */
+#define WEB_N_COLORS 99
+struct rgb
+{
+    unsigned char r, g, b;
+};
+
+extern struct rgb web_color_rgbs[];
 
 
 /* Prototypes from file "bitmap.c" */
diff -urN gnuplot-3.7/buildvms.com gnuplot-3.7.1/buildvms.com
--- gnuplot-3.7/buildvms.com	Wed Oct 28 21:05:30 1998
+++ gnuplot-3.7.1/buildvms.com	Wed Oct 20 15:04:13 1999
@@ -31,9 +31,16 @@
 $!-----------------------------------------------------------------
 $! customize CFLAGS for version of VMS, CRTL, and C compiler.
 $!-----------------------------------------------------------------
+$ IF F$GETSYI("ARCH_TYPE") .EQ. 1
+$ THEN
+$!  these defines work for OpenVMS VAX v6.2 and DEC C v5.7
+$ CFLAGS = "/define=(ANSI_C,HAVE_UNISTD_H,HAVE_GETCWD,"-
+ +"HAVE_SLEEP,''x11'NO_GIH,PIPES,DECCRTL)''pfix'"
+$ ELSE
 $!  these defines work for OpenVMS Alpha v6.2 and DEC C v5.3
-$ CFLAGS = "/define=(ANSI_C,HAVE_LGAMMA,HAVE_ERF,HAVE_UNISTD_H,HAVE_GETCWD,HAVE_SLEEP,"-
-  +"''x11'NO_GIH,PIPES,DECCRTL)''pfix'/warnings=disable=ADDRCONSTEXT"
+$ CFLAGS = "/define=(ANSI_C,HAVE_LGAMMA,HAVE_ERF,HAVE_UNISTD_H,HAVE_GETCWD,"-
+ +"HAVE_SLEEP,''x11'NO_GIH,PIPES,DECCRTL)''pfix'"
+$ ENDIF
 $!
 $!-----------------------------------------------------------------
 $!
@@ -109,6 +116,7 @@
 $ cc 'CFLAGS' fit.c
 $ cc 'CFLAGS' graphics.c
 $ cc 'CFLAGS' graph3d.c
+$ cc 'CFLAGS' help.c
 $ cc 'CFLAGS' hidden3d.c
 $ cc 'CFLAGS' internal.c
 $ cc 'CFLAGS' interpol.c
@@ -132,18 +140,19 @@
 $ cc 'CFLAGS' vms.c
 $ if its_gnuc then cc 'CFLAGS' GNU_CC_INCLUDE:[000000]_assert.c
 $!
-$ link/exe=gnuplot -
-bitmap,command,contour,eval,graphics,graph3d,vms,-
-binary,specfun,interpol,fit,matrix,internal,misc,parse,-
-plot,plot2d,plot3d,scanner,set,show,datafile,alloc,-
-standard,stdfn,term,util,version,util3d,hidden3d,time'extralib''LINKOPT'
+$ link/exe=gnuplot.exe -
+bitmap.obj,command.obj,contour.obj,eval.obj,graphics.obj,graph3d.obj,help.obj,-
+vms.obj,binary.obj,specfun.obj,interpol.obj,fit.obj,matrix.obj,internal.obj,-
+misc.obj,parse.obj,plot.obj,plot2d.obj,plot3d.obj,scanner.obj,set.obj,-
+show.obj,datafile.obj,alloc.obj,standard.obj,stdfn.obj,term.obj,util.obj,-
+version.obj,util3d.obj,hidden3d.obj,time.obj'extralib''LINKOPT'
 $!
 $ cc 'CFLAGS' bf_test.c
 $ link /exe=bf_test bf_test,binary,alloc 'extralib''LINKOPT'
-$ ren bf_test.exe [.demo]
 $ if .NOT. its_decw  then goto do_docs 
 $!
-$ CC 'CFLAGS' GPLT_X11 stdfn.c
+$ CC 'CFLAGS' GPLT_X11
+$ CC 'CFLAGS' stdfn.c
 $ LINK /exe=GNUPLOT_X11 gplt_x11,stdfn 'extralib''LINKOPT',SYS$INPUT:/OPT
 SYS$SHARE:DECW$XLIBSHR/SHARE
 $!
@@ -152,14 +161,17 @@
 $ if f$locate("ALL_TERM_DOC",CFLAGS).ne.f$length(CFLAGS) then -
 	copy /concatenate [-.term]*.trm []allterm.h
 $ cc 'CFLAGS' /OBJ=doc2rnh.obj/include=([],[-],[-.term]) doc2rnh.c 
+$ cc 'CFLAGS' /OBJ=termdoc.obj/include=([],[-],[-.term]) termdoc.c 
 $ SET DEF [-]		! LINKOPT is defined as being in []
-$ link [.docs]doc2rnh /exe=[.docs]doc2rnh 'extralib''LINKOPT'
+$ link [.docs]doc2rnh.obj,termdoc.obj /exe=[.docs]doc2rnh 'extralib''LINKOPT'
 $ doc2rnh := $sys$disk:[.docs]doc2rnh
 $ doc2rnh [.docs]gnuplot.doc [.docs]gnuplot.rnh
 $ RUNOFF [.docs]gnuplot.rnh
 $ library/create/help sys$disk:[]gnuplot.hlb gnuplot.hlp
 $!
-$ run [.demo]bf_test
+$ set default [.demo]
+$ run [-]bf_test
+$ set default [-]
 $ if its_decw then -
   write sys$output "%define GNUPLOT_X11 :== $Disk:[directory]GNUPLOT_X11"
 $!
diff -urN gnuplot-3.7/command.c gnuplot-3.7.1/command.c
--- gnuplot-3.7/command.c	Wed Dec  9 15:22:38 1998
+++ gnuplot-3.7.1/command.c	Thu Aug 19 15:42:21 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: command.c,v 1.126 1998/06/22 12:24:48 ddenholm Exp $";
+static char *RCSid = "$Id: command.c,v 1.20.2.1 1999/08/19 14:42:21 lhecking Exp $";
 #endif
 
 /* GNUPLOT - command.c */
@@ -334,12 +334,12 @@
 		gstrptime(string, format, &tm);
 		secs = gtimegm(&tm);
 		fprintf(stderr, "internal = %f - %d/%d/%d::%d:%d:%d , wday=%d, yday=%d\n",
-			secs, tm.tm_mday, tm.tm_mon + 1, tm.tm_year, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_wday, tm.tm_yday);
+			secs, tm.tm_mday, tm.tm_mon + 1, tm.tm_year % 100, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_wday, tm.tm_yday);
 		memset(&tm, 0, sizeof(tm));
 		ggmtime(&tm, secs);
 		gstrftime(string, 159, format, secs);
 		fprintf(stderr, "convert back \"%s\" - %d/%d/%d::%d:%d:%d , wday=%d, yday=%d\n",
-			string, tm.tm_mday, tm.tm_mon + 1, tm.tm_year, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_wday, tm.tm_yday);
+			string, tm.tm_mday, tm.tm_mon + 1, tm.tm_year % 100, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_wday, tm.tm_yday);
 	    }
 	}
     } else if (almost_equals(c_token, "test")) {
@@ -1114,7 +1114,7 @@
 # endif /* AMIGA_AC_5 */
 
 
-# if defined(READLINE) || defined(GNU_READLINE)
+# if defined(READLINE) || defined(HAVE_LIBREADLINE)
 /* keep some compilers happy */
 static char *rlgets __PROTO((char *s, int n, char *prompt));
 
@@ -1149,7 +1149,7 @@
     }
     return NULL;
 }
-# endif /* READLINE || GNU_READLINE */
+# endif /* READLINE || HAVE_LIBREADLINE */
 
 
 # if defined(MSDOS) || defined(_Windows) || defined(DOS386)
@@ -1224,7 +1224,7 @@
 
 /* read from stdin, everything except VMS */
 
-# if !defined(READLINE) && !defined(GNU_READLINE)
+# if !defined(READLINE) && !defined(HAVE_LIBREADLINE)
 #  if (defined(MSDOS) || defined(DOS386)) && !defined(_Windows) && !defined(__EMX__) && !defined(DJGPP)
 
 /* if interactive use console IO so CED will work */
@@ -1310,7 +1310,7 @@
 #   define GET_STRING(s,l) fgets(s, l, stdin)
 
 #  endif /* !plain DOS */
-# endif /* !READLINE && !GNU_READLINE) */
+# endif /* !READLINE && !HAVE_LIBREADLINE) */
 
 /* Non-VMS version */
 static int read_line(prompt)
@@ -1320,22 +1320,22 @@
     TBOOLEAN more = FALSE;
     int last = 0;
 
-# if !defined(READLINE) && !defined(GNU_READLINE)
+# if !defined(READLINE) && !defined(HAVE_LIBREADLINE)
     if (interactive)
 	PUT_STRING(prompt);
 # endif /* READLINE */
     do {
 	/* grab some input */
-# if defined(READLINE) || defined(GNU_READLINE)
+# if defined(READLINE) || defined(HAVE_LIBREADLINE)
 	if (((interactive)
 	     ? rlgets(&(input_line[start]), input_line_len - start,
 		      ((more) ? "> " : prompt))
 	     : fgets(&(input_line[start]), input_line_len - start, stdin))
 	    == (char *) NULL) {
-# else /* !(READLINE || GNU_READLINE) */
+# else /* !(READLINE || HAVE_LIBREADLINE) */
 	if (GET_STRING(&(input_line[start]), input_line_len - start)
 	    == (char *) NULL) {
-# endif /* !(READLINE || GNU_READLINE) */
+# endif /* !(READLINE || HAVE_LIBREADLINE) */
 	    /* end-of-file */
 	    if (interactive)
 		(void) putc('\n', stderr);
@@ -1368,7 +1368,7 @@
 	    } else
 		more = FALSE;
 	}
-# if !defined(READLINE) && !defined(GNU_READLINE)
+# if !defined(READLINE) && !defined(HAVE_LIBREADLINE)
 	if (more && interactive)
 	    PUT_STRING("> ");
 # endif
diff -urN gnuplot-3.7/commitvers gnuplot-3.7.1/commitvers
--- gnuplot-3.7/commitvers	Wed Apr 15 20:16:28 1998
+++ gnuplot-3.7.1/commitvers	Wed Apr 15 20:16:28 1998
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# $Id: commitvers,v 1.4 1996/02/26 22:21:49 drd Exp $
+# $Id: commitvers,v 1.1.1.1 1998/04/15 19:16:28 lhecking Exp $
 #
 # update version.c and commit gnuplot
 #
diff -urN gnuplot-3.7/config.hin gnuplot-3.7.1/config.hin
--- gnuplot-3.7/config.hin	Tue Jan 12 14:01:42 1999
+++ gnuplot-3.7.1/config.hin	Fri Oct 22 19:29:08 1999
@@ -15,15 +15,6 @@
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
 
-/* Define to the type of arg1 for select(). */
-#undef SELECT_TYPE_ARG1
-
-/* Define to the type of args 2, 3 and 4 for select(). */
-#undef SELECT_TYPE_ARG234
-
-/* Define to the type of arg5 for select(). */
-#undef SELECT_TYPE_ARG5
-
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t
 
@@ -36,81 +27,6 @@
 /* Define if the X Window System is missing or not being used.  */
 #undef X_DISPLAY_MISSING
 
-/* Define if you want to use the Apollo Graphics Primitive Resource.  */
-#undef APOLLO
-
-/* Define if you want to use the CGI terminal under SCO.  */
-#undef CGI
-
-/* Define if you want to use libgrx20 with MSDOS/djgpp.  */
-#undef DJSVGA
-
-/* Define if this system uses a 32-bit DOS extender (djgpp/emx).  */
-#undef DOS32
-
-/* Define if <errno.h> declares errno.  */
-#undef EXTERN_ERRNO
-
-/* Define if you are using the GNU readline library.  */
-#undef GNU_READLINE
-
-/* Define if your libplot.a is from GNU plotutils.  */
-#undef GNU_PLOTUTILS
-
-/* Define if you want to use the GNU version of the Unix plot library.  */
-#undef GNUGRAPH
-
-/* Define if you want to use the Apollo Graphics Primitive Resource (fixed-size window.  */
-#undef GPR
-
-/* Define if you want to use a newer version of libgrx under MSDOS/djgpp.  */
-#undef GRX21
-
-/* Define if you have Thomas Boutell's gd library.  */
-#undef HAVE_LIBGD
-
-/* Define if you have the png library.  */
-#undef HAVE_LIBPNG
-
-/* Define if you want to use the IRIS terminal on IRIS4D series computers.  */
-#undef IRIS
-
-/* Define if this is a Linux system with SuperVGA library.  */
-#undef LINUXVGA
-
-/* Define if you want to use the MGR Window system.  */
-#undef MGR
-
-/* Define if this is an MSDOS system with djgpp.  */
-#undef MSDOS
-
-/* Define if you do not want to read .gnuplot in the current directory.  */
-#undef NOCWDRC
-
-/* Define if you do have the popen and pclose functions.  */
-#undef PIPES
-
-/* Define if you want to use the included readline function.  */
-#undef READLINE
-
-/* Define if you want to use the Redwood Graphics Interface Protocol.  */
-#undef RGIP
-
-/* Define if you want to use the sunview terminal (sun).  */
-#undef SUN
-
-/* Define if you want to use the unixpc terminal (ATT 3b1 or ATT 7300.  */
-#undef UNIXPC
-
-/* Define if you want to use the standard Unix plot library.  */
-#undef UNIXPLOT
-
-/* Define if you want to use the system time routines.  */
-#undef USE_SYSTEM_TIME
-
-/* Define if you are using the X11 window system.  */
-#undef X11
-
 /* Define to `long' if <sys/types.h> doesn't define.  */
 #undef time_t
 
@@ -162,6 +78,9 @@
 /* Define if you have the rindex function.  */
 #undef HAVE_RINDEX
 
+/* Define if you have the select function.  */
+#undef HAVE_SELECT
+
 /* Define if you have the setvbuf function.  */
 #undef HAVE_SETVBUF
 
@@ -258,9 +177,15 @@
 /* Define if you have the <time.h> header file.  */
 #undef HAVE_TIME_H
 
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
 /* Define if you have the <values.h> header file.  */
 #undef HAVE_VALUES_H
 
+/* Define if you have the m library (-lm).  */
+#undef HAVE_LIBM
+
 /* Name of package */
 #undef PACKAGE
 
@@ -269,4 +194,79 @@
 
 /* Define if compiler has function prototypes */
 #undef PROTOTYPES
+
+/*  Define if you are using the X11 window system.  */
+#undef X11
+
+/*  Define if this is an MSDOS system.  */
+#undef MSDOS
+
+/*  Define if this system uses a 32-bit DOS extender (djgpp/emx).  */
+#undef DOS32
+
+/*  Define if you want to use libgrx20 with MSDOS/djgpp.  */
+#undef DJSVGA
+
+/*  Define if you want to use a newer version of libgrx under MSDOS/djgpp.  */
+#undef GRX21
+
+/*  Define if <errno.h> declares errno.  */
+#undef EXTERN_ERRNO
+
+/*  Define if you do have the popen and pclose functions.  */
+#undef PIPES
+
+/*  First arg for select().  */
+#undef fd_set_size_t
+
+/*  Define if the type in arguments 2-4 to select() is fd_set.  */
+#undef fd_set
+
+/*  Define if the type in arguments 2-4 to select() is fd_set.  */
+#undef SELECT_FD_SET_CAST
+
+/*  Define if this is a Linux system with SuperVGA library.  */
+#undef LINUXVGA
+
+/*  Define if you are using the GNU readline library.  */
+#undef HAVE_LIBREADLINE
+
+/*  Define if you want to use the included readline function.  */
+#undef READLINE
+
+/*  Define if you want to use the standard Unix plot library.  */
+#undef UNIXPLOT
+
+/*  Define if you have the <plotcompat.h> header file.  */
+#undef HAVE_PLOTCOMPAT_H
+
+/*  Define if you want to use the GNU version of the Unix plot library.  */
+#undef GNUGRAPH
+
+/*  Define if your libplot.a is from GNU plotutils.  */
+#undef GNU_PLOTUTILS
+
+/*  Define if you have Thomas Boutell's gd library.  */
+#undef HAVE_LIBGD
+
+/*  Define if you have the png library.  */
+#undef HAVE_LIBPNG
+
+/*  Define if you want to use the CGI terminal under SCO.  */
+#undef CGI
+
+/*  Define if you want to use the sunview terminal (sun).  */
+#undef SUN
+
+/*  Define if you do not want to read .gnuplot in the current directory.  */
+#undef NOCWDRC
+
+/*  Define if you want to use the IRIS terminal on IRIS4D series computers.  */
+#undef IRIS
+
+/*  Define if you want to use the MGR Window system.  */
+#undef MGR
+
+/*  Define if you want to use the Redwood Graphics Interface Protocol.  */
+#undef RGIP
 
diff -urN gnuplot-3.7/configure gnuplot-3.7.1/configure
--- gnuplot-3.7/configure	Thu Jan 14 19:43:23 1999
+++ gnuplot-3.7.1/configure	Sun Nov  7 15:57:22 1999
@@ -1,80 +1,5 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.90 
-
-
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-
-
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-
-
-
-
-
-# serial 1
-
-
-
-
-# serial 1
-
-# @defmac AC_PROG_CC_STDC
-# @maindex PROG_CC_STDC
-# @ovindex CC
-# If the C compiler in not in ANSI C mode by default, try to add an option
-# to output variable @code{CC} to make it so.  This macro tries various
-# options that select ANSI C on some system or another.  It considers the
-# compiler to be in ANSI C mode if it handles function prototypes correctly.
-#
-# If you use this macro, you should check after calling it whether the C
-# compiler has been set to accept ANSI C; if not, the shell variable
-# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
-# program @code{ansi2knr}, which comes with Ghostscript.
-# @end defmac
-
-
-
-
-# serial 1
-
-
-
-
-
-# serial 1
-
-
-
-
-
-# serial 1
-
-
-
-
-# serial 1
-
-
-
-
-
-# serial 1
-
-
-
-
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@@ -87,11 +12,10 @@
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --with-readline         use the included minimal readline function (default)
-  --without-readline      do not use the included readline function"
-ac_help="$ac_help
-  --with-gnu-readline     use the GNU readline library
-  --with-gnu-readline=PATH        Specify the location of GNU readline"
+  --with-readline         use the builtin minimal readline function (default)
+  --without-readline      do not use the builtin readline function
+  --with-readline=gnu     use the GNU readline library
+  --with-readline=PATH            Specify the location of GNU readline"
 ac_help="$ac_help
   --with-plot             use the Unix plot library
   --with-plot=PATH                Specify the location of GNU libplot"
@@ -109,14 +33,8 @@
 ac_help="$ac_help
   --with-lasergnu         install lasergnu printer script"
 ac_help="$ac_help
-  --without-linux-vga     do not use the Linux console driver
-                          (requires Linux SVGAlib /usr/lib/libvga)"
-ac_help="$ac_help
-  --enable-apollo         Apollo Graphics Primitive Resource"
-ac_help="$ac_help
-  --enable-gpr            Apollo Graphics Primitive Resource (fixed-size window)"
-ac_help="$ac_help
-  --enable-cgi            enable CGI terminal (SCO only)"
+  --with-linux-vga        use the Linux SVGA console driver
+                          (requires /usr/lib/libvga)"
 ac_help="$ac_help
   --enable-iris           enable IRIS terminal (IRIS4D only)"
 ac_help="$ac_help
@@ -124,12 +42,6 @@
 ac_help="$ac_help
   --enable-rgip           enable Redwood Graphics Interface Protocol"
 ac_help="$ac_help
-  --enable-sun            enable sunview terminal (Sun only)"
-ac_help="$ac_help
-  --enable-unixpc         enable unixpc terminal (ATT 3b1 or ATT 7300)"
-ac_help="$ac_help
-  --enable-system-time    use the system time routines in time.c"
-ac_help="$ac_help
   --with-x                use the X Window System"
 
 # Initialize some variables set by options.
@@ -641,7 +553,10 @@
 fi
 
 
+
+# From configure.in Revision: 1.41.2.7 
 VERSION=`sed -n 's/.*version.*"\(.*\)".*/\1/p' $srcdir/version.c|tr -d ' '`
+PL=`sed -n 's/.*patchlevel.*"\(.*\)".*/\1/p' $srcdir/version.c|tr -d ' '`
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -673,7 +588,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:677: checking for a BSD compatible install" >&5
+echo "configure:592: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -726,7 +641,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:730: checking whether build environment is sane" >&5
+echo "configure:645: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -783,7 +698,7 @@
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:787: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:702: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -810,9 +725,10 @@
 fi
 
 
+
 PACKAGE=gnuplot
 
-VERSION=$VERSION
+VERSION=$VERSION.$PL
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -829,7 +745,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:833: checking for working aclocal" >&5
+echo "configure:749: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -842,7 +758,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:846: checking for working autoconf" >&5
+echo "configure:762: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -855,7 +771,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:859: checking for working automake" >&5
+echo "configure:775: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -868,7 +784,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:872: checking for working autoheader" >&5
+echo "configure:788: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -881,7 +797,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:885: checking for working makeinfo" >&5
+echo "configure:801: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -893,6 +809,50 @@
    echo "$ac_t""missing" 1>&6
 fi
 
+install_sh="$missing_dir/install-sh"
+test -f "$install_sh" || install_sh="$missing_dir/install.sh"
+
+for ac_prog in gnutar gtar tar
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:821: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AMTAR'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AMTAR"; then
+  ac_cv_prog_AMTAR="$AMTAR" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AMTAR="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+AMTAR="$ac_cv_prog_AMTAR"
+if test -n "$AMTAR"; then
+  echo "$ac_t""$AMTAR" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$AMTAR" && break
+done
+
+AMTARFLAGS=
+if test -n "$AMTAR"; then
+  if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then
+        AMTARFLAGS=o
+  fi
+fi
+
 
 
 
@@ -906,15 +866,6 @@
 
 fi
 
-# Check whether --with-gnu-readline or --without-gnu-readline was given.
-if test "${with_gnu_readline+set}" = set; then
-  withval="$with_gnu_readline"
-  :
-else
-  test -z "$with_gnu_readline" && with_gnu_readline=no
-
-fi
-
 # Check whether --with-plot or --without-plot was given.
 if test "${with_plot+set}" = set; then
   withval="$with_plot"
@@ -945,15 +896,9 @@
 # Check whether --with-cwdrc or --without-cwdrc was given.
 if test "${with_cwdrc+set}" = set; then
   withval="$with_cwdrc"
-  test "$withval" = no && cat >> confdefs.h <<\EOF
-#define NOCWDRC 1
-EOF
-
+  :
 else
-  cat >> confdefs.h <<\EOF
-#define NOCWDRC 1
-EOF
-
+  test -z "$with_cwdrc" && with_cwdrc=no
 
 fi
 
@@ -972,34 +917,7 @@
   withval="$with_linux_vga"
   :
 else
-  test -z "$with_linux_vga" && with_linux_vga=yes
-
-fi
-
-# Check whether --enable-apollo or --disable-apollo was given.
-if test "${enable_apollo+set}" = set; then
-  enableval="$enable_apollo"
-  :
-else
-  test -z "$enable_apollo" && enable_apollo=no
-
-fi
-
-# Check whether --enable-gpr or --disable-gpr was given.
-if test "${enable_gpr+set}" = set; then
-  enableval="$enable_gpr"
-  :
-else
-  test -z "$enable_gpr" && enable_gpr=no
-
-fi
-
-# Check whether --enable-cgi or --disable-cgi was given.
-if test "${enable_cgi+set}" = set; then
-  enableval="$enable_cgi"
-  :
-else
-  test -z "$enable_cgi" && enable_cgi=no
+  test -z "$with_linux_vga" && with_linux_vga=no
 
 fi
 
@@ -1030,38 +948,11 @@
 
 fi
 
-# Check whether --enable-sun or --disable-sun was given.
-if test "${enable_sun+set}" = set; then
-  enableval="$enable_sun"
-  :
-else
-  test -z "$enable_sun" && enable_sun=no
-
-fi
-
-# Check whether --enable-unixpc or --disable-unixpc was given.
-if test "${enable_unixpc+set}" = set; then
-  enableval="$enable_unixpc"
-  :
-else
-  test -z "$enable_unixpc" && enable_unixpc=no
-
-fi
-
-# Check whether --enable-system-time or --disable-system-time was given.
-if test "${enable_system_time+set}" = set; then
-  enableval="$enable_system_time"
-  :
-else
-  test -z "$enable_system_time" && enable_system_time=no
-
-fi
-
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1065: checking for $ac_word" >&5
+echo "configure:956: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1091,7 +982,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:986: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1142,7 +1033,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1146: checking for $ac_word" >&5
+echo "configure:1037: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1174,7 +1065,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1178: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1069: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1185,12 +1076,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1189 "configure"
+#line 1080 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1216,12 +1107,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1220: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1111: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1225: checking whether we are using GNU C" >&5
+echo "configure:1116: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1230,7 +1121,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1249,7 +1140,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1253: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1144: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1284,7 +1175,7 @@
 
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1288: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:1179: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1294,13 +1185,14 @@
 # breaks some systems' header files.
 # AIX			-qlanglvl=ansi
 # Ultrix and OSF/1	-std1
-# HP-UX			-Aa -D_HPUX_SOURCE
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
 # SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   cat > conftest.$ac_ext <<EOF
-#line 1304 "configure"
+#line 1196 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -1337,7 +1229,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -1361,7 +1253,7 @@
 esac
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1365: checking how to run the C preprocessor" >&5
+echo "configure:1257: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1376,13 +1268,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1380 "configure"
+#line 1272 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1393,13 +1285,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1397 "configure"
+#line 1289 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1410,13 +1302,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1414 "configure"
+#line 1306 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1443,7 +1335,7 @@
 
 
 echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
-echo "configure:1447: checking for function prototypes" >&5
+echo "configure:1339: checking for function prototypes" >&5
 if test "$am_cv_prog_cc_stdc" != no; then
   echo "$ac_t""yes" 1>&6
   cat >> confdefs.h <<\EOF
@@ -1456,12 +1348,12 @@
   U=_ ANSI2KNR=./ansi2knr
   # Ensure some checks needed by ansi2knr itself.
   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1460: checking for ANSI C header files" >&5
+echo "configure:1352: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1465 "configure"
+#line 1357 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1469,7 +1361,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1486,7 +1378,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1490 "configure"
+#line 1382 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1504,7 +1396,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1508 "configure"
+#line 1400 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1525,7 +1417,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1529 "configure"
+#line 1421 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1536,7 +1428,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1563,17 +1455,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1567: checking for $ac_hdr" >&5
+echo "configure:1459: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1572 "configure"
+#line 1464 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1602,7 +1494,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1606: checking how to run the C preprocessor" >&5
+echo "configure:1498: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1617,13 +1509,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1621 "configure"
+#line 1513 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1634,13 +1526,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1638 "configure"
+#line 1530 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1651,13 +1543,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1655 "configure"
+#line 1547 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1682,12 +1574,12 @@
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1686: checking for working const" >&5
+echo "configure:1578: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1691 "configure"
+#line 1583 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1736,7 +1628,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1757,21 +1649,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1761: checking for inline" >&5
+echo "configure:1653: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1768 "configure"
+#line 1660 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1799,12 +1691,12 @@
 
 
 echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6
-echo "configure:1803: checking for preprocessor stringizing operator" >&5
+echo "configure:1695: checking for preprocessor stringizing operator" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1808 "configure"
+#line 1700 "configure"
 #include "confdefs.h"
 
 #define x(y) #y
@@ -1835,9 +1727,9 @@
 
 
 echo $ac_n "checking if compiler handles warn and error directives correctly""... $ac_c" 1>&6
-echo "configure:1839: checking if compiler handles warn and error directives correctly" >&5
+echo "configure:1731: checking if compiler handles warn and error directives correctly" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1841 "configure"
+#line 1733 "configure"
 #include "confdefs.h"
 #if 0
 #error "error"
@@ -1845,7 +1737,7 @@
 #endif
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1869,7 +1761,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:1873: checking for X" >&5
+echo "configure:1765: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1931,12 +1823,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1935 "configure"
+#line 1827 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2005,14 +1897,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2009 "configure"
+#line 1901 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:2016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -2118,17 +2010,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:2122: checking whether -R must be followed by a space" >&5
+echo "configure:2014: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 2125 "configure"
+#line 2017 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -2144,14 +2036,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 2148 "configure"
+#line 2040 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -2183,7 +2075,7 @@
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:2187: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2079: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2191,7 +2083,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2195 "configure"
+#line 2087 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2202,7 +2094,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2224,7 +2116,7 @@
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:2228: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2120: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2232,7 +2124,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2236 "configure"
+#line 2128 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2243,7 +2135,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2272,12 +2164,12 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:2276: checking for gethostbyname" >&5
+echo "configure:2168: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2281 "configure"
+#line 2173 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -2300,7 +2192,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -2321,7 +2213,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2325: checking for gethostbyname in -lnsl" >&5
+echo "configure:2217: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2329,7 +2221,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2333 "configure"
+#line 2225 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2340,7 +2232,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:2344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2370,12 +2262,12 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:2374: checking for connect" >&5
+echo "configure:2266: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2379 "configure"
+#line 2271 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -2398,7 +2290,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -2419,7 +2311,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2423: checking for connect in -lsocket" >&5
+echo "configure:2315: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2427,7 +2319,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2431 "configure"
+#line 2323 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2438,7 +2330,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:2442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2462,12 +2354,12 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:2466: checking for remove" >&5
+echo "configure:2358: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2471 "configure"
+#line 2363 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -2490,7 +2382,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -2511,7 +2403,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2515: checking for remove in -lposix" >&5
+echo "configure:2407: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2519,7 +2411,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2523 "configure"
+#line 2415 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2530,7 +2422,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2554,12 +2446,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2558: checking for shmat" >&5
+echo "configure:2450: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2563 "configure"
+#line 2455 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -2582,7 +2474,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -2603,7 +2495,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2607: checking for shmat in -lipc" >&5
+echo "configure:2499: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2611,7 +2503,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2615 "configure"
+#line 2507 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2622,7 +2514,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2655,7 +2547,7 @@
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2659: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2551: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2663,7 +2555,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2667 "configure"
+#line 2559 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2674,7 +2566,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2698,6 +2590,50 @@
 
 fi
 
+
+if test "$ac_cv_lib_nsl_gethostbyname" = no; then
+  echo $ac_n "checking for gethostbyname in -lbsd""... $ac_c" 1>&6
+echo "configure:2597: checking for gethostbyname in -lbsd" >&5
+ac_lib_var=`echo bsd'_'gethostbyname | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lbsd  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2605 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char gethostbyname();
+
+int main() {
+gethostbyname()
+; return 0; }
+EOF
+if { (eval echo configure:2616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
 if test "$no_x" != yes; then
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
   X_LIBRARIES="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
@@ -2710,9 +2646,9 @@
 
 
 echo $ac_n "checking for MS-DOS/djgpp/libGRX""... $ac_c" 1>&6
-echo "configure:2714: checking for MS-DOS/djgpp/libGRX" >&5
+echo "configure:2650: checking for MS-DOS/djgpp/libGRX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2716 "configure"
+#line 2652 "configure"
 #include "confdefs.h"
 #if __DJGPP__ && __DJGPP__ == 2
   yes
@@ -2723,18 +2659,18 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
-   LIBS="-lpc $LIBS"
-   cat >> confdefs.h <<\EOF
+  LIBS="-lpc $LIBS"
+  cat >> confdefs.h <<\EOF
 #define MSDOS 1
 EOF
 
-   cat >> confdefs.h <<\EOF
+  cat >> confdefs.h <<\EOF
 #define DOS32 1
 EOF
 
-   with_linux_vga=no
-   echo $ac_n "checking for GrLine in -lgrx20""... $ac_c" 1>&6
-echo "configure:2738: checking for GrLine in -lgrx20" >&5
+  with_linux_vga=no
+  echo $ac_n "checking for GrLine in -lgrx20""... $ac_c" 1>&6
+echo "configure:2674: checking for GrLine in -lgrx20" >&5
 ac_lib_var=`echo grx20'_'GrLine | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2742,7 +2678,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgrx20  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2746 "configure"
+#line 2682 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2753,7 +2689,7 @@
 GrLine()
 ; return 0; }
 EOF
-if { (eval echo configure:2757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2768,14 +2704,14 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-        LIBS="-lgrx20 $LIBS"
-      CFLAGS="$CFLAGS -fno-inline-functions"
-      cat >> confdefs.h <<\EOF
+      LIBS="-lgrx20 $LIBS"
+    CFLAGS="$CFLAGS -fno-inline-functions"
+    cat >> confdefs.h <<\EOF
 #define DJSVGA 1
 EOF
 
-      echo $ac_n "checking for GrCustomLine in -lgrx20""... $ac_c" 1>&6
-echo "configure:2779: checking for GrCustomLine in -lgrx20" >&5
+    echo $ac_n "checking for GrCustomLine in -lgrx20""... $ac_c" 1>&6
+echo "configure:2715: checking for GrCustomLine in -lgrx20" >&5
 ac_lib_var=`echo grx20'_'GrCustomLine | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2783,7 +2719,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgrx20  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2787 "configure"
+#line 2723 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2794,7 +2730,7 @@
 GrCustomLine()
 ; return 0; }
 EOF
-if { (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2809,29 +2745,29 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
+        cat >> confdefs.h <<\EOF
 #define GRX21 1
 EOF
-
+    
 else
   echo "$ac_t""no" 1>&6
 fi
-
+  
 else
   echo "$ac_t""no" 1>&6
 fi
 
 else
   rm -rf conftest*
-     echo "$ac_t""no" 1>&6
-   
+    echo "$ac_t""no" 1>&6
+  
 fi
 rm -f conftest*
 
 echo $ac_n "checking for NeXT""... $ac_c" 1>&6
-echo "configure:2833: checking for NeXT" >&5
+echo "configure:2769: checking for NeXT" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2835 "configure"
+#line 2771 "configure"
 #include "confdefs.h"
 #if __NeXT__
   yes
@@ -2843,27 +2779,122 @@
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    LIBS="$LIBS -lsys_s -lNeXT_s"
-   NEXTOBJS=epsviewe.o
    CFLAGS="$CFLAGS -ObjC"
 else
   rm -rf conftest*
-     NEXTOBJS=
-   echo "$ac_t""no" 1>&6
+     echo "$ac_t""no" 1>&6
+fi
+rm -f conftest*
+
+
+
+echo $ac_n "checking for sin""... $ac_c" 1>&6
+echo "configure:2793: checking for sin" >&5
+if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2798 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char sin(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char sin();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_sin) || defined (__stub___sin)
+choke me
+#else
+sin();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_sin=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_sin=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'sin`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test "$ac_cv_func_sin" = no ; then
+  echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
+echo "configure:2842: checking for sin in -lm" >&5
+ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lm  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2850 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char sin();
+
+int main() {
+sin()
+; return 0; }
+EOF
+if { (eval echo configure:2861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
 
+  LIBS="-lm $LIBS"
 
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-LIBS="$LIBS -lm"
+fi
+dnlLIBS="$LIBS -lm"
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2862: checking for ANSI C header files" >&5
+echo "configure:2893: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2867 "configure"
+#line 2898 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2871,7 +2902,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2888,7 +2919,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2892 "configure"
+#line 2923 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2906,7 +2937,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2910 "configure"
+#line 2941 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2927,7 +2958,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2931 "configure"
+#line 2962 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2938,7 +2969,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2967,17 +2998,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2971: checking for $ac_hdr" >&5
+echo "configure:3002: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2976 "configure"
+#line 3007 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3008,17 +3039,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3012: checking for $ac_hdr" >&5
+echo "configure:3043: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3017 "configure"
+#line 3048 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3045,12 +3076,12 @@
 done
 
 test "$ac_cv_header_sys_stat_h" = yes && echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:3049: checking whether stat file-mode macros are broken" >&5
+echo "configure:3080: checking whether stat file-mode macros are broken" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3054 "configure"
+#line 3085 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -3102,9 +3133,9 @@
 
 
 echo $ac_n "checking for unistd.h""... $ac_c" 1>&6
-echo "configure:3106: checking for unistd.h" >&5
+echo "configure:3137: checking for unistd.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3108 "configure"
+#line 3139 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -3123,9 +3154,9 @@
 
 
 echo $ac_n "checking if errno variable is declared""... $ac_c" 1>&6
-echo "configure:3127: checking if errno variable is declared" >&5
+echo "configure:3158: checking if errno variable is declared" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3129 "configure"
+#line 3160 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #ifdef HAVE_ERRNO_H
@@ -3135,28 +3166,29 @@
 errno=0
 ; return 0; }
 EOF
-if { (eval echo configure:3139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  cat >> confdefs.h <<\EOF
+    cat >> confdefs.h <<\EOF
 #define EXTERN_ERRNO 1
 EOF
- echo "$ac_t""no" 1>&6
+
+  echo "$ac_t""no" 1>&6
+
 fi
 rm -f conftest*
 
-
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3155: checking for size_t" >&5
+echo "configure:3187: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3160 "configure"
+#line 3192 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3184,9 +3216,9 @@
 fi
 
 echo $ac_n "checking for time_t in time.h""... $ac_c" 1>&6
-echo "configure:3188: checking for time_t in time.h" >&5
+echo "configure:3220: checking for time_t in time.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3190 "configure"
+#line 3222 "configure"
 #include "confdefs.h"
 #include <time.h>
 EOF
@@ -3197,12 +3229,12 @@
 else
   rm -rf conftest*
      echo "$ac_t""no" 1>&6 echo $ac_n "checking for time_t""... $ac_c" 1>&6
-echo "configure:3201: checking for time_t" >&5
+echo "configure:3233: checking for time_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3206 "configure"
+#line 3238 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3233,12 +3265,12 @@
 rm -f conftest*
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3237: checking return type of signal handlers" >&5
+echo "configure:3269: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3242 "configure"
+#line 3274 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3255,7 +3287,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3280,12 +3312,12 @@
   strerror strchr index strrchr rindex strstr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3284: checking for $ac_func" >&5
+echo "configure:3316: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3289 "configure"
+#line 3321 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3308,7 +3340,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3337,12 +3369,12 @@
   strncasecmp strnicmp sysinfo tcgetattr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3341: checking for $ac_func" >&5
+echo "configure:3373: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3346 "configure"
+#line 3378 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3365,7 +3397,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3396,21 +3428,77 @@
 
 fi
 
-for ac_hdr in sys/types.h sys/time.h sys/select.h sys/socket.h
+for ac_func in select
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3435: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3440 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+if test "$ac_cv_func_select" = yes; then
+  for ac_hdr in unistd.h sys/types.h sys/time.h sys/select.h sys/socket.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3404: checking for $ac_hdr" >&5
+echo "configure:3492: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3409 "configure"
+#line 3497 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3436,28 +3524,28 @@
 fi
 done
 
- echo $ac_n "checking types of arguments for select()""... $ac_c" 1>&6
-echo "configure:3441: checking types of arguments for select()" >&5
- if eval "test \"`echo '$''{'ac_cv_func_select_arg234'+set}'`\" = set"; then
+  echo $ac_n "checking argument types of select()""... $ac_c" 1>&6
+echo "configure:3529: checking argument types of select()" >&5
+  if eval "test \"`echo '$''{'ac_cv_type_fd_set_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-   if eval "test \"`echo '$''{'ac_cv_func_select_arg1'+set}'`\" = set"; then
+      if eval "test \"`echo '$''{'ac_cv_type_fd_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    if eval "test \"`echo '$''{'ac_cv_func_select_arg5'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-     for ac_cv_func_select_arg234 in 'fd_set *' 'int *' 'void *'; do
-     for ac_cv_func_select_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do
-      for ac_cv_func_select_arg5 in 'struct timeval *' 'const struct timeval *'; do
-       cat > conftest.$ac_ext <<EOF
-#line 3455 "configure"
+        for ac_cv_type_fd_set in 'fd_set' 'int' 'void'; do
+        for ac_cv_type_fd_set_size_t in 'int' 'size_t' 'unsigned long' 'unsigned'; do
+	  for ac_type_timeval in 'struct timeval' 'const struct timeval'; do
+            cat > conftest.$ac_ext <<EOF
+#line 3540 "configure"
 #include "confdefs.h"
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
 #endif
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -3465,56 +3553,98 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-extern select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);
 int main() {
-
+#ifdef __STDC__
+extern int select ($ac_cv_type_fd_set_size_t, 
+ $ac_cv_type_fd_set *,	$ac_cv_type_fd_set *, $ac_cv_type_fd_set *,
+ $ac_type_timeval *);
+#else
+extern int select ();
+  $ac_cv_type_fd_set_size_t s;
+  $ac_cv_type_fd_set *p;
+  $ac_type_timeval *t;
+#endif
 ; return 0; }
 EOF
-if { (eval echo configure:3474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-          ac_not_found=no ; break 3
+  ac_found=yes ; break 3
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_not_found=yes
+  ac_found=no
 fi
 rm -f conftest*
+          done
+        done
       done
-     done
-    done
-   
+    
 fi
   
 fi
- 
-fi
- if test "$ac_not_found" = yes; then
-  ac_cv_func_select_arg1=int 
-  ac_cv_func_select_arg234='int *' 
-  ac_cv_func_select_arg5='struct timeval *'
- fi
- echo "$ac_t""$ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5" 1>&6
- cat >> confdefs.h <<EOF
-#define SELECT_TYPE_ARG1 $ac_cv_func_select_arg1
+  if test "$ac_found" = no; then
+    { echo "configure: error: can't determine argument types" 1>&2; exit 1; }
+  fi
+
+  echo "$ac_t""select($ac_cv_type_fd_set_size_t,$ac_cv_type_fd_set *,...)" 1>&6
+  cat >> confdefs.h <<EOF
+#define fd_set_size_t $ac_cv_type_fd_set_size_t
 EOF
 
- cat >> confdefs.h <<EOF
-#define SELECT_TYPE_ARG234 ($ac_cv_func_select_arg234)
+  ac_cast=
+  if test "$ac_cv_type_fd_set" != fd_set; then
+    # Arguments 2-4 are not fd_set.  Some weirdo systems use fd_set type for
+    # FD_SET macros, but insist that you cast the argument to select.  I don't
+    # understand why that might be, but it means we cannot define fd_set.
+    cat > conftest.$ac_ext <<EOF
+#line 3602 "configure"
+#include "confdefs.h"
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])fd_set[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+      # We found fd_set type in a header, need special cast
+    ac_cast="($ac_cv_type_fd_set *)"
+else
+  rm -rf conftest*
+      # No fd_set type; it is safe to define it
+    cat >> confdefs.h <<EOF
+#define fd_set $ac_cv_type_fd_set
 EOF
 
- cat >> confdefs.h <<EOF
-#define SELECT_TYPE_ARG5 ($ac_cv_func_select_arg5)
+fi
+rm -f conftest*
+
+  fi
+  cat >> confdefs.h <<EOF
+#define SELECT_FD_SET_CAST $ac_cast
 EOF
 
+fi
 
 
 
 if test "$with_linux_vga" = yes; then
   echo $ac_n "checking for linux vga library""... $ac_c" 1>&6
-echo "configure:3516: checking for linux vga library" >&5
+echo "configure:3646: checking for linux vga library" >&5
   echo $ac_n "checking for vga_init in -lvga""... $ac_c" 1>&6
-echo "configure:3518: checking for vga_init in -lvga" >&5
+echo "configure:3648: checking for vga_init in -lvga" >&5
 ac_lib_var=`echo vga'_'vga_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3522,7 +3652,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lvga  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3526 "configure"
+#line 3656 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3533,7 +3663,7 @@
 vga_init()
 ; return 0; }
 EOF
-if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3561,11 +3691,12 @@
 
 fi
 
-if test "$with_gnu_readline" != no; then
-      gp_tcap=""
-  for termlib in ncurses curses termcap terminfo termlib; do
-    echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6
-echo "configure:3569: checking for tputs in -l${termlib}" >&5
+if test "$with_readline" != no; then
+  if test "$with_readline" != yes; then
+            gp_tcap=""
+    for termlib in ncurses curses termcap terminfo termlib; do
+      echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6
+echo "configure:3700: checking for tputs in -l${termlib}" >&5
 ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3573,7 +3704,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l${termlib}  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3577 "configure"
+#line 3708 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3584,7 +3715,7 @@
 tputs()
 ; return 0; }
 EOF
-if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3599,30 +3730,29 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  gp_tcap="${gp_tcap} -l${termlib}"
+  gp_tcap="$gp_tcap -l$termlib"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    case "${gp_tcap}" in
-      *-l${termlib}*)
-        echo "$ac_t""using ${gp_tcap} with readline" 1>&6
-        break
-      ;;
-    esac
-  done
+      case "$gp_tcap" in
+        *-l${termlib}*)
+          break
+        ;;
+      esac
+    done
 
-  if test "$with_gnu_readline" = yes; then
-    echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:3618: checking for readline in -lreadline" >&5
+    if test "$with_readline" = gnu; then
+      echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
+echo "configure:3748: checking for readline in -lreadline" >&5
 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lreadline      ${gp_tcap} $LIBS"
+LIBS="-lreadline ${gp_tcap} $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3626 "configure"
+#line 3756 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3633,7 +3763,7 @@
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:3637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3648,51 +3778,108 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-       LIBS="$LIBS -lreadline $gp_tcap"
-     cat >> confdefs.h <<\EOF
-#define GNU_READLINE 1
+         TERMLIBS="$TERMLIBS -lreadline $gp_tcap"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    else
+      ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
+  gp_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
+echo "configure:3792: checking for readline in -lreadline" >&5
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  gp_save_TERMLIBS="$TERMLIBS"
+if test "$with_readline" != yes && test "$with_readline" != no; then
+  gp_l_path=`echo "$with_readline" | sed -e 's%/libreadline\.a$%%'`
+  gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path"
+fi
+for ac_dir in $gp_l_list '' /usr/local/lib ; do
+  test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS"
+  ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
+ac_save_LIBS="$LIBS"
+LIBS="$TERMLIBS $TERMXLIBS -lreadline ${gp_tcap} $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3808 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char readline();
+
+int main() {
+readline()
+; return 0; }
 EOF
+if { (eval echo configure:3819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+fi
+
+  TERMLIBS="$gp_save_TERMLIBS"
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    eval "ac_cv_lib_$ac_lib_var=${ac_dir}"
+    break
+  fi
+done
+
+fi
 
-     with_readline=no
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then
+    eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\""
+  fi
+  TERMLIBS="$TERMLIBS -lreadline"
+  echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
-     { echo "configure: error: Can't find -lreadline in a standard path -- specify its location using --with-gnu-readline=/path/to/libreadline.a" 1>&2; exit 1; }
 fi
-  else
-    if test ! -f $with_gnu_readline ; then
-      if test ! -f ${with_gnu_readline}/lib/libreadline.a ; then
-        if test ! -f ${with_gnu_readline}/libreadline.a ; then
-          { echo "configure: error: GNU readline library not found" 1>&2; exit 1; }
-        else
-          echo "$ac_t""using ${with_gnu_readline}/libreadline.a" 1>&6
-          LIBS="$LIBS ${with_gnu_readline}/libreadline.a $gp_tcap"
-        fi
-      else
-        echo "$ac_t""using ${with_gnu_readline}/lib/libreadline.a" 1>&6
-        LIBS="$LIBS ${with_gnu_readline}/lib/libreadline.a $gp_tcap"
+
+      if test "$ac_cv_lib_readline_readline" != no; then
+        TERMLIBS="$TERMLIBS $gp_tcap"
       fi
-    else
-      echo "$ac_t""using ${with_gnu_readline}" 1>&6
-      LIBS="$LIBS $with_gnu_readline $gp_tcap"
     fi
 
-    cat >> confdefs.h <<\EOF
-#define GNU_READLINE 1
+    if test "$ac_cv_lib_readline_readline" = no; then
+      echo "configure: warning: GNU readline not found - falling back to builtin readline" 1>&2
+      with_readline=yes
+    else
+      cat >> confdefs.h <<\EOF
+#define HAVE_LIBREADLINE 1
 EOF
 
-    with_readline=no
-  fi
-fi
+    fi # ! ac_cv_lib_readline_readline = no
 
-test "$with_readline" = yes && cat >> confdefs.h <<\EOF
+  fi # ! with_readline != yes
+
+  if test "$with_readline" = yes; then
+    cat >> confdefs.h <<\EOF
 #define READLINE 1
 EOF
 
+  fi
+
+fi
 
 if test "$with_plot" != no; then
   if test "$with_plot" = yes; then
         echo $ac_n "checking for openpl in -lplot""... $ac_c" 1>&6
-echo "configure:3696: checking for openpl in -lplot" >&5
+echo "configure:3883: checking for openpl in -lplot" >&5
 ac_lib_var=`echo plot'_'openpl | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3700,7 +3887,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lplot  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3704 "configure"
+#line 3891 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3711,7 +3898,7 @@
 openpl()
 ; return 0; }
 EOF
-if { (eval echo configure:3715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3738,37 +3925,38 @@
 
   else
         TERMXLIBS="$X_LIBS -lXaw -lXmu -lXt -lXext -lX11"
-    echo $ac_n "checking for textangle in -lplot""... $ac_c" 1>&6
-echo "configure:3743: checking for textangle in -lplot" >&5
-gp_save_TERMLIBS="$TERMLIBS"
+    ac_lib_var=`echo plot'_'pl_textangle | sed 'y%./+-%__p_%'`
   gp_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-case "$with_plot" in
-  yes|no)
-    gp_lib_list="";;
-  *)
-    gp_lib_path=`echo $with_plot | sed -e 's%/libplot\.a$%%'`
-    gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'`
-    gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path"
-esac
-for ac_dir in '' /usr/local/lib $gp_lib_list ; do
-  TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS"
-  ac_lib_var=`echo plot'_'textangle | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for pl_textangle in -lplot""... $ac_c" 1>&6
+echo "configure:3933: checking for pl_textangle in -lplot" >&5
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  gp_save_TERMLIBS="$TERMLIBS"
+if test "$with_plot" != yes && test "$with_plot" != no; then
+  gp_l_path=`echo "$with_plot" | sed -e 's%/libplot\.a$%%'`
+  gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path"
+fi
+for ac_dir in $gp_l_list '' /usr/local/lib ; do
+  test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS"
+  ac_lib_var=`echo plot'_'pl_textangle | sed 'y%./+-%__p_%'`
 ac_save_LIBS="$LIBS"
-LIBS="$TERMLIBS $TERMXLIBS -lplot     $TERMXLIBS $LIBS"
+LIBS="$TERMLIBS $TERMXLIBS -lplot $TERMXLIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3761 "configure"
+#line 3949 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char textangle();
+char pl_textangle();
 
 int main() {
-textangle()
+pl_textangle()
 ; return 0; }
 EOF
-if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3780,50 +3968,62 @@
 rm -f conftest*
 LIBS="$ac_save_LIBS"
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-      TERMLIBS="$TERMLIBS -lplot"; break
-else
-      TERMLIBS="$gp_save_TERMLIBS"
+  ac_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
 fi
-                               done
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+  TERMLIBS="$gp_save_TERMLIBS"
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    eval "ac_cv_lib_$ac_lib_var=${ac_dir}"
+    break
+  fi
+done
+
+fi
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then
+    eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\""
+  fi
+  TERMLIBS="$TERMLIBS -lplot"
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    if test "$ac_cv_lib_plot_textangle" = no; then
-      TERMXLIBS=
-      echo $ac_n "checking for rotate in -lplot""... $ac_c" 1>&6
-echo "configure:3798: checking for rotate in -lplot" >&5
-gp_save_TERMLIBS="$TERMLIBS"
+    if test "$ac_cv_lib_plot_pl_textangle" = no; then
+      ac_lib_var=`echo plot'_'textangle | sed 'y%./+-%__p_%'`
   gp_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-case "$with_plot" in
-  yes|no)
-    gp_lib_list="";;
-  *)
-    gp_lib_path=`echo $with_plot | sed -e 's%/libplot\.a$%%'`
-    gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'`
-    gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path"
-esac
-for ac_dir in '' /usr/local/lib $gp_lib_list ; do
-  TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS"
-  ac_lib_var=`echo plot'_'rotate | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for textangle in -lplot""... $ac_c" 1>&6
+echo "configure:4000: checking for textangle in -lplot" >&5
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  gp_save_TERMLIBS="$TERMLIBS"
+if test "$with_plot" != yes && test "$with_plot" != no; then
+  gp_l_path=`echo "$with_plot" | sed -e 's%/libplot\.a$%%'`
+  gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path"
+fi
+for ac_dir in $gp_l_list '' /usr/local/lib ; do
+  test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS"
+  ac_lib_var=`echo plot'_'textangle | sed 'y%./+-%__p_%'`
 ac_save_LIBS="$LIBS"
-LIBS="$TERMLIBS $TERMXLIBS -lplot      $LIBS"
+LIBS="$TERMLIBS $TERMXLIBS -lplot $TERMXLIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3816 "configure"
+#line 4016 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char rotate();
+char textangle();
 
 int main() {
-rotate()
+textangle()
 ; return 0; }
 EOF
-if { (eval echo configure:3827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3835,73 +4035,63 @@
 rm -f conftest*
 LIBS="$ac_save_LIBS"
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-      TERMLIBS="$TERMLIBS -lplot"; break
-else
-      TERMLIBS="$gp_save_TERMLIBS"
-fi
-                               done
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+  ac_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
 fi
 
-      if test "$ac_cv_lib_plot_rotate" = no; then
-        echo "configure: warning: can't find GNU libplot -- disabling gnugraph terminal" 1>&2
-        with_plot=no
-      else
-        echo "$ac_t"" - using obsolete GNU graphics library" 1>&6
-        cat >> confdefs.h <<\EOF
-#define GNUGRAPH 1
-EOF
-
-      fi # old GNU plotlib
-    else
-      echo "$ac_t"" - using GNU plotutils library" 1>&6
-      cat >> confdefs.h <<\EOF
-#define GNUGRAPH 1
-EOF
+  TERMLIBS="$gp_save_TERMLIBS"
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    eval "ac_cv_lib_$ac_lib_var=${ac_dir}"
+    break
+  fi
+done
 
-      cat >> confdefs.h <<\EOF
-#define GNU_PLOTUTILS 1
-EOF
+fi
 
-    fi # new GNU plotlib
-  fi # Unix plotlib
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then
+    eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\""
+  fi
+  TERMLIBS="$TERMLIBS -lplot"
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-if test "$with_gd" != no; then
-  echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
-echo "configure:3876: checking for gdImageCreate in -lgd" >&5
-gp_save_TERMLIBS="$TERMLIBS"
-  gp_tr_lib=HAVE_LIB`echo gd | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+      if test "$ac_cv_lib_plot_textangle" = no; then
+        TERMXLIBS=
+        ac_lib_var=`echo plot'_'rotate | sed 'y%./+-%__p_%'`
+  gp_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-case "$with_gd" in
-  yes|no)
-    gp_lib_list="";;
-  *)
-    gp_lib_path=`echo $with_gd | sed -e 's%/libgd\.a$%%'`
-    gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'`
-    gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path"
-esac
-for ac_dir in '' /usr/local/lib $gp_lib_list ; do
-  TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS"
-  ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for rotate in -lplot""... $ac_c" 1>&6
+echo "configure:4068: checking for rotate in -lplot" >&5
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  gp_save_TERMLIBS="$TERMLIBS"
+if test "$with_plot" != yes && test "$with_plot" != no; then
+  gp_l_path=`echo "$with_plot" | sed -e 's%/libplot\.a$%%'`
+  gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path"
+fi
+for ac_dir in $gp_l_list '' /usr/local/lib ; do
+  test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS"
+  ac_lib_var=`echo plot'_'rotate | sed 'y%./+-%__p_%'`
 ac_save_LIBS="$LIBS"
-LIBS="$TERMLIBS $TERMXLIBS -lgd      $LIBS"
+LIBS="$TERMLIBS $TERMXLIBS -lplot  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3894 "configure"
+#line 4084 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char gdImageCreate();
+char rotate();
 
 int main() {
-gdImageCreate()
+rotate()
 ; return 0; }
 EOF
-if { (eval echo configure:3905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3913,36 +4103,67 @@
 rm -f conftest*
 LIBS="$ac_save_LIBS"
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-      TERMLIBS="$TERMLIBS -lgd"; break
-else
-      TERMLIBS="$gp_save_TERMLIBS"
+  ac_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
 fi
-                               done
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+  TERMLIBS="$gp_save_TERMLIBS"
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    eval "ac_cv_lib_$ac_lib_var=${ac_dir}"
+    break
+  fi
+done
+
+fi
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then
+    eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\""
+  fi
+  TERMLIBS="$TERMLIBS -lplot"
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-  if test "$ac_cv_lib_gd_gdImageCreate" = yes; then
-    
-echo $ac_n "checking for gd.h""... $ac_c" 1>&6
-echo "configure:3931: checking for gd.h" >&5
-ac_safe=`echo "gd.h" | sed 'y%./+-%__p_%'`
-gp_save_CPPFLAGS="$CPPFLAGS"
-for ac_dir in '' /usr/local/include $gp_lib_prefix $gp_lib_prefix/include ; do
-  CPPFLAGS="$gp_save_CPPFLAGS `test x${ac_dir} != x && echo -I${ac_dir}`"
+        if test "$ac_cv_lib_plot_rotate" = no; then
+          echo "configure: warning: can't find GNU libplot -- disabling gnugraph terminal" 1>&2
+          with_plot=no
+        else
+          echo "$ac_t"" - using obsolete GNU graphics library" 1>&6
+        fi # old GNU plotlib
+      else
+        echo "$ac_t"" - using GNU plotutils library" 1>&6
+      fi # GNU plotlib pre-2.2
+    else
+      ac_safe=`echo "plotcompat.h" | sed 'y%./+-%__p_%'`
+  ac_tr_hdr=HAVE_`echo plotcompat.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+echo $ac_n "checking for plotcompat.h""... $ac_c" 1>&6
+echo "configure:4143: checking for plotcompat.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  gp_save_CPPFLAGS="$CPPFLAGS"
+if test "$with_plot" != yes && test "$with_plot" != no; then
+  gp_h_path=`echo "$with_plot" | sed -e 's%/libplotcompat.h\.a$%%'`
+  gp_h_prfx=`echo "$gp_h_path" | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_h_list="$gp_h_prfx $gp_h_prfx/include $gp_h_path"
+else
+  gp_h_list=''
+fi
+for ac_dir in $gp_h_list '' /usr/local/include ; do
+  test x${ac_dir} != x && CPPFLAGS="$gp_save_CPPFLAGS -I${ac_dir}"
   cat > conftest.$ac_ext <<EOF
-#line 3937 "configure"
+#line 4158 "configure"
 #include "confdefs.h"
-#include <gd.h>
+#include <plotcompat.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_header_$ac_safe=${ac_dir}"
 else
   echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
@@ -3951,51 +4172,208 @@
   eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  CPPFLAGS="$gp_save_CPPFLAGS"
+  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
     break
-  else
-    CPPFLAGS="${ac_save_CPPFLAGS}"
   fi
 done
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+fi
+
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != x" && eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != xyes"; then
+    eval "CPPFLAGS=\"$gp_save_CPPFLAGS -I`echo '$ac_cv_header_'$ac_safe`\""
+  fi
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
   echo "$ac_t""yes" 1>&6
-  :
+          cat >> confdefs.h <<\EOF
+#define HAVE_PLOTCOMPAT_H 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: found gd library but not gd.h" 1>&2
-     echo "configure: warning: please add path to gd.h to CPPFLAGS in Makefile" 1>&2
-    
+echo "configure: warning: found GNU plotutils 2.2+ library but not plotcompat.h" 1>&2
+        echo "configure: warning: please add path to plotcompat.h to CPPFLAGS in Makefile" 1>&2
+      
 fi
-    cat >> confdefs.h <<\EOF
+ # plotcompat.h
+    fi # new GNU plotlib
+
+    if test "$with_plot" != no; then
+      cat >> confdefs.h <<\EOF
+#define GNUGRAPH 1
+EOF
+
+      cat >> confdefs.h <<\EOF
+#define GNU_PLOTUTILS 1
+EOF
+
+    fi
+
+  fi # ! Unix plotlib
+fi
+
+if test "$with_gd" != no; then
+  ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
+  gp_tr_lib=HAVE_LIB`echo gd | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
+echo "configure:4225: checking for gdImageCreate in -lgd" >&5
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  gp_save_TERMLIBS="$TERMLIBS"
+if test "$with_gd" != yes && test "$with_gd" != no; then
+  gp_l_path=`echo "$with_gd" | sed -e 's%/libgd\.a$%%'`
+  gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path"
+fi
+for ac_dir in $gp_l_list '' /usr/local/lib ; do
+  test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS"
+  ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
+ac_save_LIBS="$LIBS"
+LIBS="$TERMLIBS $TERMXLIBS -lgd  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 4241 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char gdImageCreate();
+
+int main() {
+gdImageCreate()
+; return 0; }
+EOF
+if { (eval echo configure:4252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  ac_tr_lib=HAVE_LIB`echo gd | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+fi
+
+  TERMLIBS="$gp_save_TERMLIBS"
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    eval "ac_cv_lib_$ac_lib_var=${ac_dir}"
+    break
+  fi
+done
+
+fi
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then
+    eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\""
+  fi
+  TERMLIBS="$TERMLIBS -lgd"
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test "$ac_cv_lib_gd_gdImageCreate" != no; then
+    ac_safe=`echo "gd.h" | sed 'y%./+-%__p_%'`
+  ac_tr_hdr=HAVE_`echo gd.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+echo $ac_n "checking for gd.h""... $ac_c" 1>&6
+echo "configure:4291: checking for gd.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  gp_save_CPPFLAGS="$CPPFLAGS"
+if test "$with_gd" != yes && test "$with_gd" != no; then
+  gp_h_path=`echo "$with_gd" | sed -e 's%/libgd.h\.a$%%'`
+  gp_h_prfx=`echo "$gp_h_path" | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_h_list="$gp_h_prfx $gp_h_prfx/include $gp_h_path"
+else
+  gp_h_list=''
+fi
+for ac_dir in $gp_h_list '' /usr/local/include ; do
+  test x${ac_dir} != x && CPPFLAGS="$gp_save_CPPFLAGS -I${ac_dir}"
+  cat > conftest.$ac_ext <<EOF
+#line 4306 "configure"
+#include "confdefs.h"
+#include <gd.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=${ac_dir}"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+  CPPFLAGS="$gp_save_CPPFLAGS"
+  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
+    break
+  fi
+done
+
+fi
+
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != x" && eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != xyes"; then
+    eval "CPPFLAGS=\"$gp_save_CPPFLAGS -I`echo '$ac_cv_header_'$ac_safe`\""
+  fi
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+  echo "$ac_t""yes" 1>&6
+              cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD 1
 EOF
 
+else
+  echo "$ac_t""no" 1>&6
+            echo "configure: warning: found gd library but not gd.h" 1>&2
+      echo "configure: warning: please add path to gd.h to CPPFLAGS in Makefile" 1>&2
+fi
+
   else
     echo "$ac_t""- see term/gif.trm for download details" 1>&6
   fi
 fi
 
 if test "$with_png" != no; then
-  echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6
-echo "configure:3981: checking for png_info_init in -lpng" >&5
-gp_save_TERMLIBS="$TERMLIBS"
+  ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'`
   gp_tr_lib=HAVE_LIB`echo png | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-case "$with_png" in
-  yes|no)
-    gp_lib_list="";;
-  *)
-    gp_lib_path=`echo $with_png | sed -e 's%/libpng\.a$%%'`
-    gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'`
-    gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path"
-esac
-for ac_dir in '' /usr/local/lib $gp_lib_list ; do
-  TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS"
+echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6
+echo "configure:4361: checking for png_info_init in -lpng" >&5
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  gp_save_TERMLIBS="$TERMLIBS"
+if test "$with_png" != yes && test "$with_png" != no; then
+  gp_l_path=`echo "$with_png" | sed -e 's%/libpng\.a$%%'`
+  gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path"
+fi
+for ac_dir in $gp_l_list '' /usr/local/lib ; do
+  test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS"
   ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'`
 ac_save_LIBS="$LIBS"
-LIBS="$TERMLIBS $TERMXLIBS -lpng     -lz $LIBS"
+LIBS="$TERMLIBS $TERMXLIBS -lpng -lz $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3999 "configure"
+#line 4377 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4006,7 +4384,7 @@
 png_info_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4018,37 +4396,59 @@
 rm -f conftest*
 LIBS="$ac_save_LIBS"
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-      TERMLIBS="$TERMLIBS -lpng"; break
-else
-      TERMLIBS="$gp_save_TERMLIBS"
+  ac_tr_lib=HAVE_LIB`echo png | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
 fi
-                               done
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+  TERMLIBS="$gp_save_TERMLIBS"
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    eval "ac_cv_lib_$ac_lib_var=${ac_dir}"
+    break
+  fi
+done
+
+fi
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then
+    eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\""
+  fi
+  TERMLIBS="$TERMLIBS -lpng"
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-  if test "$ac_cv_lib_png_png_info_init" = yes; then
+  if test "$ac_cv_lib_png_png_info_init" != no; then
     TERMLIBS="$TERMLIBS -lz"
-    
+    ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
+  ac_tr_hdr=HAVE_`echo png.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:4037: checking for png.h" >&5
-ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
-gp_save_CPPFLAGS="$CPPFLAGS"
-for ac_dir in '' /usr/local/include $gp_lib_prefix $gp_lib_prefix/include ; do
-  CPPFLAGS="$gp_save_CPPFLAGS `test x${ac_dir} != x && echo -I${ac_dir}`"
+echo "configure:4428: checking for png.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  gp_save_CPPFLAGS="$CPPFLAGS"
+if test "$with_png" != yes && test "$with_png" != no; then
+  gp_h_path=`echo "$with_png" | sed -e 's%/libpng.h\.a$%%'`
+  gp_h_prfx=`echo "$gp_h_path" | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_h_list="$gp_h_prfx $gp_h_prfx/include $gp_h_path"
+else
+  gp_h_list=''
+fi
+for ac_dir in $gp_h_list '' /usr/local/include ; do
+  test x${ac_dir} != x && CPPFLAGS="$gp_save_CPPFLAGS -I${ac_dir}"
   cat > conftest.$ac_ext <<EOF
-#line 4043 "configure"
+#line 4443 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_header_$ac_safe=${ac_dir}"
 else
   echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
@@ -4057,39 +4457,59 @@
   eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  CPPFLAGS="$gp_save_CPPFLAGS"
+  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
     break
-  else
-    CPPFLAGS="${ac_save_CPPFLAGS}"
   fi
 done
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+fi
+
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != x" && eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != xyes"; then
+    eval "CPPFLAGS=\"$gp_save_CPPFLAGS -I`echo '$ac_cv_header_'$ac_safe`\""
+  fi
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
   echo "$ac_t""yes" 1>&6
   :
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: found png library but not png.h" 1>&2
+     echo "configure: warning: found png library but not png.h" 1>&2
      echo "configure: warning: please add path to png.h to CPPFLAGS in Makefile" 1>&2
     
 fi
-    
+
+    ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
+  ac_tr_hdr=HAVE_`echo zlib.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
 echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:4078: checking for zlib.h" >&5
-ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
-gp_save_CPPFLAGS="$CPPFLAGS"
-for ac_dir in '' /usr/local/include $gp_lib_prefix $gp_lib_prefix/include ; do
-  CPPFLAGS="$gp_save_CPPFLAGS `test x${ac_dir} != x && echo -I${ac_dir}`"
+echo "configure:4489: checking for zlib.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  gp_save_CPPFLAGS="$CPPFLAGS"
+if test "$with_png" != yes && test "$with_png" != no; then
+  gp_h_path=`echo "$with_png" | sed -e 's%/libzlib.h\.a$%%'`
+  gp_h_prfx=`echo "$gp_h_path" | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_h_list="$gp_h_prfx $gp_h_prfx/include $gp_h_path"
+else
+  gp_h_list=''
+fi
+for ac_dir in $gp_h_list '' /usr/local/include ; do
+  test x${ac_dir} != x && CPPFLAGS="$gp_save_CPPFLAGS -I${ac_dir}"
   cat > conftest.$ac_ext <<EOF
-#line 4084 "configure"
+#line 4504 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_header_$ac_safe=${ac_dir}"
 else
   echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
@@ -4098,24 +4518,34 @@
   eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  CPPFLAGS="$gp_save_CPPFLAGS"
+  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
     break
-  else
-    CPPFLAGS="${ac_save_CPPFLAGS}"
   fi
 done
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+fi
+
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != x" && eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != xyes"; then
+    eval "CPPFLAGS=\"$gp_save_CPPFLAGS -I`echo '$ac_cv_header_'$ac_safe`\""
+  fi
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
   echo "$ac_t""yes" 1>&6
   :
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: found z library but not zlib.h" 1>&2
+     echo "configure: warning: found z library but not zlib.h" 1>&2
      echo "configure: warning: please add path to zlib.h to CPPFLAGS in Makefile" 1>&2
     
 fi
-    if test "$ac_cv_header_png_h" = yes; then
+
+    if test "$ac_cv_header_png_h" != no; then
       cat > conftest.$ac_ext <<EOF
-#line 4119 "configure"
+#line 4549 "configure"
 #include "confdefs.h"
 #include "png.h"
 #if PNG_LIBPNG_VER < 89
@@ -4127,102 +4557,41 @@
   egrep "You lose" >/dev/null 2>&1; then
   rm -rf conftest*
          echo "configure: warning: - libpng too old - not including png driver" 1>&2
-else
-  rm -rf conftest*
-         cat >> confdefs.h <<\EOF
-#define HAVE_LIBPNG 1
-EOF
-
+       with_png=no
 fi
 rm -f conftest*
 
     else
       echo "configure: warning: - cannot check png version - compilation may fail" 1>&2
-      cat >> confdefs.h <<\EOF
+    fi
+
+  if test "$with_png" != no; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBPNG 1
 EOF
 
-    fi
+  fi
+
   else
     echo "$ac_t""- see term/png.trm for download details" 1>&6
   fi
 fi
 
-echo $ac_n "checking terminal driver sources""... $ac_c" 1>&6
-echo "configure:4153: checking terminal driver sources" >&5
-( cd $srcdir/term && for i in *.trm ; do echo '${srcdir}'/../term/$i ; done )\
- |(tr '\012' @; echo) |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012' >termlist
-TERM_LIST=termlist
-
-echo "$ac_t""list created" 1>&6
 
 
-
-if test "$enable_apollo" = yes; then
-  cat > conftest.$ac_ext <<EOF
-#line 4164 "configure"
-#include "confdefs.h"
-#ifdef apollo
-     yes
-    #endif
-   
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define APOLLO 1
-EOF
-
-else
-  rm -rf conftest*
-     enable_apollo=no
-fi
-rm -f conftest*
-
-fi
-
-if test "$enable_gpr" = yes; then
-  cat > conftest.$ac_ext <<EOF
-#line 4188 "configure"
-#include "confdefs.h"
-#ifdef apollo 
-     yes
-    #endif
-   
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define APOLLO 1
-EOF
- cat >> confdefs.h <<\EOF
-#define GPR 1
-EOF
-
-else
-  rm -rf conftest*
-     enable_gpr=no
-fi
-rm -f conftest*
-
-fi
-
-if test "$enable_cgi" = yes; then
-  cat > conftest.$ac_ext <<EOF
-#line 4215 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 4584 "configure"
 #include "confdefs.h"
 #ifdef SCO
-     yes
-    #endif
-   
+yes
+#endif
+
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   echo $ac_n "checking for v_opnwk in -lccgi""... $ac_c" 1>&6
-echo "configure:4226: checking for v_opnwk in -lccgi" >&5
+echo "configure:4595: checking for v_opnwk in -lccgi" >&5
 ac_lib_var=`echo ccgi'_'v_opnwk | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4230,7 +4599,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lccgi  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4234 "configure"
+#line 4603 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4241,7 +4610,7 @@
 v_opnwk()
 ; return 0; }
 EOF
-if { (eval echo configure:4245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4256,45 +4625,50 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-        cat >> confdefs.h <<\EOF
+      cat >> confdefs.h <<\EOF
 #define CGI 1
 EOF
-
-      TERMLIBS="$TERMLIBS -lccgi"
+              TERMLIBS="$TERMLIBS -lccgi"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-else
-  rm -rf conftest*
-     enable_cgi=no
 fi
 rm -f conftest*
 
-fi
 
-if test "$enable_iris" = yes; then
-  echo $ac_n "checking for winopen in -lgl_s""... $ac_c" 1>&6
-echo "configure:4279: checking for winopen in -lgl_s" >&5
-ac_lib_var=`echo gl_s'_'winopen | sed 'y%./+-%__p_%'`
+cat > conftest.$ac_ext <<EOF
+#line 4642 "configure"
+#include "confdefs.h"
+#ifdef sun
+yes
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  echo $ac_n "checking for window_create in -lsuntool""... $ac_c" 1>&6
+echo "configure:4653: checking for window_create in -lsuntool" >&5
+ac_lib_var=`echo suntool'_'window_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lgl_s  $LIBS"
+LIBS="-lsuntool     -lsunwindow -lpixrect $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4287 "configure"
+#line 4661 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char winopen();
+char window_create();
 
 int main() {
-winopen()
+window_create()
 ; return 0; }
 EOF
-if { (eval echo configure:4298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4309,40 +4683,80 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-     cat >> confdefs.h <<\EOF
-#define IRIS 1
+      ac_safe=`echo "suntool/sunview.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for suntool/sunview.h""... $ac_c" 1>&6
+echo "configure:4689: checking for suntool/sunview.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 4694 "configure"
+#include "confdefs.h"
+#include <suntool/sunview.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+      cat >> confdefs.h <<\EOF
+#define SUN 1
 EOF
+    TERMLIBS="$TERMLIBS -lsuntool -lsunwindow -lpixrect"
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-   TERMLIBS="$TERMLIBS -lgl_s"
 else
   echo "$ac_t""no" 1>&6
-   enable_iris=no
 fi
 
 fi
+rm -f conftest*
 
-if test "$enable_mgr" = yes; then
-  echo $ac_n "checking for m_getinfo in -lmgr""... $ac_c" 1>&6
-echo "configure:4327: checking for m_getinfo in -lmgr" >&5
-ac_lib_var=`echo mgr'_'m_getinfo | sed 'y%./+-%__p_%'`
+
+
+if test "$with_cdwrc" = no; then
+  cat >> confdefs.h <<\EOF
+#define NOCWDRC 1
+EOF
+
+fi
+
+if test "$enable_iris" = yes; then
+  echo $ac_n "checking for winopen in -lgl_s""... $ac_c" 1>&6
+echo "configure:4741: checking for winopen in -lgl_s" >&5
+ac_lib_var=`echo gl_s'_'winopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lmgr -lpixrect $LIBS"
+LIBS="-lgl_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4335 "configure"
+#line 4749 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char m_getinfo();
+char winopen();
 
 int main() {
-m_getinfo()
+winopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4358,45 +4772,39 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
      cat >> confdefs.h <<\EOF
-#define MGR 1
+#define IRIS 1
 EOF
-   TERMLIBS="$TERMLIBS -lmgr -lpixrect"
+
+   TERMLIBS="$TERMLIBS -lgl_s"
 else
   echo "$ac_t""no" 1>&6
-   enable_mgr=no
+   enable_iris=no
 fi
 
 fi
 
-if test "$enable_rgip" = yes; then
-  cat >> confdefs.h <<\EOF
-#define RGIP 1
-EOF
-
-fi
-
-if test "$enable_sun" = yes; then
-  echo $ac_n "checking for window_create in -lsuntool""... $ac_c" 1>&6
-echo "configure:4381: checking for window_create in -lsuntool" >&5
-ac_lib_var=`echo suntool'_'window_create | sed 'y%./+-%__p_%'`
+if test "$enable_mgr" = yes; then
+  echo $ac_n "checking for m_getinfo in -lmgr""... $ac_c" 1>&6
+echo "configure:4789: checking for m_getinfo in -lmgr" >&5
+ac_lib_var=`echo mgr'_'m_getinfo | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lsuntool -lsunwindow -lpixrect $LIBS"
+LIBS="-lmgr -lpixrect $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4389 "configure"
+#line 4797 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char window_create();
+char m_getinfo();
 
 int main() {
-window_create()
+m_getinfo()
 ; return 0; }
 EOF
-if { (eval echo configure:4400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4412,45 +4820,20 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
      cat >> confdefs.h <<\EOF
-#define SUN 1
-EOF
-   TERMLIBS="$TERMLIBS -lsuntool -lsunwindow -lpixrect"
-else
-  echo "$ac_t""no" 1>&6
-   enable_sun=no
-fi
-
-fi
-
-if test "$enable_unixpc" = yes; then
-  cat > conftest.$ac_ext <<EOF
-#line 4428 "configure"
-#include "confdefs.h"
-/* Not sure about this; definitely
-     * true for gcc */
-    #ifdef unixpc
-     yes
-    #endif
-   
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define UNIXPC 1
+#define MGR 1
 EOF
 
+   TERMLIBS="$TERMLIBS -lmgr -lpixrect"
 else
-  rm -rf conftest*
-     enable_unixpc=no
+  echo "$ac_t""no" 1>&6
+   enable_mgr=no
 fi
-rm -f conftest*
 
 fi
 
-if test "$enable_system_time" = yes; then
+if test "$enable_rgip" = yes; then
   cat >> confdefs.h <<\EOF
-#define USE_SYSTEM_TIME 1
+#define RGIP 1
 EOF
 
 fi
@@ -4463,7 +4846,6 @@
 
 
 
-
 eval gp_datadir=$datadir
 test $gp_datadir = NONE/share && gp_datadir=/usr/local/share
 echo "$ac_t""
@@ -4472,62 +4854,55 @@
   Where is the help file?           $gp_datadir/gnuplot.gih
 " 1>&6
 test "$ac_cv_header_gd_h" = yes && \
-  echo "$ac_t""  Enable generation of GIF files." 1>&6
+  echo "$ac_t""  Enable generation of GIF files" 1>&6
 
 test "$ac_cv_header_zlib_h" = yes && \
-  echo "$ac_t""  Enable generation of PNG files." 1>&6
+  echo "$ac_t""  Enable generation of PNG files" 1>&6
 
 test "$with_cwdrc" = yes && \
-  echo "$ac_t""  Check current directory for .gnuplot file." 1>&6
+  echo "$ac_t""  Check current directory for .gnuplot file" 1>&6
 
-if test "$with_gnu_readline" != no; then
-  echo "$ac_t""  Use GNU readline library." 1>&6
-else
-  test "$with_readline" != no && \
-    echo "$ac_t""  Use included readline." 1>&6
+if test "$with_readline" != no; then
+  if test "$with_readline" != yes; then
+    echo "$ac_t""  Use GNU readline library" 1>&6
+      test -n "$gp_tcap" && echo "$ac_t""    with ${gp_tcap}" 1>&6
+  else
+    echo "$ac_t""  Use builtin minimal readline" 1>&6
+  fi
 fi
 
 if test "$with_plot" = yes; then
-  echo "$ac_t""  Use the Unix plot library." 1>&6
+  echo "$ac_t""  Use the Unix plot library" 1>&6
 elif test "$with_plot" != no; then
-  echo "$ac_t""  Use the GNU plot library." 1>&6
+  echo "$ac_t""  Use the GNU plot library," 1>&6
+  if test x"$ac_cv_header_plotcompat_h" != x && \
+     test "$ac_cv_header_plotcompat_h" != no ; then
+    echo "$ac_t""    version 2.2 or newer" 1>&6
+  else
+    echo "$ac_t""    version 2.1 or older" 1>&6
+  fi
 fi
 
 test "$with_lasergnu" = yes && \
-  echo "$ac_t""  Install lasergnu printer script." 1>&6
-
-test "$with_linux_vga" = yes && \
-  echo "$ac_t""  Use the Linux console driver." 1>&6
-
-test "$enable_apollo" = yes && \
-  echo "$ac_t""  Enable Apollo terminal (resizeable window)." 1>&6
-
-test "$enable_cgi" = yes && \
-  echo "$ac_t""  Enable cgi terminal (SCO)." 1>&6
+  echo "$ac_t""  Install lasergnu printer script" 1>&6
 
-test "$enable_gpr" = yes && \
-  echo "$ac_t""  Enable Apollo terminal (fixed-size window)." 1>&6
+if test "$with_linux_vga" = yes; then
+  echo "$ac_t""  Use the Linux SVGA console driver" 1>&6
+  echo "$ac_t""    SECURITY NOTICE: SVGAlib requires that" 1>&6
+  echo "$ac_t""    gnuplot is installed suid root!" 1>&6
+fi
 
 test "$enable_iris" = yes && \
-  echo "$ac_t""  Enable IRIS terminal." 1>&6
+  echo "$ac_t""  Enable IRIS terminal" 1>&6
 
 test "$enable_mgr" = yes && \
-  echo "$ac_t""  Enable MGR terminal." 1>&6
+  echo "$ac_t""  Enable MGR terminal" 1>&6
 
 test "$enable_rgip" = yes && \
-  echo "$ac_t""  Enable RGIP terminal." 1>&6
-
-test "$enable_sun" = yes && \
-  echo "$ac_t""  Enable sunview terminal." 1>&6
-
-test "$enable_unixpc" = yes && \
-  echo "$ac_t""  Enable unixpc terminal (ATT 3b1 or ATT 7300)." 1>&6
-
-test "$enable_system_time" = yes && \
-  echo "$ac_t""  Use system time routines in time.c." 1>&6
+  echo "$ac_t""  Enable RGIP terminal" 1>&6
 
 test "$no_x" != yes && \
-  echo "$ac_t""  Use the X Window System.
+  echo "$ac_t""  Use the X Window System
 " 1>&6
 
 trap '' 1 2 15
@@ -4673,6 +5048,9 @@
 s%@AUTOMAKE@%$AUTOMAKE%g
 s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
+s%@install_sh@%$install_sh%g
+s%@AMTAR@%$AMTAR%g
+s%@AMTARFLAGS@%$AMTARFLAGS%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
@@ -4685,11 +5063,8 @@
 s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g
 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-/@TERM_LIST@/r $TERM_LIST
-s%@TERM_LIST@%%g
 s%@LASERGNU@%$LASERGNU%g
 s%@LINUXSUID@%$LINUXSUID%g
-s%@NEXTOBJS@%$NEXTOBJS%g
 s%@TERMLIBS@%$TERMLIBS%g
 s%@TERMXLIBS@%$TERMXLIBS%g
 
@@ -4905,7 +5280,7 @@
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 \
-test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h ; rm -f termlist
+test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h
 exit 0
 EOF
 chmod +x $CONFIG_STATUS
diff -urN gnuplot-3.7/configure.in gnuplot-3.7.1/configure.in
--- gnuplot-3.7/configure.in	Tue Jan 12 19:15:48 1999
+++ gnuplot-3.7.1/configure.in	Thu Nov  4 17:21:00 1999
@@ -1,40 +1,27 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl configure.in for gnuplot 3.7 on Unix.
 dnl
-dnl Where possible, please adopt a convention that the absense of
-dnl a macro is the usual case : this saves having to update
-dnl countless makefiles when new tests are added. By usual case
-dnl I guess ansi compiler on posix system or something like that
+dnl $Id: configure.in,v 1.41.2.7 1999/10/22 18:29:24 lhecking Exp $
 dnl
-dnl [Lars: this is no longer necessary. I have cut this stuff out
-dnl  of configure.in and added the necessery definitions to syscfg.h.
-dnl  This reduced the size of configure by 30k!
-dnl
-dnl $Id: configure.in,v 1.90 1998/06/18 14:52:55 ddenholm Exp $
-dnl
-AC_PREREQ(2.13)
-AC_REVISION($Revision: 1.90 $)
 AC_INIT(graphics.c)
+AC_PREREQ(2.13)
+AC_REVISION($Revision: 1.41.2.7 $)
 VERSION=`sed -n 's/.*version.*"\(.*\)".*/\1/p' $srcdir/version.c|tr -d ' '`
-AM_INIT_AUTOMAKE(gnuplot, $VERSION)
+PL=`sed -n 's/.*patchlevel.*"\(.*\)".*/\1/p' $srcdir/version.c|tr -d ' '`
+AM_INIT_AUTOMAKE(gnuplot, $VERSION.$PL)
 AC_CONFIG_HEADER(config.h:config.hin)
 
 dnl Optional features.
 
-dnl Do not use the included readline function
+dnl Use builtin readline or GNU readline
 AC_ARG_WITH(readline,dnl
-[  --with-readline         use the included minimal readline function (default)
-  --without-readline      do not use the included readline function],,
+[  --with-readline         use the builtin minimal readline function (default)
+  --without-readline      do not use the builtin readline function
+  --with-readline=gnu     use the GNU readline library
+  --with-readline=PATH            Specify the location of GNU readline],,
 test -z "$with_readline" && with_readline=yes
 )dnl
 
-dnl The GNU readline library
-AC_ARG_WITH(gnu-readline,dnl
-[  --with-gnu-readline     use the GNU readline library
-  --with-gnu-readline=PATH        Specify the location of GNU readline],,
-test -z "$with_gnu_readline" && with_gnu_readline=no
-)dnl
-
 dnl If no PATH argument given, use the Unix plot library
 dnl Else use either GNU libplot from plotutils,
 dnl or ancient GNU graphics libplot
@@ -63,8 +50,8 @@
 dnl Use .gnuplot file in current directory
 AC_ARG_WITH(cwdrc,dnl
 [  --with-cwdrc            check current directory for .gnuplot file,
-                          normally disabled for security reasons],
-test "$withval" = no && AC_DEFINE(NOCWDRC), AC_DEFINE(NOCWDRC)
+                          normally disabled for security reasons],,
+test -z "$with_cwdrc" && with_cwdrc=no
 )dnl
 
 dnl Install the lasergnu printer script
@@ -76,27 +63,9 @@
 
 dnl The Linux console driver
 AC_ARG_WITH(linux-vga,dnl
-[  --without-linux-vga     do not use the Linux console driver
-                          (requires Linux SVGAlib /usr/lib/libvga)],,
-test -z "$with_linux_vga" && with_linux_vga=yes
-)dnl
-
-dnl Apollo Graphics Primitive Resource
-AC_ARG_ENABLE(apollo,dnl
-[  --enable-apollo         Apollo Graphics Primitive Resource],,
-test -z "$enable_apollo" && enable_apollo=no
-)dnl
-
-dnl Apollo Graphics Primitive Resource (fixed-size window)
-AC_ARG_ENABLE(gpr,dnl
-[  --enable-gpr            Apollo Graphics Primitive Resource (fixed-size window)],,
-test -z "$enable_gpr" && enable_gpr=no
-)dnl
-
-dnl On SCO only: cgi terminal
-AC_ARG_ENABLE(cgi,dnl
-[  --enable-cgi            enable CGI terminal (SCO only)],,
-test -z "$enable_cgi" && enable_cgi=no
+[  --with-linux-vga        use the Linux SVGA console driver
+                          (requires /usr/lib/libvga)],,
+test -z "$with_linux_vga" && with_linux_vga=no
 )dnl
 
 dnl IRIS terminal on IRIS4D series computer
@@ -117,24 +86,6 @@
 test -z "$enable_rgip" && enable_rgip=no
 )dnl
 
-dnl SUNview driver
-AC_ARG_ENABLE(sun,dnl
-[  --enable-sun            enable sunview terminal (Sun only)],,
-test -z "$enable_sun" && enable_sun=no
-)dnl
-
-dnl ATT 3b1 or ATT 7300 unixpc
-AC_ARG_ENABLE(unixpc,dnl
-[  --enable-unixpc         enable unixpc terminal (ATT 3b1 or ATT 7300)],,
-test -z "$enable_unixpc" && enable_unixpc=no
-)dnl
-
-dnl enable system time routines
-AC_ARG_ENABLE(system-time,dnl
-[  --enable-system-time    use the system time routines in time.c],,
-test -z "$enable_system_time" && enable_system_time=no
-)dnl
-
 dnl configure.in body
 
 dnl Compiler characteristics
@@ -162,11 +113,18 @@
 AC_SUBST(X_LIBRARIES)
 AC_SUBST(GNUPLOT_X11)
 AC_PATH_XTRA
+
+dnl Needed for LynxOS until AC_PATH_XTRA is fixed
+if test "$ac_cv_lib_nsl_gethostbyname" = no; then
+  AC_CHECK_LIB(bsd, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd")
+fi
+
 if test "$no_x" != yes; then
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
   X_LIBRARIES="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
   GNUPLOT_X11=gnuplot_x11
-  AC_DEFINE(X11)
+  AC_DEFINE(X11, 1,
+            [ Define if you are using the X11 window system. ])
 fi
 
 
@@ -174,11 +132,17 @@
 dnl FIXME AC_DEFINE(ISC22)
 dnl FIXME AC_DEFINE(KSR)
 dnl Check for MSDOS and djgpp, NeXT
-gp_MSDOS
-gp_NEXT
+GP_MSDOS
+GP_NEXT
 
+dnl Apparently, -lNeXT_s is needed on NeXT
+dnl _instead_ of -lm ...
+AC_CHECK_FUNC(sin)
+if test "$ac_cv_func_sin" = no ; then
+  AC_CHECK_LIB(m,sin)
+fi
 dnl this has to be after -lsys_s on NeXT
-LIBS="$LIBS -lm"
+dnlLIBS="$LIBS -lm"
 
 
 dnl Header files. ANSI first
@@ -207,7 +171,11 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif],
-  errno=0,AC_MSG_RESULT(yes),AC_DEFINE(EXTERN_ERRNO) AC_MSG_RESULT(no))
+  errno=0,AC_MSG_RESULT(yes),dnl
+  AC_DEFINE(EXTERN_ERRNO, 1,
+            [ Define if <errno.h> declares errno. ])
+  AC_MSG_RESULT(no)
+)dnl
 
 
 dnl Types.
@@ -231,11 +199,12 @@
 AC_CHECK_FUNCS(erf erfc gamma lgamma getcwd pclose popen sleep snprintf \
   strncasecmp strnicmp sysinfo tcgetattr)
 if test "$ac_cv_func_pclose" = yes && test "$ac_cv_func_popen" = yes ; then
-  AC_DEFINE(PIPES)
+  AC_DEFINE(PIPES, 1,
+            [ Define if you do have the popen and pclose functions. ])
 fi
 
-dnl arg types for select
-AC_FUNC_SELECT_ARGTYPES
+dnl Argument types of select()
+AC_FUNC_SELECT
 
 dnl On SVR3.
 dnl FIXME AC_DEFINE(CRIPPLED_SELECT)
@@ -244,58 +213,54 @@
 if test "$with_linux_vga" = yes; then
   AC_MSG_CHECKING(for linux vga library)
   AC_CHECK_LIB(vga, vga_init,
-    [AC_DEFINE(LINUXVGA)
+    [AC_DEFINE(LINUXVGA, 1,
+               [ Define if this is a Linux system with SuperVGA library. ])
      LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot'
      TERMLIBS="$TERMLIBS -lvga"],dnl
     with_linux_vga=no)
 fi
 
 dnl GNU readline and the required terminal library
-if test "$with_gnu_readline" != no; then
-  dnl check for terminal library
-  dnl this is a very cool solution from octave's configure.in
-  gp_tcap=""
-  for termlib in ncurses curses termcap terminfo termlib; do
-    AC_CHECK_LIB(${termlib}, tputs, [gp_tcap="${gp_tcap} -l${termlib}"])
-    case "${gp_tcap}" in
-      *-l${termlib}*)
-        AC_MSG_RESULT([using ${gp_tcap} with readline])
-        break
-      ;;
-    esac
-  done
-
-  if test "$with_gnu_readline" = yes; then
-    AC_CHECK_LIB(readline, readline,dnl
-     LIBS="$LIBS -lreadline $gp_tcap"
-     AC_DEFINE(GNU_READLINE)
-     with_readline=no,dnl
-     AC_MSG_ERROR([Can't find -lreadline in a standard path -- specify its location using --with-gnu-readline=/path/to/libreadline.a]),dnl
-     ${gp_tcap})dnl readline
-  else
-    if test ! -f $with_gnu_readline ; then
-      if test ! -f ${with_gnu_readline}/lib/libreadline.a ; then
-        if test ! -f ${with_gnu_readline}/libreadline.a ; then
-          AC_MSG_ERROR([GNU readline library not found])
-        else
-          AC_MSG_RESULT([using ${with_gnu_readline}/libreadline.a])
-          LIBS="$LIBS ${with_gnu_readline}/libreadline.a $gp_tcap"
-        fi
-      else
-        AC_MSG_RESULT([using ${with_gnu_readline}/lib/libreadline.a])
-        LIBS="$LIBS ${with_gnu_readline}/lib/libreadline.a $gp_tcap"
-      fi
+if test "$with_readline" != no; then
+  if test "$with_readline" != yes; then
+    dnl check for terminal library
+    dnl this is a very cool solution from octave's configure.in
+    gp_tcap=""
+    for termlib in ncurses curses termcap terminfo termlib; do
+      AC_CHECK_LIB(${termlib}, tputs, [gp_tcap="$gp_tcap -l$termlib"])
+      case "$gp_tcap" in
+        *-l${termlib}*)
+          break
+        ;;
+      esac
+    done
+
+    if test "$with_readline" = gnu; then
+      AC_CHECK_LIB(readline, readline,dnl
+       TERMLIBS="$TERMLIBS -lreadline $gp_tcap",, ${gp_tcap})
     else
-      AC_MSG_RESULT([using ${with_gnu_readline}])
-      LIBS="$LIBS $with_gnu_readline $gp_tcap"
+      GP_PATH_LIB(readline,readline,[$with_readline],[${gp_tcap}])
+      if test "$ac_cv_lib_readline_readline" != no; then
+        TERMLIBS="$TERMLIBS $gp_tcap"
+      fi
     fi
 
-    AC_DEFINE(GNU_READLINE)
-    with_readline=no
+    if test "$ac_cv_lib_readline_readline" = no; then
+      AC_MSG_WARN([GNU readline not found - falling back to builtin readline])
+      with_readline=yes
+    else
+      AC_DEFINE(HAVE_LIBREADLINE, 1,
+                [ Define if you are using the GNU readline library. ])
+    fi # ! ac_cv_lib_readline_readline = no
+
+  fi # ! with_readline != yes
+
+  if test "$with_readline" = yes; then
+    AC_DEFINE(READLINE, 1,
+              [ Define if you want to use the included readline function. ])
   fi
-fi
 
-test "$with_readline" = yes && AC_DEFINE(READLINE)
+fi
 dnl end readline
 
 dnl libplot
@@ -303,41 +268,59 @@
   if test "$with_plot" = yes; then
     dnl Unix plot library
     AC_CHECK_LIB(plot,openpl,dnl
-     AC_DEFINE(UNIXPLOT)
+     AC_DEFINE(UNIXPLOT, 1,
+               [ Define if you want to use the standard Unix plot library. ])
      TERMLIBS="$TERMLIBS -lplot",dnl
      with_plot=no)
   else
     dnl GNU plot library - test for new version first
     TERMXLIBS="$X_LIBS -lXaw -lXmu -lXt -lXext -lX11"
-    gp_SEARCH_LIBDIRS(plot,textangle,[$TERMXLIBS])
-    if test "$ac_cv_lib_plot_textangle" = no; then
-      TERMXLIBS=
-      gp_SEARCH_LIBDIRS(plot,rotate)
-      if test "$ac_cv_lib_plot_rotate" = no; then
-        AC_MSG_WARN([can't find GNU libplot -- disabling gnugraph terminal])
-        with_plot=no
+    GP_PATH_LIB(plot,pl_textangle,[$with_plot],[$TERMXLIBS])
+    if test "$ac_cv_lib_plot_pl_textangle" = no; then
+      GP_PATH_LIB(plot,textangle,[$with_plot],[$TERMXLIBS])
+      if test "$ac_cv_lib_plot_textangle" = no; then
+        TERMXLIBS=
+        GP_PATH_LIB(plot,rotate,[$with_plot])
+        if test "$ac_cv_lib_plot_rotate" = no; then
+          AC_MSG_WARN([can't find GNU libplot -- disabling gnugraph terminal])
+          with_plot=no
+        else
+          AC_MSG_RESULT([ - using obsolete GNU graphics library])
+        fi # old GNU plotlib
       else
-        AC_MSG_RESULT([ - using obsolete GNU graphics library])
-        AC_DEFINE(GNUGRAPH)
-      fi # old GNU plotlib
+        AC_MSG_RESULT([ - using GNU plotutils library])
+      fi # GNU plotlib pre-2.2
     else
-      AC_MSG_RESULT([ - using GNU plotutils library])
-      AC_DEFINE(GNUGRAPH)
-      AC_DEFINE(GNU_PLOTUTILS)
+      GP_PATH_HEADER(plotcompat.h,[$with_plot],dnl
+        AC_DEFINE(HAVE_PLOTCOMPAT_H, 1,
+                  [ Define if you have the <plotcompat.h> header file. ]),
+        AC_MSG_WARN([found GNU plotutils 2.2+ library but not plotcompat.h])
+        AC_MSG_WARN([please add path to plotcompat.h to CPPFLAGS in Makefile])
+      ) # plotcompat.h
     fi # new GNU plotlib
-  fi # Unix plotlib
+
+    if test "$with_plot" != no; then
+      AC_DEFINE(GNUGRAPH, 1,
+                [ Define if you want to use the GNU version of the Unix plot library. ])
+      AC_DEFINE(GNU_PLOTUTILS, 1,
+                [ Define if your libplot.a is from GNU plotutils. ])
+    fi
+
+  fi # ! Unix plotlib
 fi
-dnl end plot
+dnl end libplot
 
 dnl check for Tom Boutell's gd library
 if test "$with_gd" != no; then
-  gp_SEARCH_LIBDIRS(gd,gdImageCreate)
-  if test "$ac_cv_lib_gd_gdImageCreate" = yes; then
-    gp_SEARCH_HEADERDIRS(gd.h,,
-     AC_MSG_WARN([found gd library but not gd.h])
-     AC_MSG_WARN([please add path to gd.h to CPPFLAGS in Makefile])
-    )dnl gp_SEARCH_HEADERDIRS
-    AC_DEFINE(HAVE_LIBGD)
+  GP_PATH_LIB(gd,gdImageCreate,[$with_gd])
+  if test "$ac_cv_lib_gd_gdImageCreate" != no; then
+    GP_PATH_HEADER(gd.h,[$with_gd],dnl
+      dnl ACTION-IF-FOUND
+      AC_DEFINE(HAVE_LIBGD, 1,
+                [ Define if you have Thomas Boutell's gd library. ]),dnl
+      dnl ACTION-IF-NOT-FOUND
+      AC_MSG_WARN([found gd library but not gd.h])
+      AC_MSG_WARN([please add path to gd.h to CPPFLAGS in Makefile]))
   else
     AC_MSG_RESULT([- see term/gif.trm for download details])
   fi
@@ -346,116 +329,95 @@
 
 dnl check for png and z library
 if test "$with_png" != no; then
-  gp_SEARCH_LIBDIRS(png,png_info_init,[-lz])
-  if test "$ac_cv_lib_png_png_info_init" = yes; then
+  GP_PATH_LIB(png,png_info_init,[$with_png],[-lz])
+  if test "$ac_cv_lib_png_png_info_init" != no; then
     TERMLIBS="$TERMLIBS -lz"
-    gp_SEARCH_HEADERDIRS(png.h,,
+    GP_PATH_HEADER(png.h,[$with_png],,dnl
      AC_MSG_WARN([found png library but not png.h])
      AC_MSG_WARN([please add path to png.h to CPPFLAGS in Makefile])
-    )dnl gp_SEARCH_HEADERIRS
-    gp_SEARCH_HEADERDIRS(zlib.h,,
+    )
+    GP_PATH_HEADER(zlib.h,[$with_png],,dnl
      AC_MSG_WARN([found z library but not zlib.h])
      AC_MSG_WARN([please add path to zlib.h to CPPFLAGS in Makefile])
-    )dnl gp_SEARCH_HEADERDIRS
-    if test "$ac_cv_header_png_h" = yes; then
+    )
+    if test "$ac_cv_header_png_h" != no; then
       AC_EGREP_CPP([You lose], [#include "png.h"
 #if PNG_LIBPNG_VER < 89
 You lose.
 #endif
 ],dnl
-       AC_MSG_WARN([- libpng too old - not including png driver]),dnl
-       AC_DEFINE(HAVE_LIBPNG))
+       AC_MSG_WARN([- libpng too old - not including png driver])
+       with_png=no)
     else
       AC_MSG_WARN([- cannot check png version - compilation may fail])
-      AC_DEFINE(HAVE_LIBPNG)
     fi
+
+  if test "$with_png" != no; then
+    AC_DEFINE(HAVE_LIBPNG, 1,
+              [ Define if you have the png library. ])
+  fi
+
   else
     AC_MSG_RESULT([- see term/png.trm for download details])
   fi
 fi
 dnl end png and z
 
-dnl create list of terminals
-AC_MSG_CHECKING([terminal driver sources])
-( cd $srcdir/term && for i in *.trm ; do echo '${srcdir}'/../term/$i ; done )\
- |(tr '\012' @; echo) |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012' >termlist
-TERM_LIST=termlist
-AC_SUBST_FILE(TERM_LIST)
-AC_MSG_RESULT([list created])
-
 dnl How do we detect the Ultrix X libraries?
 dnl Or is it really a server (run-time) problem?
 dnl FIXME AC_DEFINE(ULTRIX_KLUDGE)
 
-dnl Process enable options
+dnl Removed enable options for these
+dnl Just autodetect
 
-if test "$enable_apollo" = yes; then
-  AC_EGREP_CPP(yes,
-   [#ifdef apollo
-     yes
-    #endif
-   ],AC_DEFINE(APOLLO),dnl
-   enable_apollo=no)
-fi
-
-if test "$enable_gpr" = yes; then
-  AC_EGREP_CPP(yes,
-   [#ifdef apollo 
-     yes
-    #endif
-   ],AC_DEFINE(APOLLO) AC_DEFINE(GPR),dnl
-   enable_gpr=no)
-fi
-
-if test "$enable_cgi" = yes; then
-  AC_EGREP_CPP(yes,
-   [#ifdef SCO
-     yes
-    #endif
-   ],AC_CHECK_LIB(ccgi,v_opnwk,dnl
-      AC_DEFINE(CGI)
-      TERMLIBS="$TERMLIBS -lccgi"),dnl
-   enable_cgi=no)
+dnl SCO cgi
+AC_EGREP_CPP(yes,
+[#ifdef SCO
+yes
+#endif
+],AC_CHECK_LIB(ccgi, v_opnwk,dnl
+    AC_DEFINE(CGI, 1,
+              [ Define if you want to use the CGI terminal under SCO. ])dnl
+              TERMLIBS="$TERMLIBS -lccgi"))
+
+dnl Sun sunview
+AC_EGREP_CPP(yes,
+[#ifdef sun
+yes
+#endif
+], AC_CHECK_LIB(suntool, window_create,dnl
+    AC_CHECK_HEADER(suntool/sunview.h,dnl
+    AC_DEFINE(SUN, 1,
+              [ Define if you want to use the sunview terminal (sun). ])dnl
+    TERMLIBS="$TERMLIBS -lsuntool -lsunwindow -lpixrect"),,dnl
+    [-lsunwindow -lpixrect]))
+
+dnl Process with and enable options
+
+if test "$with_cdwrc" = no; then
+  AC_DEFINE(NOCWDRC, 1,
+            [ Define if you do not want to read .gnuplot in the current directory. ])
 fi
 
 if test "$enable_iris" = yes; then
   AC_CHECK_LIB(gl_s,winopen,dnl
-   AC_DEFINE(IRIS)
+   AC_DEFINE(IRIS, 1,
+             [ Define if you want to use the IRIS terminal on IRIS4D series computers. ])
    TERMLIBS="$TERMLIBS -lgl_s",dnl
    enable_iris=no)
 fi
 
 if test "$enable_mgr" = yes; then
   AC_CHECK_LIB(mgr,m_getinfo,dnl
-   AC_DEFINE(MGR)dnl
+   AC_DEFINE(MGR, 1,
+             [ Define if you want to use the MGR Window system. ])
    TERMLIBS="$TERMLIBS -lmgr -lpixrect",dnl
    enable_mgr=no,[-lpixrect])
 fi
 
 if test "$enable_rgip" = yes; then
-  AC_DEFINE(RGIP)
-fi
-
-if test "$enable_sun" = yes; then
-  AC_CHECK_LIB(suntool,window_create,dnl
-   AC_DEFINE(SUN)dnl
-   TERMLIBS="$TERMLIBS -lsuntool -lsunwindow -lpixrect",dnl
-   enable_sun=no,[-lsunwindow -lpixrect])
-fi
-
-if test "$enable_unixpc" = yes; then
-  AC_EGREP_CPP(yes,
-   [/* Not sure about this; definitely
-     * true for gcc */
-    #ifdef unixpc
-     yes
-    #endif
-   ],AC_DEFINE(UNIXPC),dnl
-   enable_unixpc=no)
-fi
-
-if test "$enable_system_time" = yes; then
-  AC_DEFINE(USE_SYSTEM_TIME)
+  AC_DEFINE(RGIP, 1,
+            [ Define if you want to use the Redwood Graphics Interface Protocol. ])
 fi
 
 dnl Substitute variables
@@ -463,7 +425,6 @@
 AC_SUBST(VERSION)
 AC_SUBST(LASERGNU)
 AC_SUBST(LINUXSUID)
-AC_SUBST(NEXTOBJS)
 AC_SUBST(TERMLIBS)
 AC_SUBST(TERMXLIBS)
 
@@ -477,67 +438,60 @@
   Where is the help file?           $gp_datadir/gnuplot.gih
 ])
 test "$ac_cv_header_gd_h" = yes && \
-  AC_MSG_RESULT([  Enable generation of GIF files.])
+  AC_MSG_RESULT([  Enable generation of GIF files])
 
 test "$ac_cv_header_zlib_h" = yes && \
-  AC_MSG_RESULT([  Enable generation of PNG files.])
+  AC_MSG_RESULT([  Enable generation of PNG files])
 
 test "$with_cwdrc" = yes && \
-  AC_MSG_RESULT([  Check current directory for .gnuplot file.])
+  AC_MSG_RESULT([  Check current directory for .gnuplot file])
 
-if test "$with_gnu_readline" != no; then
-  AC_MSG_RESULT([  Use GNU readline library.])
-else
-  test "$with_readline" != no && \
-    AC_MSG_RESULT([  Use included readline.])
+if test "$with_readline" != no; then
+  if test "$with_readline" != yes; then
+    AC_MSG_RESULT([  Use GNU readline library])
+      test -n "$gp_tcap" && AC_MSG_RESULT([    with ${gp_tcap}])
+  else
+    AC_MSG_RESULT([  Use builtin minimal readline])
+  fi
 fi
 
 if test "$with_plot" = yes; then
-  AC_MSG_RESULT([  Use the Unix plot library.])
+  AC_MSG_RESULT([  Use the Unix plot library])
 elif test "$with_plot" != no; then
-  AC_MSG_RESULT([  Use the GNU plot library.])
+  AC_MSG_RESULT([  Use the GNU plot library,])
+  if test x"$ac_cv_header_plotcompat_h" != x && \
+     test "$ac_cv_header_plotcompat_h" != no ; then
+    AC_MSG_RESULT([    version 2.2 or newer])
+  else
+    AC_MSG_RESULT([    version 2.1 or older])
+  fi
 fi
 
 test "$with_lasergnu" = yes && \
-  AC_MSG_RESULT([  Install lasergnu printer script.])
-
-test "$with_linux_vga" = yes && \
-  AC_MSG_RESULT([  Use the Linux console driver.])
-
-test "$enable_apollo" = yes && \
-  AC_MSG_RESULT([  Enable Apollo terminal (resizeable window).])
+  AC_MSG_RESULT([  Install lasergnu printer script])
 
-test "$enable_cgi" = yes && \
-  AC_MSG_RESULT([  Enable cgi terminal (SCO).])
-
-test "$enable_gpr" = yes && \
-  AC_MSG_RESULT([  Enable Apollo terminal (fixed-size window).])
+if test "$with_linux_vga" = yes; then
+  AC_MSG_RESULT([  Use the Linux SVGA console driver])
+  AC_MSG_RESULT([    SECURITY NOTICE: SVGAlib requires that])
+  AC_MSG_RESULT([    gnuplot is installed suid root!])
+fi
 
 test "$enable_iris" = yes && \
-  AC_MSG_RESULT([  Enable IRIS terminal.])
+  AC_MSG_RESULT([  Enable IRIS terminal])
 
 test "$enable_mgr" = yes && \
-  AC_MSG_RESULT([  Enable MGR terminal.])
+  AC_MSG_RESULT([  Enable MGR terminal])
 
 test "$enable_rgip" = yes && \
-  AC_MSG_RESULT([  Enable RGIP terminal.])
-
-test "$enable_sun" = yes && \
-  AC_MSG_RESULT([  Enable sunview terminal.])
-
-test "$enable_unixpc" = yes && \
-  AC_MSG_RESULT([  Enable unixpc terminal (ATT 3b1 or ATT 7300).])
-
-test "$enable_system_time" = yes && \
-  AC_MSG_RESULT([  Use system time routines in time.c.])
+  AC_MSG_RESULT([  Enable RGIP terminal])
 
 test "$no_x" != yes && \
-  AC_MSG_RESULT([  Use the X Window System.
+  AC_MSG_RESULT([  Use the X Window System
 ])
 dnl end config report
 
 dnl Write Makefiles and configuration header
 AC_OUTPUT([Makefile docs/Makefile docs/latextut/Makefile], \
-[test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h ; rm -f termlist])
+[test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h])
 
 dnl end configure.in
diff -urN gnuplot-3.7/contour.c gnuplot-3.7.1/contour.c
--- gnuplot-3.7/contour.c	Thu Dec  3 22:23:46 1998
+++ gnuplot-3.7.1/contour.c	Thu Dec  3 22:23:46 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: contour.c,v 1.31 1998/04/14 00:15:15 drd Exp $";
+static char *RCSid = "$Id: contour.c,v 1.9 1998/12/03 22:23:46 lhecking Exp $";
 #endif
 
 /* GNUPLOT - contour.c */
diff -urN gnuplot-3.7/corplot.c gnuplot-3.7.1/corplot.c
--- gnuplot-3.7/corplot.c	Wed Oct 28 21:08:12 1998
+++ gnuplot-3.7.1/corplot.c	Wed Oct 28 21:08:12 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: corplot.c,v 1.8 1998/03/22 22:31:27 drd Exp $";
+static char *RCSid = "$Id: corplot.c,v 1.2 1998/10/28 21:08:12 lhecking Exp $";
 #endif
 
 /* GNUPLOT - corplot.c */
diff -urN gnuplot-3.7/ctrl87.c gnuplot-3.7.1/ctrl87.c
--- gnuplot-3.7/ctrl87.c	Wed Apr 15 20:22:16 1998
+++ gnuplot-3.7.1/ctrl87.c	Wed Apr 15 20:22:16 1998
@@ -1,4 +1,4 @@
-/* $Id: ctrl87.c,v 1.2 1998/03/22 22:31:27 drd Exp $ */
+/* $Id: ctrl87.c,v 1.1.1.2 1998/04/15 19:22:16 lhecking Exp $ */
 
 
 /* GNUPLOT - ctrl87.c */
diff -urN gnuplot-3.7/ctrl87.h gnuplot-3.7.1/ctrl87.h
--- gnuplot-3.7/ctrl87.h	Wed Apr 15 20:22:17 1998
+++ gnuplot-3.7.1/ctrl87.h	Wed Apr 15 20:22:17 1998
@@ -1,4 +1,4 @@
-/* $Id: ctrl87.h,v 1.2 1998/03/22 22:31:27 drd Exp $ */
+/* $Id: ctrl87.h,v 1.1.1.2 1998/04/15 19:22:17 lhecking Exp $ */
 
 /* GNUPLOT - ctrl87.h */
 
diff -urN gnuplot-3.7/datafile.c gnuplot-3.7.1/datafile.c
--- gnuplot-3.7/datafile.c	Tue Nov  3 12:46:21 1998
+++ gnuplot-3.7.1/datafile.c	Thu Aug 19 15:41:09 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: datafile.c,v 1.42 1998/04/14 00:15:17 drd Exp $";
+static char *RCSid = "$Id: datafile.c,v 1.11.2.1 1999/08/19 14:41:09 lhecking Exp $";
 #endif
 
 /* GNUPLOT - datafile.c */
@@ -348,12 +348,15 @@
 #endif /* NO_FORTRAN_NUMS */
 	    } else {
 		/* skip any space at start of column */
-		while (isspace((int)*s))
+		/* HBB tells me that the cast must be to
+		 * unsigned char instead of int. */
+		while (isspace((unsigned char) *s))
 		    ++s;
 		count = *s ? 1 : 0;
 		/* skip chars to end of column */
-		for (used = 0; !isspace((int)*s) && (*s != NUL); ++used, ++s)
-		    ;
+		used = 0;
+		while (!isspace((unsigned char) *s) && (*s != NUL))
+		    ++s;
 	    }
 
 	    /* it might be a fortran double or quad precision.
@@ -467,7 +470,8 @@
  */
 
 {
-    static char filename[MAX_LINE_LEN + 1] = "";
+    /* now allocated dynamically */
+    static char *filename = NULL;
     int i;
     int name_token;
 
@@ -516,14 +520,12 @@
     assert(max_using <= NCOL);
 
     /* empty name means re-use last one */
-
-    {
-	char name[MAX_LINE_LEN + 1];
-	quote_str(name, c_token, MAX_LINE_LEN);
-	if (name[0])
-	    strcpy(filename, name);
-	else if (!filename[0])
-	    int_error("No previous filename", c_token);
+    if (isstring(c_token) && token_len(c_token) == 2) {
+	if (!filename || !*filename)
+	    int_error("No previous filename",c_token);
+    } else {
+	filename = gp_realloc(filename, token_len(c_token), "datafile name");
+	quote_str(filename, c_token, token_len(c_token));
     }
     name_token = c_token++;
 
diff -urN gnuplot-3.7/demo/1.dat gnuplot-3.7.1/demo/1.dat
--- gnuplot-3.7/demo/1.dat	Wed Apr 15 20:16:40 1998
+++ gnuplot-3.7.1/demo/1.dat	Wed Apr 15 20:16:40 1998
@@ -1,5 +1,5 @@
 #
-# $Id: 1.dat,v 1.4 1993/09/27 17:10:59 alex Exp $
+# $Id: 1.dat,v 1.1.1.1 1998/04/15 19:16:40 lhecking Exp $
 #
 #
 -20.000000 -3.041676
diff -urN gnuplot-3.7/demo/2.dat gnuplot-3.7.1/demo/2.dat
--- gnuplot-3.7/demo/2.dat	Wed Apr 15 20:16:40 1998
+++ gnuplot-3.7.1/demo/2.dat	Wed Apr 15 20:16:40 1998
@@ -1,5 +1,5 @@
 #
-# $Id: 2.dat,v 1.4 1993/09/27 17:11:02 alex Exp $
+# $Id: 2.dat,v 1.1.1.1 1998/04/15 19:16:40 lhecking Exp $
 #
 #
 -20.000000 -6.083352
diff -urN gnuplot-3.7/demo/3.dat gnuplot-3.7.1/demo/3.dat
--- gnuplot-3.7/demo/3.dat	Wed Apr 15 20:16:40 1998
+++ gnuplot-3.7.1/demo/3.dat	Wed Apr 15 20:16:40 1998
@@ -1,5 +1,5 @@
 #
-# $Id: 3.dat,v 1.4 1993/09/27 17:11:04 alex Exp $
+# $Id: 3.dat,v 1.1.1.1 1998/04/15 19:16:40 lhecking Exp $
 #
 #
 -20.000000 -9.125028
diff -urN gnuplot-3.7/demo/airfoil.dem gnuplot-3.7.1/demo/airfoil.dem
--- gnuplot-3.7/demo/airfoil.dem	Wed Apr 15 20:16:40 1998
+++ gnuplot-3.7.1/demo/airfoil.dem	Mon Oct 11 14:17:35 1999
@@ -1,5 +1,5 @@
 #
-# $Id: airfoil.dem,v 1.3 1993/10/07 16:53:28 alex Exp $
+# $Id: airfoil.dem,v 1.1.1.1.2.1 1999/10/11 13:17:35 lhecking Exp $
 #
 # This demo shows how to use bezier splines to define NACA four
 # series airfoils and complex variables to define Joukowski
@@ -142,7 +142,7 @@
 pause -1 "Press Return"
 set title ""
 set xlab ""
-set key
+set key box
 set parametric
 set samples 100
 set isosamples 10
@@ -165,6 +165,4 @@
 set xlabel "eps = 0.06 + i0.06"
 plot real(eta(t)),imag(eta(t))
 pause -1 "Press Return"
-set title ""
-set xlabel ""
-set notime
+reset
diff -urN gnuplot-3.7/demo/all.dem gnuplot-3.7.1/demo/all.dem
--- gnuplot-3.7/demo/all.dem	Wed Apr 15 20:16:40 1998
+++ gnuplot-3.7.1/demo/all.dem	Wed Apr 15 20:16:40 1998
@@ -1,5 +1,5 @@
 #
-# $Id: all.dem,v 1.8 1996/12/09 15:58:08 drd Exp $
+# $Id: all.dem,v 1.1.1.1 1998/04/15 19:16:40 lhecking Exp $
 #
 # Executes ALL demos in this directory, in functionality order.
 #
diff -urN gnuplot-3.7/demo/animate.dem gnuplot-3.7.1/demo/animate.dem
--- gnuplot-3.7/demo/animate.dem	Wed Apr 22 14:38:39 1998
+++ gnuplot-3.7.1/demo/animate.dem	Mon Oct 11 14:25:39 1999
@@ -20,3 +20,4 @@
 
 iteration_count=0
 load "gnuplot.rot"
+reset
diff -urN gnuplot-3.7/demo/battery.dat gnuplot-3.7.1/demo/battery.dat
--- gnuplot-3.7/demo/battery.dat	Wed Apr 15 20:16:41 1998
+++ gnuplot-3.7.1/demo/battery.dat	Wed Apr 15 20:16:41 1998
@@ -1,5 +1,5 @@
 #
-# $Id: battery.dat,v 1.1 1993/10/07 10:22:22 alex Exp $
+# $Id: battery.dat,v 1.1.1.1 1998/04/15 19:16:41 lhecking Exp $
 #
 50.000000 0.036990 2.500000 0.007039 
 47.000000 0.036990 2.500000 0.007039 
diff -urN gnuplot-3.7/demo/big_peak.dat gnuplot-3.7.1/demo/big_peak.dat
--- gnuplot-3.7/demo/big_peak.dat	Wed Apr 15 20:16:41 1998
+++ gnuplot-3.7.1/demo/big_peak.dat	Wed Apr 15 20:16:41 1998
@@ -1,5 +1,5 @@
 #
-# $Id: big_peak.dat,v 1.1 1993/10/07 10:22:25 alex Exp $
+# $Id: big_peak.dat,v 1.1.1.1 1998/04/15 19:16:41 lhecking Exp $
 #
 26.500000 0.753252 0.012953 
 27.000000 0.877710 0.019712 
diff -urN gnuplot-3.7/demo/binary.dem gnuplot-3.7.1/demo/binary.dem
--- gnuplot-3.7/demo/binary.dem	Wed Apr 15 20:16:41 1998
+++ gnuplot-3.7.1/demo/binary.dem	Mon Oct 11 14:25:24 1999
@@ -1,10 +1,11 @@
 #
-# $Id: binary.dem,v 1.4 1996/09/22 21:10:06 drd Exp $
+# $Id: binary.dem,v 1.1.1.1.2.1 1999/10/11 13:25:24 lhecking Exp $
 #
 set data style lines
 set hidden3d
 set title "Hidden line removal of explicit binary surfaces"
 set ticslevel 0
+set key box
 
 set xrange [-3:3]
 set yrange [-2:2]
diff -urN gnuplot-3.7/demo/bivariat.dem gnuplot-3.7.1/demo/bivariat.dem
--- gnuplot-3.7/demo/bivariat.dem	Wed Apr 15 20:16:41 1998
+++ gnuplot-3.7.1/demo/bivariat.dem	Wed Apr 15 20:16:41 1998
@@ -1,5 +1,5 @@
 #
-# $Id: bivariat.dem,v 1.2 1993/09/27 17:11:14 alex Exp $
+# $Id: bivariat.dem,v 1.1.1.1 1998/04/15 19:16:41 lhecking Exp $
 #
 # This demo is very slow and requires unusually large stack size.
 # Do not attempt to run this demo under MSDOS.
diff -urN gnuplot-3.7/demo/contours.dem gnuplot-3.7.1/demo/contours.dem
--- gnuplot-3.7/demo/contours.dem	Wed Dec  9 15:26:49 1998
+++ gnuplot-3.7.1/demo/contours.dem	Thu Aug 19 15:33:04 1999
@@ -1,5 +1,5 @@
 #
-# $Id: contours.dem,v 1.2 1993/09/27 17:11:16 alex Exp $
+# $Id: contours.dem,v 1.2.2.1 1999/08/19 14:33:04 lhecking Exp $
 #
 set samples 20
 set isosamples 21
@@ -137,7 +137,8 @@
 set logscale z
 set hidden3d
 set isosamples 60
-set view 20,340,1,2
+set ticslevel 0.
+set view 20,340	#HBB: ,1,2
 set xlabel "x"
 set ylabel "y"
 splot [-1.5:1.5] [-0.5:1.5] (1-x)**2 + 100*(y - x**2)**2
diff -urN gnuplot-3.7/demo/controls.dem gnuplot-3.7.1/demo/controls.dem
--- gnuplot-3.7/demo/controls.dem	Wed Apr 15 20:16:41 1998
+++ gnuplot-3.7.1/demo/controls.dem	Mon Oct 11 14:25:20 1999
@@ -1,5 +1,5 @@
 #
-# $Id: controls.dem,v 1.2 1993/09/27 17:11:18 alex Exp $
+# $Id: controls.dem,v 1.1.1.1.2.1 1999/10/11 13:25:20 lhecking Exp $
 #
 # warning:  this demo is SLOW on PCs without math coprocessors!
 #
@@ -17,15 +17,11 @@
 set xrange [0:13]
 set samples 50
 set dummy t
+set key box
 #
 # plot c(t) for several different damping factors s
 #
 plot s=.1,c(t),s=.3,c(t),s=.5,c(t),s=.7,c(t),s=.9,c(t),s=1.0,c(t),s=1.5,c(t),s=2.0,c(t)
 pause -1 "Hit return to continue"
-
-# undo what we have done
-set xrange [-10:10]
-set autoscale xy
-set samples 160
-set dummy x
+reset
 
diff -urN gnuplot-3.7/demo/discrete.dem gnuplot-3.7.1/demo/discrete.dem
--- gnuplot-3.7/demo/discrete.dem	Wed Apr 15 20:16:41 1998
+++ gnuplot-3.7.1/demo/discrete.dem	Wed Apr 15 20:16:41 1998
@@ -1,5 +1,5 @@
 #
-# $Id: discrete.dem,v 1.3 1994/03/30 01:28:36 alex Exp $
+# $Id: discrete.dem,v 1.1.1.1 1998/04/15 19:16:41 lhecking Exp $
 #
 #
 set contour
diff -urN gnuplot-3.7/demo/electron.dem gnuplot-3.7.1/demo/electron.dem
--- gnuplot-3.7/demo/electron.dem	Wed Apr 15 20:16:41 1998
+++ gnuplot-3.7.1/demo/electron.dem	Mon Oct 11 14:25:14 1999
@@ -1,5 +1,5 @@
 #
-# $Id: electron.dem,v 1.4 1996/08/13 21:48:22 drd Exp $
+# $Id: electron.dem,v 1.1.1.1.2.1 1999/10/11 13:25:14 lhecking Exp $
 #
 # Electronics demo
 #
@@ -21,6 +21,7 @@
 set xrange [0 : 0.75]
 set ylabel "Ic (collector current)"
 set yrange [0 : 0.005]
+set key box
 set key .2,.0045
 set format y "%.4f"
 plot Ic(Vbe)
diff -urN gnuplot-3.7/demo/fit.dem gnuplot-3.7.1/demo/fit.dem
--- gnuplot-3.7/demo/fit.dem	Wed Apr 15 20:16:41 1998
+++ gnuplot-3.7.1/demo/fit.dem	Mon Oct 11 14:25:07 1999
@@ -1,5 +1,5 @@
 #
-# $Id: fit.dem,v 1.9 1997/05/27 01:29:34 drd Exp $
+# $Id: fit.dem,v 1.1.1.1.2.1 1999/10/11 13:25:07 lhecking Exp $
 #
 
 print "Some examples how data fitting using nonlinear least squares fit"
@@ -11,6 +11,7 @@
 plot 'lcdemo.dat'
 set xlabel "Temperature T  [deg Cels.]"
 set ylabel "Density [g/cm3]"
+set key below
 
 print "now fitting a straight line to the data :-)"
 print "only as a demo without physical meaning"
@@ -213,3 +214,4 @@
 print  "from time to time!"
 print  ""
 pause -1 "Done with fitting demo  (-> return)"
+reset
diff -urN gnuplot-3.7/demo/glass.dat gnuplot-3.7.1/demo/glass.dat
--- gnuplot-3.7/demo/glass.dat	Wed Apr 15 20:16:41 1998
+++ gnuplot-3.7.1/demo/glass.dat	Wed Apr 15 20:16:41 1998
@@ -1,5 +1,5 @@
 #
-# $Id: glass.dat,v 1.4 1993/09/27 17:11:27 alex Exp $
+# $Id: glass.dat,v 1.1.1.1 1998/04/15 19:16:41 lhecking Exp $
 #
 # 16x16 grid Glass shape. Created Using DRAWFN3D, Gershon Elber 1990.
 #
diff -urN gnuplot-3.7/demo/hidden.dem gnuplot-3.7.1/demo/hidden.dem
--- gnuplot-3.7/demo/hidden.dem	Wed Dec  2 18:35:37 1998
+++ gnuplot-3.7.1/demo/hidden.dem	Mon Oct 11 14:25:02 1999
@@ -1,5 +1,5 @@
 #
-# $Id: hidden.dem,v 1.3 1995/03/27 18:07:39 drd Exp $
+# $Id: hidden.dem,v 1.2.2.1 1999/10/11 13:25:02 lhecking Exp $
 #
 #
 set samples 20
@@ -51,7 +51,7 @@
 splot "glass.dat" using 1
 pause -1 "Hit return to continue (6)"
 
-set view 50,
+set view 50
 set grid
 replot
 pause -1 "Hit return to continue (7)"
diff -urN gnuplot-3.7/demo/mgr.dem gnuplot-3.7.1/demo/mgr.dem
--- gnuplot-3.7/demo/mgr.dem	Mon Dec  7 22:08:02 1998
+++ gnuplot-3.7.1/demo/mgr.dem	Mon Oct 11 14:24:57 1999
@@ -1,10 +1,11 @@
 #
-# $Id: mgr.dem,v 1.4 1997/01/05 22:03:11 drd Exp $
+# $Id: mgr.dem,v 1.2.2.1 1999/10/11 13:24:57 lhecking Exp $
 #
 pause 0 "Watch some  cubic splines"
 set samples 50
 set xlabel "Angle (deg)"
 set ylabel "Amplitude"
+set key box
 set title "Brag-Reflex -- Peak only"
 plot "big_peak.dat" title "Rate" with errorbars, \
                  "" smooth csplines t "Rate"
@@ -71,9 +72,5 @@
 plot [0:50] "battery.dat" u 1:2:3 t "Power" w xerr, n(x) t "Theory" w lines
 pause -1 "Y-Bars only <CR>"
 plot [0:50] "battery.dat" u 1:2:4 t "Power" w yerr, n(x) t "Theory" w lines
-set bars large
-
-set xlabel ""
-set ylabel ""
-set title ""
+reset
 
diff -urN gnuplot-3.7/demo/param.dem gnuplot-3.7.1/demo/param.dem
--- gnuplot-3.7/demo/param.dem	Wed Apr 15 20:16:42 1998
+++ gnuplot-3.7.1/demo/param.dem	Mon Oct 11 14:24:52 1999
@@ -1,5 +1,5 @@
 #
-# $Id: param.dem,v 1.2 1993/09/27 17:11:33 alex Exp $
+# $Id: param.dem,v 1.1.1.1.2.1 1999/10/11 13:24:52 lhecking Exp $
 #
 # Show some of the new parametric capabilities.
 #
@@ -8,6 +8,8 @@
 set autoscale
 set samples 160
 set title ""
+set key box
+set key below
 plot t,sin(t)/t title "t,sin(t)/t or sin(x)/x"
 pause -1 "Hit return to continue"
 
diff -urN gnuplot-3.7/demo/polar.dem gnuplot-3.7.1/demo/polar.dem
--- gnuplot-3.7/demo/polar.dem	Wed Apr 15 20:16:42 1998
+++ gnuplot-3.7.1/demo/polar.dem	Mon Oct 11 14:24:50 1999
@@ -1,5 +1,5 @@
 #
-# $Id: polar.dem,v 1.4 1995/03/27 18:07:43 drd Exp $
+# $Id: polar.dem,v 1.1.1.1.2.1 1999/10/11 13:24:50 lhecking Exp $
 #
 # Show some of the new polar capabilities.
 #
@@ -15,6 +15,7 @@
 plot .5,1,1.5
 pause -1 "Hit return to continue"
 set title ""
+set key box
 
 plot cos(2*t)
 pause -1 "Hit return to continue"
diff -urN gnuplot-3.7/demo/poldat.dem gnuplot-3.7.1/demo/poldat.dem
--- gnuplot-3.7/demo/poldat.dem	Wed Apr 15 20:16:42 1998
+++ gnuplot-3.7.1/demo/poldat.dem	Wed Apr 15 20:16:42 1998
@@ -1,5 +1,5 @@
 #
-# $Id: poldat.dem,v 1.3 1995/04/19 13:16:50 drd Exp $
+# $Id: poldat.dem,v 1.1.1.1 1998/04/15 19:16:42 lhecking Exp $
 #
 #
 set size square
@@ -148,7 +148,7 @@
     180.000      0.000   -200.000      0.000   -200.000      0.000 
 e
 #
-# formerly $Id: poldat.dem,v 1.3 1995/04/19 13:16:50 drd Exp $
+# formerly $Id: poldat.dem,v 1.1.1.1 1998/04/15 19:16:42 lhecking Exp $
 #
 #
    0.000  90.007E-01 -35.926E+00 -71.297E+00  90.783E-01
diff -urN gnuplot-3.7/demo/prob.dem gnuplot-3.7.1/demo/prob.dem
--- gnuplot-3.7/demo/prob.dem	Wed Dec  2 18:35:48 1998
+++ gnuplot-3.7.1/demo/prob.dem	Mon Oct 11 14:24:41 1999
@@ -1,5 +1,5 @@
 #
-# $Id: prob.dem,v 1.4 1996/12/09 15:58:09 drd Exp $
+# $Id: prob.dem,v 1.2.2.1 1999/10/11 13:24:41 lhecking Exp $
 #
 # Demo Statistical Functions version 2.3
 #
@@ -51,7 +51,7 @@
 #xmax = 1.0
 #Mode of beta PDF used
 #ymax = (p < 1.0 || q < 1.0) ? 2.0 : 1.1 * beta((p - 1.0)/(p + q - 2.0))
-set key
+set key right box
 set zeroaxis
 #set xrange [xmin : xmax]
 #set yrange [0 : ymax]
@@ -68,6 +68,7 @@
                  p = 0.5, q = 2.5, beta(x) title "p = 0.5, q = 2.5"
 pause -1 "Hit return to continue"
 set title "incomplete beta CDF"
+set key left box
 plot [0:1] [0:1.1] p = 0.5, q = 0.7, cbeta(x) title "p = 0.5, q = 0.7", \
                    p = 5.0, q = 3.0, cbeta(x) title "p = 5.0, q = 3.0", \
                    p = 0.5, q = 2.5, cbeta(x) title "p = 0.5, q = 2.5"
@@ -109,7 +110,7 @@
 #xmin = a - 4.0 * b
 #xmax = a + 4.0 * b
 #ymax = 1.1 * cauchy(a) #Mode of cauchy PDF used
-set key
+set key left box
 set zeroaxis
 #set xrange [xmin : xmax]
 #set yrange [0 : ymax]
@@ -137,7 +138,7 @@
 #xmin = xmin < 0 ? 0 : xmin
 #xmax = mu + 4.0 * sigma
 #ymax = 1.1 * (df1 > 2.0 ? chi(df1 - 2.0) : 1.0) #Mode of chi PDF used
-set key
+set key right box
 set zeroaxis
 #set xrange [xmin : xmax]
 #set yrange [0 : ymax]
@@ -149,10 +150,12 @@
 set format y "%.2f"
 set sample 100
 set title "chi-square PDF"
+set key right box
 plot [0:15] [0:0.2] df1 = 4, chi(x) title "df = 4", \
                     df1 = 6, chi(x) title "df = 6", \
                     df1 = 8, chi(x) title "df = 8"
 pause -1 "Hit return to continue"
+set key left box
 set title "chi-square CDF"
 plot [0:15] [0:1.1] df1 = 4, cchi(x) title "df = 4", \
                     df1 = 6, cchi(x) title "df = 6", \
@@ -167,7 +170,6 @@
 #xmin = xmin < 0 ? 0 : xmin
 #xmax = mu + 4.0 * sigma
 #ymax = n < 2.0 ? 1.0 : 1.1 * erlang((n - 1.0) / lambda) #Mode of erlang PDF used
-set key
 set zeroaxis
 #set xrange [xmin : xmax]
 #set yrange [0 : ymax]
@@ -179,10 +181,12 @@
 set format y "%.1f"
 set sample 100
 set title "erlang PDF"
+set key right box
 plot [0:10] [0:1] lambda = 1, n = 2, erlang(x) title "lambda = 1, n = 2", \
                   lambda = 2, n = 2, erlang(x) title "lambda = 2, n = 2"
 pause -1 "Hit return to continue"
 set title "erlang CDF"
+set key left box
 plot [0:10] [0:1.1] lambda = 1, n = 2, cerlang(x) title "lambda = 1, n = 2", \
                     lambda = 2, n = 2, cerlang(x) title "lambda = 2, n = 2"
 pause -1 "Hit return to continue"
@@ -195,7 +199,6 @@
 #xmin = mu - 4.0 * sigma
 #xmax = mu + 4.0 * sigma
 #ymax = 1.1 * extreme(u) #Mode of extreme PDF used
-set key
 set zeroaxis
 #set xrange [xmin : xmax]
 #set yrange [0 : ymax]
@@ -207,10 +210,12 @@
 set format y "%.2f"
 set sample 100
 set title "extreme PDF"
+set key left box
 plot [-10:10] [0:0.4] alpha = 0.5, u = 1.0, extreme(x) title "alpha = 0.5, u = 1.0", \
                       alpha = 1.0, u = 0.0, extreme(x) title "alpha = 1.0, u = 0.0"
 pause -1 "Hit return to continue"
 set title "extreme CDF"
+set key left box
 plot [-10:10] [0:1.1] alpha = 0.5, u = 1.0, cextreme(x) title "alpha = 0.5, u = 1.0", \
                       alpha = 1.0, u = 0.0, cextreme(x) title "alpha = 1.0, u = 0.0"
 pause -1 "Hit return to continue"
@@ -224,7 +229,6 @@
 #xmax = mu + 4.0 * sigma
 #Mode of F PDF used
 #ymax = df1 < 3.0 ? 1.0 : 1.1 * f((df1 / 2.0 - 1.0) / (df1 / 2.0 + df1 / df2))
-set key
 set zeroaxis
 #set xrange [xmin : xmax]
 #set yrange [0 : ymax]
@@ -236,10 +240,12 @@
 set format y "%.2f"
 set sample 100
 set title "F PDF"
+set key right box
 plot [0:4] [0:0.8] df1 = 5.0, df2 = 9.0, f(x) title "df1 = 5, df2 = 9", \
                    df1 = 7.0, df2 = 6.0, f(x) title "df1 = 7, df2 = 6"
 pause -1 "Hit return to continue"
 set title "F CDF"
+set key left box
 plot [0:4] [0:1.1] df1 = 5.0, df2 = 9.0, cf(x) title "df1 = 5, df2 = 9", \
                    df1 = 7.0, df2 = 6.0, cf(x) title "df1 = 7, df2 = 6"
 pause -1 "Hit return to continue"
@@ -252,7 +258,6 @@
 #xmin = xmin < 0 ? 0 : xmin
 #xmax = mu + 4.0 * sigma
 #ymax = rho < 1.0 ? 2.0 : 1.1 * g((rho - 1.0) / lambda) #Mode of gamma pdf used
-set key
 set zeroaxis
 #set xrange [xmin: xmax]
 #set yrange [0: ymax]
@@ -264,11 +269,13 @@
 set format y "%.1f"
 set sample 100
 set title "gamma PDF"
+set key right
 plot [0:5] [0:1.5] rho = 0.5, lambda = 1.0, g(x) title "rho = 0.5, lambda = 1.0", \
                    rho = 1.0, lambda = 1.0, g(x) title "rho = 1.0, lambda = 1.0", \
                    rho = 2.0, lambda = 2.0, g(x) title "rho = 2.0, lambda = 2.0"
 pause -1 "Hit return to continue"
 set title "incomplete gamma CDF (lambda == 1.0)"
+set key right bottom
 plot [0:5] [0:1.1] rho = 0.5, cgamma(x) title "rho = 0.5", \
                    rho = 1.0, cgamma(x) title "rho = 1.0", \
                    rho = 2.0, cgamma(x) title "rho = 2.0"
@@ -450,7 +457,6 @@
 #xmin = xmin < 0 ? 0 : xmin
 #xmax = mu + 4.0 * sigma
 #ymax = 1.1 * maxwell(1.0 / a) #Mode of maxwell PDF used
-set key
 set zeroaxis
 #set xrange[xmin: xmax]
 #set yrange[0: ymax]
@@ -462,11 +468,13 @@
 set format y "%.1f"
 set sample 100
 set title "maxwell PDF"
+set key right top box
 plot [0:6] [0:1.4] a = 1.5, maxwell(x) title "a = 1.5", \
                    a = 1.0, maxwell(x) title "a = 1.0", \
                    a = 0.5, maxwell(x) title "a = 0.5"
 pause -1 "Hit return to continue"
 set title "maxwell CDF"
+set key right bottom box
 plot [0:6] [0:1.1] a = 1.5, cmaxwell(x) title "a = 1.5", \
                    a = 1.0, cmaxwell(x) title "a = 1.0", \
                    a = 0.5, cmaxwell(x) title "a = 0.5"
@@ -532,7 +540,6 @@
 #xmin = mu - 4.0 * sigma
 #xmax = mu + 4.0 * sigma
 #ymax = 1.1 * normal(mu) #Mode of normal PDF used
-set key
 set zeroaxis
 #set xrange [xmin: xmax]
 #set yrange [0: ymax]
@@ -544,11 +551,13 @@
 set format y "%.1f"
 set sample 100
 set title "normal (also called gauss or bell-curved) PDF"
+set key left top box
 plot [-4:4] [0:1] mu = 0, sigma = 1.0, normal(x) title "mu = 0, sigma = 1.0", \
                   mu = 2, sigma = 0.5, normal(x) title "mu = 2, sigma = 0.5", \
                   mu = 1, sigma = 2.0, normal(x) title "mu = 1, sigma = 2.0"
 pause -1 "Hit return to continue"
 set title "normal (also called gauss or bell-curved) CDF"
+set key left top box
 plot [-4:4] [0:1.1] mu = 0, sigma = 1.0, cnormal(x) title "mu = 0, sigma = 1.0", \
                     mu = 2, sigma = 0.5, cnormal(x) title "mu = 2, sigma = 0.5", \
                     mu = 1, sigma = 2.0, cnormal(x) title "mu = 1, sigma = 2.0"
@@ -642,7 +651,6 @@
 #xmin = 0.0
 #xmax = a
 #ymax = 1.1 * 2.0 / a #Mode of sine PDF used
-set key
 set zeroaxis
 #set xrange [xmin: xmax]
 #set yrange [0: ymax]
@@ -654,10 +662,12 @@
 set format y "%.1f"
 set sample 100
 set title "sine PDF"
+set key bottom outside
 plot [0:2] [0:1.1] a = 2.0, n = 1, sine(x) title "a = 2.0, n = 1", \
                    a = 2.0, n = 3, sine(x) title "a = 2.0, n = 3"
 pause -1 "Hit return to continue"
 set title "sine CDF"
+set key top left
 plot [0:2] [0:1.1] a = 2.0, n = 1, csine(x) title "a = 2.0, n = 1", \
                    a = 2.0, n = 3, csine(x) title "a = 2.0, n = 3"
 pause -1 "Hit return to continue"
@@ -773,3 +783,4 @@
                    lambda = 1, n = 1.0, cweibull(x) title "lambda = 1, n = 1.0", \
                    lambda = 1, n = 2.0, cweibull(x) title "lambda = 1, n = 2.0", \
                    lambda = 3, n = 2.0, cweibull(x) title "lambda = 3, n = 2.0"
+reset
diff -urN gnuplot-3.7/demo/prob2.dem gnuplot-3.7.1/demo/prob2.dem
--- gnuplot-3.7/demo/prob2.dem	Wed Apr 15 20:16:42 1998
+++ gnuplot-3.7.1/demo/prob2.dem	Mon Oct 11 14:24:36 1999
@@ -1,5 +1,5 @@
 #
-# $Id: prob2.dem,v 1.3 1994/03/30 01:28:45 alex Exp $
+# $Id: prob2.dem,v 1.1.1.1.2.1 1999/10/11 13:24:36 lhecking Exp $
 #
 # Demo Statistical Approximations version 1.1
 #
@@ -45,7 +45,7 @@
 ymax = 1.1 * binom(mu) #mode of binomial PDF used
 xinc = ceil((xmax - xmin) / 10)
 xinc = xinc > 1 ? xinc : 1
-set key
+set key box
 set nozeroaxis
 set xrange [xmin - 1 : xmax + 1]
 set yrange [0 : ymax]
@@ -77,7 +77,7 @@
 ymax = 1.1 * binom(mu) #mode of binomial PDF used
 xinc = ceil((xmax - xmin) / 10)
 xinc = xinc > 1 ? xinc : 1
-set key
+set key box
 set nozeroaxis
 set xrange [xmin - 1 : xmax + 1]
 set yrange [0 : ymax]
@@ -111,7 +111,7 @@
 xinc = ceil((xmax - xmin) / 10)
 xinc = xinc > 1 ? xinc : 1
 ymax = 1.1 * p
-set key
+set key box
 set nozeroaxis
 set xrange [xmin - 1 : xmax + 1]
 set yrange [0 : ymax]
@@ -143,7 +143,7 @@
 xinc = ceil((xmax - xmin) / 10)
 xinc = xinc > 1 ? xinc : 1
 ymax = 1.1 * p
-set key
+set key box
 set nozeroaxis
 set xrange [xmin - 1 : xmax + 1]
 set yrange [0 : ymax]
@@ -176,7 +176,7 @@
 xinc = ceil((xmax - xmin) / 10)
 xinc = xinc > 1 ? xinc : 1
 ymax = 1.1 * hypgeo(mu) #mode of binom PDF used
-set key
+set key box
 set nozeroaxis
 set xrange [xmin - 1 : xmax + 1]
 set yrange [0 : ymax]
@@ -209,7 +209,7 @@
 xinc = ceil((xmax - xmin) / 10)
 xinc = xinc > 1 ? xinc : 1
 ymax = 1.1 * hypgeo(mu) #mode of binom PDF used
-set key
+set key box
 set nozeroaxis
 set xrange [xmin - 1 : xmax + 1]
 set yrange [0 : ymax]
@@ -243,7 +243,7 @@
 xinc = ceil((xmax - xmin) / 10)
 xinc = xinc > 1 ? xinc : 1
 ymax = 1.1 * g((rho - 1) / lambda) #mode of gamma PDF used
-set key
+set key box
 set nozeroaxis
 set xrange [xmin - 1 : xmax + 1]
 set yrange [0 : ymax]
@@ -275,7 +275,7 @@
 xinc = ceil((xmax - xmin) / 10)
 xinc = xinc > 1 ? xinc : 1
 ymax = 1.1 * negbin(mu - 1/p) #mode of gamma PDF used
-set key
+set key box
 set nozeroaxis
 set xrange [xmin - 1 : xmax + 1]
 set yrange [0 : ymax]
@@ -304,7 +304,7 @@
 xmin = mu - 4.0 * sigma
 xmax = mu + 4.0 * sigma
 ymax = 1.1 * logistic(mu) #mode of logistic PDF used
-set key
+set key box
 set nozeroaxis
 set xrange [xmin: xmax]
 set yrange [0 : ymax]
@@ -335,7 +335,7 @@
 xinc = ceil((xmax - xmin) / 10)
 xinc = xinc > 1 ? xinc : 1
 ymax = 1.1 * poisson(mu) #mode of poisson PDF used
-set key
+set key box
 set nozeroaxis
 set xrange [xmin - 1 : xmax + 1]
 set yrange [0 : ymax]
@@ -353,5 +353,5 @@
 set label "mu" at mu + 1, ymax / 10
 set label "sigma" at mu + 1 + sigma, normal(mu + sigma)
 plot poisson(x), normal(x - 0.5)
-set noarrow
-set nolabel
+reset
+
diff -urN gnuplot-3.7/demo/random.dem gnuplot-3.7.1/demo/random.dem
--- gnuplot-3.7/demo/random.dem	Wed Apr 15 20:16:42 1998
+++ gnuplot-3.7.1/demo/random.dem	Wed Apr 15 20:16:42 1998
@@ -1,5 +1,5 @@
 #
-# $Id: random.dem,v 1.3 1994/03/30 01:28:47 alex Exp $
+# $Id: random.dem,v 1.1.1.1 1998/04/15 19:16:42 lhecking Exp $
 #
 # random.dem
 #
diff -urN gnuplot-3.7/demo/scatter.dem gnuplot-3.7.1/demo/scatter.dem
--- gnuplot-3.7/demo/scatter.dem	Wed Apr 15 20:16:42 1998
+++ gnuplot-3.7.1/demo/scatter.dem	Mon Oct 11 14:24:27 1999
@@ -10,6 +10,7 @@
 set parametric
 set data style points
 set xlabel "data style point - no dgrid"
+set key box
 splot "hemisphr.dat"
 pause -1 "Hit return to continue (1)"
 
@@ -42,6 +43,7 @@
 splot "scatter2.dat"
 pause -1 "Hit return to continue (6)"
 
+set key nobox
 set dgrid3d ,,1
 set xlabel "data style lines, dgrid3d ,,1"
 set data style lines
@@ -53,9 +55,5 @@
 set data style lines
 splot "scatter2.dat"
 pause -1 "Hit return to continue (8)"
+reset
 
-set noparametric
-set nodgrid3d
-set nocontour
-set title ""
-set xlabel ""
diff -urN gnuplot-3.7/demo/silver.dat gnuplot-3.7.1/demo/silver.dat
--- gnuplot-3.7/demo/silver.dat	Wed Apr 15 20:16:42 1998
+++ gnuplot-3.7.1/demo/silver.dat	Wed Apr 15 20:16:42 1998
@@ -1,5 +1,5 @@
 #
-# $Id: silver.dat,v 1.1 1993/10/07 10:22:29 alex Exp $
+# $Id: silver.dat,v 1.1.1.1 1998/04/15 19:16:42 lhecking Exp $
 #
 10.000000 280.000000 16.733201 
 20.000000 191.000000 13.820275 
diff -urN gnuplot-3.7/demo/simple.dem gnuplot-3.7.1/demo/simple.dem
--- gnuplot-3.7/demo/simple.dem	Wed Apr 15 20:16:42 1998
+++ gnuplot-3.7.1/demo/simple.dem	Mon Oct 11 14:24:20 1999
@@ -1,19 +1,22 @@
 #
-# $Id: simple.dem,v 1.2 1993/09/27 17:11:48 alex Exp $
+# $Id: simple.dem,v 1.1.1.1.2.1 1999/10/11 13:24:20 lhecking Exp $
 #
 # Requires data files "[123].dat" from this directory,
 # so change current working directory to this directory before running.
 # gnuplot> set term <term-type>
 # gnuplot> load 'simple.dem'
 #
+set key left box
 set samples 50
 plot [-10:10] sin(x),atan(x),cos(atan(x))
 pause -1 "Hit return to continue"
 
+set key right nobox
 set samples 100
 plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1))
 pause -1 "Hit return to continue"
 
+set key left box
 set samples 200
 plot [-3:5] asin(x),acos(x)
 pause -1 "Hit return to continue"
@@ -25,9 +28,11 @@
 plot [-10:10] real(sin(x)**besj0(x))
 pause -1 "Hit return to continue"
 
+set key outside below
 plot [-5*pi:5*pi] [-5:5] real(tan(x)/atan(x)), 1/x
 pause -1 "Hit return to continue"
 
+set key left box
 set autoscale
 set samples 800
 plot [-30:20] sin(x*20)*atan(x)
@@ -38,8 +43,5 @@
 f(x) = x/100
 plot [-19:19] '1.dat'with impulses ,'2.dat' thru f(x) ,'3.dat' with lines
 pause -1 "Hit return to continue"
+reset
 
-# undo what we have done above
-set samples 160
-set xrange [-10:10]
-set autoscale xy
diff -urN gnuplot-3.7/demo/singulr.dem gnuplot-3.7.1/demo/singulr.dem
--- gnuplot-3.7/demo/singulr.dem	Wed Apr 15 20:16:42 1998
+++ gnuplot-3.7.1/demo/singulr.dem	Thu Aug 19 15:35:07 1999
@@ -1,4 +1,4 @@
-# $Id: singulr.dem,v 1.3 1995/12/11 23:14:19 drd Exp $
+# $Id: singulr.dem,v 1.1.1.1.2.2 1999/08/19 14:35:07 lhecking Exp $
 #
 # Demo that plots some surfaces with singularities.
 # Author: Carsten Steger
@@ -159,9 +159,9 @@
 set xrange [-12:12]
 set yrange [-12:12]
 set zrange [*:*]
-set ticslevel 0.5
 set nohidden3d
-set view 50,15,1,1.7
+set ticslevel 0.
+set view 50,15	#HBB: ,1,1.7
 set title "Klein bottle, glassblowers' version (look-through)"
 splot "klein.dat"
 pause -1 "Hit return to continue (19)"
diff -urN gnuplot-3.7/demo/spline.dem gnuplot-3.7.1/demo/spline.dem
--- gnuplot-3.7/demo/spline.dem	Wed Apr 15 20:16:43 1998
+++ gnuplot-3.7.1/demo/spline.dem	Mon Oct 11 14:24:09 1999
@@ -1,5 +1,5 @@
 #
-# $Id: spline.dem,v 1.3 1997/04/05 19:44:48 drd Exp $
+# $Id: spline.dem,v 1.1.1.1.2.1 1999/10/11 13:24:09 lhecking Exp $
 #
 # Some curve plotting using common cubic polynomial basis function for cagd.
 #
@@ -7,6 +7,7 @@
 #
 set xrang [0:1]
 set grid
+set key box
 
 set yrange[-0.2:1.4]
 m0(x) = 1
@@ -90,9 +91,4 @@
 plot cub_hermit_x1(t), cub_hermit_y1(t) with lines 2,\
      cub_hermit_x2(t), cub_hermit_y2(t) with lines 3
 pause -1 "Press return to continue"
-
-set noparametric
-set noarrow
-set auto
-set nogrid
-set title ""
+reset
diff -urN gnuplot-3.7/demo/stat.inc gnuplot-3.7.1/demo/stat.inc
--- gnuplot-3.7/demo/stat.inc	Wed Apr 22 14:38:51 1998
+++ gnuplot-3.7.1/demo/stat.inc	Wed Apr 22 14:38:51 1998
@@ -1,5 +1,5 @@
 #
-# $Id: stat.inc,v 1.3 1998/04/14 00:16:54 drd Exp $
+# $Id: stat.inc,v 1.1.1.2 1998/04/22 13:38:51 lhecking Exp $
 #
 # Library of Statistical Functions version 3.0
 #
diff -urN gnuplot-3.7/demo/steps.dem gnuplot-3.7.1/demo/steps.dem
--- gnuplot-3.7/demo/steps.dem	Wed Apr 15 20:16:43 1998
+++ gnuplot-3.7.1/demo/steps.dem	Mon Oct 11 14:24:04 1999
@@ -21,4 +21,5 @@
 set title "Inverse Normal Distribution Function"
 plot [0:1] invnorm(x)
 
-set title ""
+pause -1 "Press return to continue"
+reset
diff -urN gnuplot-3.7/demo/surface1.dem gnuplot-3.7.1/demo/surface1.dem
--- gnuplot-3.7/demo/surface1.dem	Wed Dec  9 15:26:57 1998
+++ gnuplot-3.7.1/demo/surface1.dem	Mon Oct 11 14:23:57 1999
@@ -1,5 +1,5 @@
 #
-# $Id: surface1.dem,v 1.5 1995/04/21 12:49:06 drd Exp $
+# $Id: surface1.dem,v 1.3.2.1 1999/10/11 13:23:57 lhecking Exp $
 #
 set samples 21
 set isosample 11
@@ -130,19 +130,6 @@
 mand(z,a,n) = n<=0 || abs(z)>100 ? 1:mand(z*z+a,a,n-1)+1
 splot [-2:1][-1.5:1.5] mand({0,0},compl(x,y),30)     
 pause -1 "Hit return to continue (21)"
+reset
 # TANAKA Masaki  (Tokyo Institute of technology)
 #                 masaki@isea.is.titech.ac.jp
-
-#
-# Clean up:
-#
-set samples 100
-set isosamples 10
-set xrange [-10:10]
-set yrange [-10:10]
-set zrange [-10:10]
-set auto
-set xlabel "" 0,0
-set ylabel "" 0,0
-set zlabel "" 0,0
-set nohidden
diff -urN gnuplot-3.7/demo/surface2.dem gnuplot-3.7.1/demo/surface2.dem
--- gnuplot-3.7/demo/surface2.dem	Wed Dec  2 18:36:01 1998
+++ gnuplot-3.7.1/demo/surface2.dem	Mon Oct 11 14:23:53 1999
@@ -1,24 +1,26 @@
 #
-# $Id: surface2.dem,v 1.4 1997/04/05 19:44:49 drd Exp $
+# $Id: surface2.dem,v 1.2.2.2 1999/10/11 13:23:53 lhecking Exp $
 #
 set parametric
 set isosamples 50,10
 set hidden
+set key below
 
 set title "Parametric Sphere"
 set urange [-pi/2:pi/2]
 set vrange [0:2*pi]
-set zrange [-1:1]
 set ztics nomirror -1.0,0.25,1.0
-set view 45,50,,2.5
+set view 45,50
 splot cos(u)*cos(v),cos(u)*sin(v),sin(u)
 pause -1 "Hit return to continue (1)"
 
-set view ,,,0.8
+set view ,,,0.7
+set title "Parametric Sphere, crunched z axis"
 replot
 pause -1 "Hit return to continue (2)"
 
-set view ,,,1.6
+set view ,,,1.4
+set title "Parametric Sphere, enlarged z axis"
 replot
 pause -1 "Hit return to continue (3)"
 
@@ -27,22 +29,22 @@
 set title "Parametric Torus"
 set urange [0:2*pi]
 set vrange [0:2*pi]
+set zrange [-1:1]        # imitate old 'set view' hack
 splot (1-0.2*cos(v))*cos(u),(1-0.2*cos(v))*sin(u),0.2*sin(v)
 pause -1 "Hit return to continue (4)"
 
 
-set view ,,,2.0
-
 set title "Parametric Hexagon"
 set urange [-1.3:1.3]
 set vrange [0:2*pi]
-set zrange [-0.6:0.6]
-set zrange [-1:1]
+set autoscale z
+set ticslevel 0.	# reserve more space z direction.
+set view ,,0.7,1.4	# crunch xyz, and re-extend z back to full size
 set ztics autofreq
 splot cos(v)**3*cos(u)**3,sin(v)**3*cos(u)**3,sin(u)**3
 pause -1 "Hit return to continue (5)"
 
-set view ,,,1.5
+set view ,,1.,1.
 
 set title "Parametric Helix"
 set isosamples 100,20
@@ -52,9 +54,8 @@
 splot (1-0.1*cos(v))*cos(u),(1-0.1*cos(v))*sin(u),0.1*(sin(v)+u/1.7-10)
 pause -1 "Hit return to continue (6)"
 
-set view ,,,1.0
 
-set title "Parametric Shell (cut by hidden3d)"
+set title "Parametric Shell (clipped to limited z range)"
 set isosamples 40,20
 set view 50,30,1.0
 set urange [0:2*pi]
@@ -64,7 +65,7 @@
 pause -1 "Hit return to continue (7)"
 
 set autoscale z
-set title "Parametric Shell"
+set title "Parametric Shell (automatic z range)"
 replot
 pause -1 "Hit return to continue (8)"
 
@@ -73,19 +74,11 @@
 set urange [-pi:pi]
 set vrange [-pi:pi]
 set isosamples 50,20
-splot cos(u)+.5*cos(u)*cos(v),sin(u)+.5*sin(u)*cos(v),.5*sin(v) with lines, 1+cos(u)+.5*cos(u)*cos(v),.5*sin(v),sin(u)+.5*sin(u)*cos(v) with lines
+splot cos(u)+.5*cos(u)*cos(v),sin(u)+.5*sin(u)*cos(v),.5*sin(v) with lines, \
+      1+cos(u)+.5*cos(u)*cos(v),.5*sin(v),sin(u)+.5*sin(u)*cos(v) with lines
 pause -1 "Hit return to continue (9)"
 
 #
 # Clean up:
 #
-set noparametric
-set dummy x,y
-set isosamples 10,10
-set view 60,30,1,1
-set urange [-5:5]
-set vrange [-5:5]
-set zrange [-10:10]
-set auto
-set title "" 0,0
-set nohidden
+reset
diff -urN gnuplot-3.7/demo/timedat.dem gnuplot-3.7.1/demo/timedat.dem
--- gnuplot-3.7/demo/timedat.dem	Wed Apr 15 20:16:43 1998
+++ gnuplot-3.7.1/demo/timedat.dem	Mon Oct 11 14:23:45 1999
@@ -13,4 +13,5 @@
 , 'timedat.dat' using 1:3 t 'Total P' with points \
 , 'timedat.dat' using 1:4 t '' \
 , 'timedat.dat' using 1:4 t 'PO4' with points 
-pause -1 'Tast <Return> '
+pause -1 'Test <Return> '
+reset
diff -urN gnuplot-3.7/demo/using.dat gnuplot-3.7.1/demo/using.dat
--- gnuplot-3.7/demo/using.dat	Wed Apr 15 20:16:43 1998
+++ gnuplot-3.7.1/demo/using.dat	Wed Apr 15 20:16:43 1998
@@ -1,5 +1,5 @@
 #
-# $Id: using.dat,v 1.4 1993/09/27 17:12:00 alex Exp $
+# $Id: using.dat,v 1.1.1.1 1998/04/15 19:16:43 lhecking Exp $
 #
 #
 891101 00   1.00  14   8.6  94.0
diff -urN gnuplot-3.7/demo/using.dem gnuplot-3.7.1/demo/using.dem
--- gnuplot-3.7/demo/using.dem	Wed Dec  2 18:36:13 1998
+++ gnuplot-3.7.1/demo/using.dem	Mon Oct 11 14:23:35 1999
@@ -1,11 +1,12 @@
 #
-# $Id: using.dem,v 1.2 1993/09/27 17:12:02 alex Exp $
+# $Id: using.dem,v 1.2.2.1 1999/10/11 13:23:35 lhecking Exp $
 #
 # Requires data file "using.dat" from this directory,
 # so change current working directory to this directory before running.
 #
 
 set title "Convex     November 1-7 1989    Circadian"
+set key left box
 set xrange[-1:24]
 plot 'using.dat' using 2:4 title "Logged in" with impulses,\
      'using.dat' using 2:4 title "Logged in" with points
@@ -14,14 +15,12 @@
 set xrange [1:8]
 #set xdtic
 set title "Convex     November 1-7 1989"
+set key below
 set label "(Weekend)" at 5,25 center
 plot 'using.dat' using 3:4 title "Logged in" with impulses,\
      'using.dat' using 3:5 t "Load average" with points,\
      'using.dat' using 3:6 t "%CPU used" with lines
 set nolabel
 pause -1 "Hit return to continue"
+reset
 
-# undo what we have done above
-set title
-set autoscale x
-#set xtics autofreq
diff -urN gnuplot-3.7/demo/world.cor gnuplot-3.7.1/demo/world.cor
--- gnuplot-3.7/demo/world.cor	Wed Apr 15 20:16:43 1998
+++ gnuplot-3.7.1/demo/world.cor	Wed Apr 15 20:16:43 1998
@@ -1,5 +1,5 @@
 #
-# $Id: world.cor,v 1.4 1993/09/27 17:12:03 alex Exp $
+# $Id: world.cor,v 1.1.1.1 1998/04/15 19:16:43 lhecking Exp $
 #
 # Gnuplot world correspondences.  Feel free to check for and update
 # your site; especially if it represents a new location or you
diff -urN gnuplot-3.7/demo/world.dat gnuplot-3.7.1/demo/world.dat
--- gnuplot-3.7/demo/world.dat	Wed Apr 15 20:16:43 1998
+++ gnuplot-3.7.1/demo/world.dat	Wed Apr 15 20:16:43 1998
@@ -1,5 +1,5 @@
 #
-# $Id: world.dat,v 1.4 1993/09/27 17:12:06 alex Exp $
+# $Id: world.dat,v 1.1.1.1 1998/04/15 19:16:43 lhecking Exp $
 #
 #
 -140.37  60.25
diff -urN gnuplot-3.7/demo/world.dem gnuplot-3.7.1/demo/world.dem
--- gnuplot-3.7/demo/world.dem	Wed Apr 15 20:16:43 1998
+++ gnuplot-3.7.1/demo/world.dem	Thu Aug 19 15:34:27 1999
@@ -1,5 +1,5 @@
 #
-# $Id: world.dem,v 1.3 1995/04/21 12:49:16 drd Exp $
+# $Id: world.dem,v 1.1.1.1.2.2 1999/08/19 14:34:27 lhecking Exp $
 #
 #
 set title "Gnuplot Correspondences"
@@ -22,7 +22,8 @@
 # plot a '3D version using spherical coordinate system' of the world.
 set angles degrees
 set title "3D version using spherical coordinate system"
-set view 70,40,,2.0
+set ticslevel 0
+set view 70,40,0.8,1.2	# HBB: ,,2.0
 set mapping spherical
 set parametric
 set samples 32
@@ -35,7 +36,8 @@
 #
 # plot a '3D version using cylindrical coordinate system' of the world.
 set title "3D version using cylindrical coordinate system"
-set view 70,40,,2.0
+set ticslevel 0.0
+set view 70,40,0.8,1.2	#HBB: ,,2.0
 set mapping cylindrical
 set parametric
 set samples 32
@@ -50,14 +52,4 @@
 #
 # Clean up:
 #
-set noparametric
-set mapping cartesian
-set angles radians
-set samples 100
-set isosamples 10
-set view 60,30,1,1
-set xrange [-10:10]
-set yrange [-10:10]
-set zrange [-10:10]
-set auto
-set title "" 0,0
+reset
diff -urN gnuplot-3.7/descrip.mms gnuplot-3.7.1/descrip.mms
--- gnuplot-3.7/descrip.mms	Mon Dec 21 22:22:54 1998
+++ gnuplot-3.7.1/descrip.mms	Thu Jan  1 01:00:00 1970
@@ -1,216 +0,0 @@
-!         
-! GNUPLOT Makefile for VMS, Vers. 2.1, 1998/08/25
-!
-! "$ MMS" or "$ MMK" makes GNUPLOT.(E,A)XE, gnuplot_X11.(E,A)XE, GNUPLOT.HLB
-! "$ MMS ALL" makes in addition GNUPLOT.HTML, GNUPLOT.TEX
-! "$ MMS/MACRO=VAXC" or "$ MMS/MACRO=GNUC" for the other compilers.
-!
-! (Rolf Niepraschk, niepraschk@ptb.de)
-!
-
-.IFDEF SCNDCALL  !------------------- second call ------------
-
-.IFDEF AXP
-O=ABJ
-X=AXE
-.ELSE
-O=OBJ
-X=EXE
-.ENDIF
-
-T = [.TERM]
-D = [.DOCS]
-L = [.DOCS.LATEXTUT]
-M = [.DEMO]
-
-DEFAULT : gnuplot.$(X) gnuplot_X11.$(X) $(M)binary1 gnuplot.hlb
-	@ !
-
-ALL : DEFAULT gnuplot.html $(D)gnuplot.tex
-	@ !
-
-.IFDEF GNUC
-CC = GCC
-CFLAGS = /NOOP/define=(ANSI_C,HAVE_SLEEP,NO_GIH,NO_LOCALE_H,X11,PIPES,VAXCRTL)
-CRTL_SHARE = ,GNU_CC:[000000]GCCLIB.OLB/lib,$(CWD)linkopt.vms/opt
-.ENDIF
-
-.IFDEF VAXC
-CFLAGS = /STAND=VAXC/NOOP/define=(HAVE_SLEEP,NO_GIH,NO_LOCALE_H,X11,PIPES,VAXCRTL)
-CRTL_SHARE = ,linkopt.vms/opt
-.ENDIF
-
-.IFDEF DECC
-
-! If this doesn't work use the next definitions.
-!
-! but the following definitions work with OpenVMS Alpha V6.2 and DEC C V5.3
-CFLAGS = /define=(ANSI_C,HAVE_LGAMMA,HAVE_ERFC,HAVE_ERF,HAVE_UNISTD_H,-
-HAVE_GETCWD,HAVE_SLEEP,NO_GIH,X11,PIPES,DECCRTL) /prefix=all
-
-! A more conservative set of definitions is
-!
-!CFLAGS = /NOOP/define=(ANSI_C,NO_GIH,NO_LOCALE_H,X11,PIPES,DECCRTL,-
-!HAVE_SLEEP,HAVE_GETCWD) /prefix=all
-
-CRTL_SHARE =
-.ENDIF	
-	
-.SUFFIXES :                   ! clear the suffix list first
-.SUFFIXES : .$(X) .$(O) .C 
-.C.$(O) :
-	$(CC) /OBJ=$@ $(CFLAGS) $< 
-                  
-.$(O).$(X) :         
-	LINK /EXE=$@ $(CRTL_SHARE) $+ 
-          	            
-X11_LIB = SYS$SHARE:DECW$XLIBSHR/SHARE
-X11OPT_FILE = x11vms.opt
-OPT_FILE = gnuplot.opt
-
-CREATE_OPT = @genopt.com
-PURGE = purge /nolog
-CD = SET DEFAULT
-CWD = SYS$DISK:[]
-SAY = WRITE SYS$OUTPUT
- 
-TERMFLAGS = /INCL=($(T),$(CWD))   
-         
-.INCLUDE MAKEFILE.ALL 
-
-OBJS = $(COREOBJS) version.$(O) vms.$(O)
-
-.FIRST
-	@ MAKEDIR = F$ENVIRONMENT("DEFAULT")
-     
-.LAST
-!	@ IF F$SEARCH("$(OPT_FILE)") .NES. "" THEN DELETE /NOLOG $(OPT_FILE);*
-!	@ IF F$SEARCH("*.$(O)",).NES."" THEN $(PURGE) *.$(O)
-!	@ IF F$SEARCH("*.$(X)",).NES."" THEN $(PURGE) *.$(X)
-!	@ IF F$SEARCH("*.HLP",).NES."" THEN $(PURGE) *.HLP
-!	@ IF F$SEARCH("*.HLB",).NES."" THEN $(PURGE) *.HLB
-	@ IF F$SEARCH("*.HTML",).NES."" THEN $(PURGE) *.HTML
-	@ IF F$SEARCH("*.DVI",).NES."" THEN $(PURGE) *.DVI
-	
-$(OPT_FILE) : $(OBJS)
-              @ LIST := $+
-              @ $(CREATE_OPT) $@/write LIST
-              
-gnuplot.$(X) : $(OBJS) $(OPT_FILE) 
-	link /exe=$@ $(OPT_FILE)/opt $(CRTL_SHARE)  
-	@ $(SAY) ""
-	@ $(SAY) "Your gnuplot executable is $@"
-	@ $(SAY) ""
-
-gnuplot_X11.$(X) : gplt_x11.$(O) stdfn.$(O) $(X11OPT_FILE) 
-	LINK /EXE=$@ GPLT_X11.$(O), STDFN.$(O), $(X11OPT_FILE)/opt $(CRTL_SHARE)
-	@ $(SAY) ""
-	@ $(SAY) "Your gnuplot_x11 executable is $@"
-	@ $(SAY) ""
-			                
-term.$(O) : term.c term.h $(CORETERM) 
-	$(CC) /OBJ=$@ $(CFLAGS) $(TERMFLAGS) $*.c 
-         
-$(X11OPT_FILE) : 
-           @ OPEN/WRITE OUT_FILE $(X11OPT_FILE)
-           @ WRITE OUT_FILE "$(X11_LIB)"
-           @ CLOSE OUT_FILE
-           
-gnuplot.hlb : gnuplot.hlp 
-	@ IF "''F$SEARCH("$@")'" .EQS. "" THEN LIBRARY/CREATE/HELP $@
-	LIBRARY $@ $<    
-	
-gnuplot.hlp : doc2hlp.$(X) $(D)gnuplot.doc 
-        CREATE_DOC := $ $(CWD)$<
-        CREATE_DOC $(D)gnuplot.doc $@
-
-!$(D)gnuplot.rnh : doc2rnh.$(X) $(D)gnuplot.doc
-!        CREATE_DOC := $ $(CWD)$<
-!        CREATE_DOC $(D)gnuplot.doc $@
-
-!gnuplot.hlp : $(D)gnuplot.rnh 
-!        RUNOFF $(D)gnuplot.rnh 
-
-gnuplot.html : doc2html.$(X) $(D)gnuplot.doc 
-        CREATE_DOC := $ $(CWD)$<
-        CREATE_DOC $(D)gnuplot.doc $@
-
-$(D)gnuplot.tex : doc2tex.$(X) $(D)gnuplot.doc 
-        CREATE_DOC := $ $(CWD)$<
-        CREATE_DOC $(D)gnuplot.doc $@  
-
-gnuplot.dvi : $(D)gnuplot.tex $(D)titlepag.tex $(D)toc_entr.sty
-	$(CD) $(D)
-	LATEX $*
-	LATEX $*
-	RENAME $@ 'MAKEDIR'$@
-	$(CD) 'MAKEDIR'
-        
-doc2rnh.$(X) : doc2rnh.$(O)    	
-doc2hlp.$(X) : doc2hlp.$(O) termdoc.$(O)
-	LINK /EXE=$@ doc2hlp.$(O),termdoc.$(O)
-doc2html.$(X) : doc2html.$(O)          
-doc2tex.$(X) : doc2tex.$(O)  
-
-doc2hlp.$(O) doc2html.$(O) doc2tex.$(O) termdoc.$(O) : $(D)termdoc.c $(D)allterm.h
-	$(CC) /OBJ=$@ $(CFLAGS) $(TERMFLAGS) $(D)$*.c
-doc2rnh.$(O) doc2hlp.$(O) doc2html.$(O) doc2tex.$(O) : $(D)termdoc.c $(D)allterm.h
-	$(CC) /OBJ=$@ $(CFLAGS) $(TERMFLAGS) $(D)$*.c
-		  		
-$(D)allterm.h : $(CORETERM)
-!       COPY /CONCATENATE $+ $@ !!!
-        COPY /CONCATENATE $(T)*.trm $@
-
-$(M)binary1 $(M)binary2 $(M)binary3 : bf_test.$(X)
-	$(CD) $(M)
-	RUN 'MAKEDIR'$<
-	@ $(CD) 'MAKEDIR'
-
-bf_test.$(X) : bf_test.$(O) binary.$(O) alloc.$(O)             
-
-CLEAN :
-	IF F$SEARCH("*.$(O)",).NES."" THEN DEL *.$(O);*
-	IF F$SEARCH("$(M)bf_test.$(X)",).NES."" THEN DEL $(M)bf_test.$(X);*
-	IF F$SEARCH("doc2tex.$(X)",).NES."" THEN DEL doc2tex.$(X);*
-	IF F$SEARCH("doc2html.$(X)",).NES."" THEN DEL doc2html.$(X);*
-	IF F$SEARCH("$(D)allterm.h",).NES."" THEN DEL $(D)allterm.h;*
-	IF F$SEARCH("gnuplot.hlp",).NES."" THEN DEL gnuplot.hlp;*
-
-VERYCLEAN : CLEAN
-	IF F$SEARCH("gnuplot.$(X)",).NES."" THEN DEL gnuplot.$(X);*
-	IF F$SEARCH("gnuplot.dvi",).NES."" THEN DEL gnuplot.dvi;*
-	IF F$SEARCH("gnuplot.html",).NES."" THEN DEL gnuplot.html;*
-	IF F$SEARCH("gnuplot.hlb",).NES."" THEN DEL gnuplot.hlb;*
-	IF F$SEARCH("$(D)gnuplot.tex",).NES."" THEN DEL $(D)gnuplot.tex;*
-	IF F$SEARCH("$(M)binary1.",).NES."" THEN DEL $(M)binary1.;*
-	IF F$SEARCH("$(M)binary2.",).NES."" THEN DEL $(M)binary2.;*
-	IF F$SEARCH("$(M)binary3.",).NES."" THEN DEL $(M)binary3.;*
-	
-.ELSE	!------------------- first call ------------
-
-SAY = WRITE SYS$OUTPUT
-
-? $(MMSTARGETS) : DEFAULT
-	@ !
-
-DEFAULT :
-
-.IFDEF GNUC
-	@ CCOMP = "GNUC=1"
-	@ $(SAY) "Making Gnuplot with GNUC..."
-.ELSE
-.IFDEF VAXC
-	@ CCOMP = "VAXC=1"
-	@ $(SAY) "Making Gnuplot with VAXC..."	
-.ELSE
-	@ CCOMP = "DECC=1"	
-	@ $(SAY) "Making Gnuplot with DECC..."	
-.ENDIF
-.ENDIF	
-	@ $(SAY) ""		
-	@ PARAM = "/MACRO=(SCNDCALL=1,''CCOMP')"
-	@ IF F$GETSYI("ARCH_TYPE") .NE. 1 THEN \
-	  PARAM = "/MACRO=(SCNDCALL=1,''CCOMP',AXP=1)"
-	@ $(MMS)/IGNORE=WARNING 'PARAM' $(MMSTARGETS)	! second call
-		
-.ENDIF	! SCNDCALL  
diff -urN gnuplot-3.7/docs/Makefile.in gnuplot-3.7.1/docs/Makefile.in
--- gnuplot-3.7/docs/Makefile.in	Fri Dec  4 15:18:29 1998
+++ gnuplot-3.7.1/docs/Makefile.in	Mon Nov  1 12:25:16 1999
@@ -4,17 +4,37 @@
 # See README.
 #
 # To print manual:
-#    make gnuplot.dvi             (for latex)
-#    (print or view gnuplot.dvi)
-# OR
-#    make gnuplot.nroff           (for nroff)
-#    (print or view gnuplot.nroff)
-#   or
-#    make "TROFF=itroff" troff    (for troff; use your troff here)
+#
+#   For LaTeX
+#       make gnuplot.dvi
+#       (print or view gnuplot.dvi)
+#     or (requires pdflatex)
+#       make pdf
+#       (print or view gnuplot.pdf)
+#     or
+#       make ps
+#       (print or view gnuplot.ps)
+#
+#   For groff (GNU troff}
+#       make grotxt
+#       (print or view gnuplot.txt)
+#     or
+#       make grodvi
+#       (print or view gnuplot.dvi)
+#     or
+#       make grops
+#       (print or view gnuplot.ps)
+#
+#   For nroff
+#     make gnuplot.nroff
+#     (print or view gnuplot.nroff)
+#
+#   For troff
+#     make "TROFF=itroff" troff    (use your troff here)
 #
 
 # default is what is needed for interactive gnuplot
-default: gnuplot.hlp gnuplot.gih
+all: gnuplot.gih
 
 # this tells GNU make not to export variables into the environment
 # But other makes dont understand its significance, so it must
@@ -28,9 +48,9 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 datadir = @datadir@
-mandir = @mandir@
+infodir = @infodir@
 srcdir = @srcdir@
-top_builddir = .
+top_builddir = ..
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
@@ -39,33 +59,77 @@
 INSTALL_DATA = @INSTALL_DATA@
 
 CC     = @CC@
+CPP    = @CPP@
 DEFS   = @DEFS@
+CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
-INCLUDES = -I.. -I$(srcdir)/.. -I$(srcdir)/../term -I.
+INCLUDES = -I.. -I$(top_srcdir) -I$(top_srcdir)/term -I.
 LDFLAGS = @LDFLAGS@
-LIBS = 
+LIBS = @LIBS@
 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+.c.o:
+	$(COMPILE) -c $<
+
 # The makeinfo command from GNU texinfo
 MAKEINFO = makeinfo
 
+# If you want to try doc2texi.el
+# EMACS = emacs
+
 # substitute your troff command (and any flags) for this one
-TROFF=troff
+TROFF = troff
+
+# LaTeX command, either latex or latex2e or no
+LATEX = latex
+
+# PDFLaTeX command
+PDFLATEX = pdflatex
 
 # substitute your DVI to PostScript conversion program here
-DVIPS=dvips
+DVIPS = dvips
 
-# list of terminals, generated at configure time
-TERM_LIST = \@TERM_LIST@
+T = ${srcdir}/../term
+CORETERM = $(T)/aed.trm $(T)/ai.trm $(T)/amiga.trm $(T)/apollo.trm \
+$(T)/atariaes.trm $(T)/atarivdi.trm $(T)/be.trm $(T)/cgi.trm $(T)/cgm.trm \
+$(T)/corel.trm $(T)/debug.trm $(T)/djsvga.trm $(T)/dumb.trm $(T)/dxf.trm \
+$(T)/dxy.trm $(T)/eepic.trm $(T)/emxvga.trm $(T)/epson.trm $(T)/excl.trm \
+$(T)/fg.trm $(T)/fig.trm $(T)/gif.trm $(T)/gnugraph.trm $(T)/gpic.trm \
+$(T)/gpr.trm $(T)/grass.trm $(T)/hp26.trm $(T)/hp2648.trm $(T)/hp500c.trm \
+$(T)/hpgl.trm $(T)/hpljii.trm $(T)/hppj.trm $(T)/imagen.trm $(T)/iris4d.trm \
+$(T)/kyo.trm $(T)/latex.trm $(T)/linux.trm $(T)/mac.trm $(T)/metafont.trm \
+$(T)/metapost.trm $(T)/mgr.trm $(T)/mif.trm $(T)/multitos.trm \
+$(T)/next.trm $(T)/openstep.trm $(T)/pbm.trm $(T)/pc.trm $(T)/pm.trm \
+$(T)/png.trm $(T)/post.trm $(T)/pslatex.trm $(T)/pstricks.trm $(T)/qms.trm \
+$(T)/regis.trm $(T)/rgip.trm $(T)/sun.trm $(T)/t410x.trm $(T)/table.trm \
+$(T)/tek.trm $(T)/texdraw.trm $(T)/tgif.trm $(T)/tkcanvas.trm $(T)/tpic.trm \
+$(T)/unixpc.trm $(T)/unixplot.trm $(T)/v384.trm $(T)/vws.trm $(T)/win.trm \
+$(T)/x11.trm $(T)/xlib.trm
+
+DIST_COMMON = README Makefile.in
+
+SOURCES = checkdoc.c doc2gih.c doc2hlp.c doc2html.c doc2info.c \
+doc2ipf.c doc2ms.c doc2rnh.c doc2rtf.c doc2tex.c termdoc.c xref.c
+
+HEADERS = doc2x.h xref.h
+
+EXTRA_DIST = doc2hlp.com doc2texi.el doc2texi.pl gnuplot.1 gnuplot.doc \
+gnuplot.texi gpcard.tex lasergnu.1 makefile.ami makefile.dst titlepag.ms \
+titlepag.tex toc_entr.sty latextut old psdoc
 
-allterm.h : $(TERM_LIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(EXTRA_DIST)
+
+allterm.h : $(CORETERM)
 	@echo Building allterm.h
-	cat $(srcdir)/../term/*.trm > allterm.h
+	@cat $(top_srcdir)/term/*.trm > allterm.c
+	$(CPP) -I$(top_srcdir)/term -DTERM_DRIVER_H -DTERM_HELP allterm.c | \
+	  sed '/^ *$$/d;/^#/d' > allterm.h
+	@rm -f allterm.c
 
 # for debugging
-alldoc: check dvi gih hlp html info ipf ms nroff ps rnh rtf
+alldoc: check dvi gih hlp html info ipf ms nroff pdf ps rnh rtf
 
 ### [tn]roff documentation
 troff: gnuplot.ms titlepag.ms
@@ -86,6 +150,34 @@
 	      tbl | neqn | nroff -ms | col > gnuplot.nroff ; \
 	fi
 
+### groff documentation
+
+groff: grotxt grodvi grops
+
+grotxt: gnuplot.ms titlepag.ms
+	@if [ "$(srcdir)" = "$(top_builddir)" ] ; then \
+	    groff -s -p -t -e -ms -Tlatin1 gnuplot.ms > gnuplot.txt ; \
+	else \
+	    sed "s,titlepag\.ms,$(srcdir)/titlepag\.ms," gnuplot.ms |\
+	      groff -s -p -t -e -ms -Tlatin1 gnuplot.ms > gnuplot.txt ; \
+	fi
+
+grodvi: gnuplot.ms titlepag.ms
+	@if [ "$(srcdir)" = "$(top_builddir)" ] ; then \
+	    groff -s -p -t -e -ms -Tdvi gnuplot.ms > gnuplot.dvi ; \
+	else \
+	    sed "s,titlepag\.ms,$(srcdir)/titlepag\.ms," gnuplot.ms |\
+	      groff -s -p -t -e -ms -Tdvi gnuplot.ms > gnuplot.dvi ; \
+	fi
+
+grops: gnuplot.ms titlepag.ms
+	@if [ "$(srcdir)" = "$(top_builddir)" ] ; then \
+	    groff -s -p -t -e -ms -Tps gnuplot.ms > gnuplot.ps ; \
+	else \
+	    sed "s,titlepag\.ms,$(srcdir)/titlepag\.ms," gnuplot.ms |\
+	      groff -s -p -t -e -ms -Tps gnuplot.ms > gnuplot.ps ; \
+	fi
+
 ### doc2xxx dependencies
 ms: gnuplot.ms
 
@@ -110,6 +202,17 @@
 doc2html.o: doc2html.c allterm.h
 	$(COMPILE) -DALL_TERM_DOC -c $(srcdir)/doc2html.c
 
+### PDF documentation
+pdf: gnuplot.pdf
+
+gnuplot.pdf: gnuplot.tex
+	@if test $(PDFLATEX) != no ; then \
+	  TEXINPUTS=.:$(srcdir):${TEXINPUTS}: $(PDFLATEX) gnuplot ; \
+	  TEXINPUTS=.:$(srcdir):${TEXINPUTS}: $(PDFLATEX) gnuplot ; \
+	else \
+	  echo pdflatex not found - cannot build pdf file ; \
+	fi
+
 ### LaTeX documentation
 tex: gnuplot.tex
 
@@ -126,13 +229,17 @@
 dvi: gnuplot.dvi gpcard.dvi
 
 gnuplot.dvi: gnuplot.tex titlepag.tex toc_entr.sty
-	TEXINPUTS=.:$(srcdir): latex gnuplot
-	TEXINPUTS=.:$(srcdir): latex gnuplot
+	@if test $(LATEX) != no ; then \
+	  TEXINPUTS=.:$(srcdir):${TEXINPUTS}: $(LATEX) gnuplot ; \
+	  TEXINPUTS=.:$(srcdir):${TEXINPUTS}: $(LATEX) gnuplot ; \
+	else \
+	  echo latex not found - cannot build dvi file ; \
+	fi
 
 gpcard.dvi: gpcard.tex
 	TEXINPUTS=.:$(srcdir): tex gpcard
 
-# this is how to make PostScript files
+### Postscript format
 # if pslatex has been installed, add "times" to titlepage.tex
 ps: gnuplot.ps gpcard.ps
 
@@ -152,7 +259,7 @@
 doc2hlp: doc2hlp.o termdoc.o
 	$(LINK) doc2hlp.o termdoc.o $(LIBS)
 
-# this is how to make gnuplot.gih
+### gnuplot interactive help format
 gih: gnuplot.gih
 
 gnuplot.gih: doc2gih $(srcdir)/gnuplot.doc
@@ -174,7 +281,7 @@
 	$(COMPILE) -DALL_TERM_DOC -c $(srcdir)/doc2gih.c
 	@mv doc2gih.o alldoc2gih.o
 
-# this is how to make Info documentation
+### GNU info format
 info: gnuplot.info
 
 gnuplot.info: doc2info $(srcdir)/gnuplot.doc
@@ -183,6 +290,16 @@
 doc2info: doc2info.o termdoc.o xref.o
 	$(LINK) doc2info.o termdoc.o xref.o $(LIBS)
 
+## An alternative to doc2info.c, Thanks to Bruce Ravel
+#gnuplot.info: $(srcdir)/gnuplot.texi $(srcdir)/gnuplot.doc
+#	$(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --output=$@
+#gnuplot.texi: $(srcdir)/doc2info.el $(srcdir)/gnuplot.doc
+#	@if test "$(EMACS)" != no; then \
+#	  $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi; \
+#	else \
+#	  @echo No emacs found - cannot create texinfo file; \
+#	fi
+
 # this is how to make OS/2 ipfc documentation
 ipf: gnuplot.ipf
 
@@ -192,7 +309,7 @@
 doc2ipf: doc2ipf.o termdoc.o xref.o
 	$(LINK) doc2ipf.o termdoc.o xref.o $(LIBS)
 
-# this is how to make rtf documentation
+### Rich Text Format
 rtf: gnuplot.rtf
 
 gnuplot.rtf: doc2rtf $(srcdir)/gnuplot.doc
@@ -216,10 +333,15 @@
 	( cd latextut; $(MAKE) )
 
 # this is how to check the gnuplot.doc file
-check: checkdoc $(srcdir)/gnuplot.doc
-	./checkdoc < $(srcdir)/gnuplot.doc
+check: all checkdoc
+	@./checkdoc < $(srcdir)/gnuplot.doc; \
+	if test $$? -eq 0; then \
+	  echo "PASS: gnuplot.doc"; \
+	else \
+	  :; \
+	fi
 
-checkdoc: checkdoc.o termdoc.o
+checkdoc: checkdoc.o termdoc.o $(srcdir)/gnuplot.doc
 	$(LINK) checkdoc.o termdoc.o $(LIBS)
 
 checkdoc.o: checkdoc.c allterm.h
@@ -227,6 +349,7 @@
 
 # For Unix and MSDOS only
 install: gnuplot.gih
+	$(top_srcdir)/mkinstalldirs $(datadir)
 	$(INSTALL_DATA) gnuplot.gih $(datadir)/gnuplot.gih
 
 uninstall:
@@ -236,8 +359,26 @@
 install-vms: gnuplot.hlp
 	$(INSTALL_DATA) gnuplot.hlp $(datadir)/gnuplot.hlp
 
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = docs
+
+
+distdir: $(DISTFILES)
+	distdir=`cd $(distdir) && pwd`
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+
 clean:
-	rm -f doc2tex gnuplot.tex gnuplot.dvi \
+	-rm -f doc2tex gnuplot.tex gnuplot.dvi \
 	  gnuplot.aux gnuplot.log gnuplot.toc \
 	  gnuplot.ps gpcard.dvi gpcard.log gpcard.ps \
 	  alldoc2gih doc2gih gnuplot.gih \
@@ -250,17 +391,19 @@
 	  doc2rtf gnuplot.rtf \
 	  gnuplot.nroff checkdoc *.o core a.out allterm.h
 	( cd latextut; $(MAKE) clean )
+	rm -f *.exe
 
 mostlyclean: clean
 
 distclean: clean
-	rm -f Makefile
+	-rm -f Makefile
 
 realclean: distclean
-	rm -f TAGS
+	-rm -f TAGS
 
-.c.o:
-	$(COMPILE) -c $<
+Makefile: Makefile.in ../config.status
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 ### Dependencies - do not edit!
 
@@ -269,33 +412,33 @@
 # (but then we have to change all the other makefiles). Plus then
 # we cannot make some doc2* filters use allterm.h and others use term.h
 
-TERM_H = $(srcdir)/../term.h
+TERM_H = $(top_srcdir)/term.h
 
-checkdoc.o: checkdoc.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h allterm.h
-alldoc2gih.o: doc2gih.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h allterm.h
-doc2gih.o: doc2gih.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h $(TERM_H)
-doc2hlp.o: doc2hlp.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h $(TERM_H)
-doc2html.o: doc2html.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h allterm.h
-doc2info.o: doc2info.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h $(TERM_H)
-doc2ipf.o: doc2ipf.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h $(TERM_H)
-doc2ms.o: doc2ms.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h allterm.h
-doc2rnh.o: doc2rnh.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h $(TERM_H)
-doc2rtf.o: doc2rtf.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h $(TERM_H)
-doc2tex.o: doc2tex.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h allterm.h
-termdoc.o: termdoc.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h
-xref.o: xref.c ../config.h $(srcdir)/../ansichek.h \
-		$(srcdir)/../stdfn.h doc2x.h xref.h
+checkdoc.o: checkdoc.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h allterm.h
+alldoc2gih.o: doc2gih.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h allterm.h
+doc2gih.o: doc2gih.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h $(TERM_H)
+doc2hlp.o: doc2hlp.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h $(TERM_H)
+doc2html.o: doc2html.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h allterm.h
+doc2info.o: doc2info.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h $(TERM_H)
+doc2ipf.o: doc2ipf.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h $(TERM_H)
+doc2ms.o: doc2ms.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h allterm.h
+doc2rnh.o: doc2rnh.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h $(TERM_H)
+doc2rtf.o: doc2rtf.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h $(TERM_H)
+doc2tex.o: doc2tex.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h allterm.h
+termdoc.o: termdoc.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h
+xref.o: xref.c ../config.h $(top_srcdir)/ansichek.h \
+		$(top_srcdir)/stdfn.h doc2x.h xref.h
 
 #the end
diff -urN gnuplot-3.7/docs/checkdoc.c gnuplot-3.7.1/docs/checkdoc.c
--- gnuplot-3.7/docs/checkdoc.c	Mon Oct 19 14:17:15 1998
+++ gnuplot-3.7.1/docs/checkdoc.c	Mon Oct 19 14:17:15 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: checkdoc.c,v 1.17 1998/04/14 00:16:57 drd Exp $
+ * $Id: checkdoc.c,v 1.7 1998/10/19 13:17:15 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/docs/doc2gih.c gnuplot-3.7.1/docs/doc2gih.c
--- gnuplot-3.7/docs/doc2gih.c	Mon Oct 19 14:17:28 1998
+++ gnuplot-3.7.1/docs/doc2gih.c	Mon Oct 19 14:17:28 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: doc2gih.c,v 1.16 1998/04/14 00:16:58 drd Exp $
+ * $Id: doc2gih.c,v 1.7 1998/10/19 13:17:28 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/docs/doc2hlp.c gnuplot-3.7.1/docs/doc2hlp.c
--- gnuplot-3.7/docs/doc2hlp.c	Mon Oct 19 14:17:32 1998
+++ gnuplot-3.7.1/docs/doc2hlp.c	Mon Oct 19 14:17:32 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: doc2hlp.c,v 1.15 1998/04/14 00:16:58 drd Exp $";
+static char *RCSid = "$Id: doc2hlp.c,v 1.7 1998/10/19 13:17:32 lhecking Exp $";
 #endif
 
 /* GNUPLOT - doc2hlp.c */
diff -urN gnuplot-3.7/docs/doc2html.c gnuplot-3.7.1/docs/doc2html.c
--- gnuplot-3.7/docs/doc2html.c	Wed Oct 28 21:04:09 1998
+++ gnuplot-3.7.1/docs/doc2html.c	Wed Oct 28 21:04:09 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: doc2html.c,v 1.10 1998/04/14 00:16:58 drd Exp $
+ * $Id: doc2html.c,v 1.7 1998/10/28 21:04:09 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/docs/doc2info.c gnuplot-3.7.1/docs/doc2info.c
--- gnuplot-3.7/docs/doc2info.c	Fri Dec  4 15:18:04 1998
+++ gnuplot-3.7.1/docs/doc2info.c	Thu Aug 19 15:31:53 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: doc2info.c,v 1.7 1998/04/14 00:16:59 drd Exp $
+ * $Id: doc2info.c,v 1.9.2.1 1999/08/19 14:31:53 lhecking Exp $
  *
  */
 
@@ -148,7 +148,13 @@
     refhead->next = refhead->prev = NULL;
 
     /* Info header */
-    fprintf(b, "This file is %s created by doc2info from %s.\n\n", ofile, ifile);
+    fprintf(b, "\
+This file is %s created by doc2info from %s.\n\
+\n\
+START-INFO-DIR-ENTRY\n\
+* Gnuplot: (gnuplot).           Gnuplot plotting program\n\
+END-INFO-DIR-ENTRY\n\n",
+	    ofile, ifile);
 
     /* and Top node */
     node_head(NULL, NULL, head->next->string, NULL, b);
diff -urN gnuplot-3.7/docs/doc2ipf.c gnuplot-3.7.1/docs/doc2ipf.c
--- gnuplot-3.7/docs/doc2ipf.c	Mon Oct 19 14:17:45 1998
+++ gnuplot-3.7.1/docs/doc2ipf.c	Mon Oct 19 14:17:45 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: doc2ipf.c,v 1.20 1998/04/14 00:16:59 drd Exp $";
+static char *RCSid = "$Id: doc2ipf.c,v 1.7 1998/10/19 13:17:45 lhecking Exp $";
 #endif
 
 /* GNUPLOT - doc2ipf.c */
diff -urN gnuplot-3.7/docs/doc2ms.c gnuplot-3.7.1/docs/doc2ms.c
--- gnuplot-3.7/docs/doc2ms.c	Mon Oct 19 14:17:49 1998
+++ gnuplot-3.7.1/docs/doc2ms.c	Mon Oct 19 14:17:49 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: doc2ms.c,v 1.19 1998/06/18 14:59:11 ddenholm Exp $";
+static char *RCSid = "$Id: doc2ms.c,v 1.9 1998/10/19 13:17:49 lhecking Exp $";
 #endif
 
 /* GNUPLOT - doc2ms.c */
diff -urN gnuplot-3.7/docs/doc2rnh.c gnuplot-3.7.1/docs/doc2rnh.c
--- gnuplot-3.7/docs/doc2rnh.c	Fri Nov 20 12:16:15 1998
+++ gnuplot-3.7.1/docs/doc2rnh.c	Fri Nov 20 12:16:15 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: doc2rno.c,v 0.01 1997/03/09 21:00:00 lph Exp $";
+static char *RCSid = "$Id: doc2rnh.c,v 1.7 1998/11/20 12:16:15 lhecking Exp $";
 #endif
 
 /* GNUPLOT - doc2rnh.c */
diff -urN gnuplot-3.7/docs/doc2rtf.c gnuplot-3.7.1/docs/doc2rtf.c
--- gnuplot-3.7/docs/doc2rtf.c	Mon Oct 19 14:17:56 1998
+++ gnuplot-3.7.1/docs/doc2rtf.c	Mon Oct 19 14:17:56 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: doc2rtf.c,v 1.16 1998/04/14 00:17:00 drd Exp $
+ * $Id: doc2rtf.c,v 1.6 1998/10/19 13:17:56 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/docs/doc2tex.c gnuplot-3.7.1/docs/doc2tex.c
--- gnuplot-3.7/docs/doc2tex.c	Mon Oct 19 14:18:05 1998
+++ gnuplot-3.7.1/docs/doc2tex.c	Mon Oct 19 14:18:05 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: doc2tex.c,v 1.21 1998/06/18 14:59:12 ddenholm Exp $
+ * $Id: doc2tex.c,v 1.8 1998/10/19 13:18:05 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/docs/doc2texi.el gnuplot-3.7.1/docs/doc2texi.el
--- gnuplot-3.7/docs/doc2texi.el	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/docs/doc2texi.el	Thu Oct 28 12:24:45 1999
@@ -0,0 +1,767 @@
+;;;; doc2texi.el -- generate a texinfo file from the gnuplot doc file
+
+;; Copyright (C) 1999 Bruce Ravel
+
+;; Author:     Bruce Ravel <ravel@phys.washington.edu>
+;; Maintainer: Bruce Ravel <ravel@phys.washington.edu>
+;; Created:    March 23 1999
+;; Updated:    May 28 1999
+;; Version:    0.2
+;; Keywords:   gnuplot, document, info
+
+;; This file is not part of GNU Emacs.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This lisp script is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;; Permission is granted to distribute copies of this lisp script
+;; provided the copyright notice and this permission are preserved in
+;; all copies.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; send bug reports to the author (ravel@phys.washington.edu)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Commentary:
+;;
+;; I suppose the most immediate question to ask is "Why do this in
+;; emacs lisp???"  While it is true that the gnuplot.doc file lends
+;; itself to processing by a 1 pass filter, there are some aspects of
+;; texinfo files that are a bit tricky and would require 2 or perhaps
+;; three passes.  Specifically, getting all of the cross references
+;; made correctly is a lot of work.  Fortunately, texinfo-mode has
+;; functions for building menus and updating nodes.  This saves a lot
+;; of sweat and is the principle reason why I decided to write this is
+;; emacs lisp.
+;;
+;; Everything else in gnuplot is written in C for the sake of
+;; portability.  Emacs lisp, of course, requires that you have emacs.
+;; For many gnuplot users, that is not a good assumption.  However,
+;; the likelihood of needing info files in the absence of emacs is
+;; very, very slim.  I think it is safe to say that someone who needs
+;; info files has emacs installed and thus will be able to use this
+;; program.
+;;
+;; Since this is emacs, I am not treating the gnuplot.doc file as a
+;; text stream.  It seems much more efficient in this context to treat
+;; it as a buffer.  All of the work is done by the function
+;; `d2t-doc-to-texi'.  Each of the conversion chores is handled by an
+;; individual function.  Each of thse functions is very similar in
+;; structure.  They start at the top of the buffer, search forward for
+;; a line matching the text element being converted, perform the
+;; replacement in place, and move on until the end of the buffer.
+;; These text manipulations are actually quite speedy.  The slow part
+;; of the process is using the texinfo-mode function to update the
+;; nodes and menus.  However, using these slow functions has one
+;; advantage -- the texinfo-mode functions for doing menus and nodes
+;; are certain to do the job correctly.  Although rather slow, this
+;; approach doesn't totally suck compared to the time cost of
+;; compiling and running a C program.  And the output from this is
+;; much more useful than the output from the doc2info program.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Use:
+;;
+;; Customize the variables at the start of the executable code.  Then
+;; I intend that this be used from the command line or from a Makefile
+;; like so:
+;;
+;;      emacs -batch -l doc2texi.el -f d2t-doc-to-texi
+;;
+;; or
+;;
+;;      emacs -batch -l doc2texi.el -f d2t-doc-to-texi-verbosely
+;;
+;; This will start emacs in batch mode, load this file, run the
+;; converter, then quit.  This takes about 30 seconds my 133 MHz
+;; Pentium.  It also sends a large number of mesages to stderr, so you
+;; may want to redirect stderr to /dev/null or to a file.
+;;
+;; Then you can do
+;;
+;;      makeinfo gnuplot.info
+;;
+;; You may want to use the --no-split option.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; History:
+;;
+;;  0.1  Mar 23 1999 <BR> Initial version
+;;  0.2  May 28 1999 <BR>
+;;  0.3  Jun  2 1999 <BR> Added terminal information, fixed uref problem.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Acknowledgements:
+;;
+;; Lars Hecking asked me to look into the doc -> info problem.  Silly
+;; me, I said "ok."  This is what I came up with.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; To do:
+;;
+;;  -- internal cross-references: these are not perfect due to
+;;     inconsistencies in the use of `` and case inconsistencies in
+;;     the text.  The latter can be fixed.  Also I need a way to not
+;;     make the @ref if point is currently in that region.
+;;  -- catch errors gracefully, particularly when looking for files.
+;;  -- are guesses about OS specific terminal information correct?
+;;  -- turn the lists in the "What's New" and "xlabel" sections into
+;;     proper lists.  "^\\([0-9]\\)+\." finds the list items.  If
+;;     (match-string 1) is "1" then insert "@enumerate\n@item\n", else
+;;     insert "@item\n".  also use (replace-match "").  need to find
+;;     the end somehow.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Code:
+
+;;; You may need to customize these variables:
+(defvar d2t-doc-file-name "gnuplot.doc"
+  "Name of the gnuplot.doc file.")
+(defvar d2t-terminal-directory (expand-file-name "../term/")
+  "Location of .trm files in gnuplot source tree.")
+
+
+;;; You should not need to touch anything below here ;;;;;;;;;;;;;;;;;;;;;
+
+(require 'cl)
+(eval-and-compile			; need split-string to do xrefs
+  (if (fboundp 'split-string)
+      ()
+    (defun split-string (string &optional pattern)
+      "Return a list of substrings of STRING which are separated by PATTERN.
+If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
+      (or pattern
+	  (setq pattern "[ \f\t\n\r\v]+"))
+      (let (parts (start 0))
+	(while (string-match pattern string start)
+	  (setq parts (cons (substring string start (match-beginning 0)) parts)
+		start (match-end 0)))
+	(nreverse (cons (substring string start) parts)))) ))
+
+(defconst d2t-work-buffer-name "*doc2texi*"
+  "Name of scratch buffer where the doc file will be converted into a
+  texi file.")
+(defconst d2t-scratch-buffer-name "*doc2texi-output*")
+(defconst d2t-terminal-buffer-name "*doc2texi-terminal*")
+(defvar d2t-verbose nil)
+(defconst d2t-texi-filename "gnuplot.texi")
+
+(defconst d2t-texi-header
+  "\\input texinfo   @c -*-texinfo-*-
+
+@c %**start of header
+@setfilename gnuplot.info
+@settitle Gnuplot: An Interactive Plotting Program
+@setchapternewpage odd
+@c %**end of header
+
+@c define the command and options indeces
+@defindex cm
+@defindex op
+@defindex tm
+
+@direntry
+* GNUPLOT: (gnuplot).             An Interactive Plotting Program
+@end direntry
+
+@ifnottex
+@node Top, gnuplot, (dir), (dir)
+@top Master Menu
+@end ifnottex
+
+@example
+                       GNUPLOT
+
+            An Interactive Plotting Program
+             Thomas Williams & Colin Kelley
+          Version 3.7 organized by: David Denholm
+
+ Copyright (C) 1986 - 1993, 1998   Thomas Williams, Colin Kelley
+
+       Mailing list for comments: info-gnuplot@@dartmouth.edu
+     Mailing list for bug reports: bug-gnuplot@@dartmouth.edu
+
+         This manual was prepared by Dick Crawford
+                   3 December 1998
+
+
+Major contributors (alphabetic order):
+@end example
+
+"
+  "Texinfo header.")
+
+(defconst d2t-main-menu
+  "@menu
+@end menu"
+  "Main menu.")
+
+(defconst d2t-texi-footer
+  "@node Concept_Index, Command_Index, Bugs, Top
+@unnumbered Concept Index
+@printindex cp
+
+@node Command_Index, Option_Index, Concept_Index, Top
+@unnumbered Command Index
+@printindex cm
+
+@node Options_Index, Function_Index, Command_Index, Top
+@unnumbered Options Index
+@printindex op
+
+@node Function_Index, Terminal_Index, Options_Index, Top
+@unnumbered Function Index
+@printindex fn
+
+@node Terminal_Index, , Options_Index, Top
+@unnumbered Terminal Index
+@printindex tm
+
+@c @shortcontents
+@contents
+@bye
+"
+  "Texinfo file terminator.")
+
+(defvar d2t-level-1-alist nil
+  "Alist of level 1 tags and markers.")
+(defvar d2t-level-2-alist nil
+  "Alist of level 2 tags and markers.")
+(defvar d2t-level-3-alist nil
+  "Alist of level 3 tags and markers.")
+(defvar d2t-level-4-alist nil
+  "Alist of level 4 tags and markers.")
+(defvar d2t-level-5-alist nil
+  "Alist of level 5 tags and markers.")
+(defvar d2t-commands-alist nil
+  "Alist of commands and markers.")
+(defvar d2t-set-show-alist nil
+  "Alist of options and markers.")
+(defvar d2t-functions-alist nil
+  "Alist of functions and markers.")
+(defvar d2t-terminals-alist nil
+  "Alist of terminal types and markers.")
+(defvar d2t-node-list nil
+  "List of nodes.")
+
+(defvar d2t-terminal-list ())
+(setq d2t-terminal-list
+      '("ai"
+	"cgm"
+	"corel"
+	"dumb"
+	"dxf"
+	"eepic"
+	"epson"
+	"fig"
+	"gif"
+	"hp26"
+	"hp2648"
+	"hp500c"
+	"hpgl"
+	"hpljii"
+	"hppj"
+	"imagen"
+	"latex"
+	"metafont"
+	"mif"
+	"pbm"
+	"png"
+	"post"
+	"pslatex"
+	"pstricks"
+	"qms"
+	"table"
+	"tek"
+	"texdraw"
+	"tkcanvas"
+	"tpic"))
+
+(defun d2t-doc-to-texi-verbosely ()
+  "Run `d2t-doc-to-texi' noisily"
+  (interactive)
+  (setq d2t-verbose t)
+  (d2t-doc-to-texi))
+
+(defun d2t-doc-to-texi ()
+  "This is the doc to texi converter function.
+It calls a bunch of other functions, each of which handles one
+particular conversion chore."
+  (interactive)
+  (setq d2t-level-1-alist   nil ;; initialize variables
+	d2t-level-2-alist   nil
+	d2t-level-3-alist   nil
+	d2t-level-4-alist   nil
+	d2t-level-5-alist   nil
+	d2t-commands-alist  nil
+	d2t-set-show-alist  nil
+	d2t-functions-alist nil
+	d2t-terminals-alist nil
+	d2t-node-list       nil)
+  ;; open the doc file and get some data about its contents
+  (d2t-prepare-workspace)
+  (message "Inserting help for terminals ...")
+  (d2t-get-terminals)
+  (message "Analyzing doc file ...")
+  (d2t-get-levels)
+  (d2t-get-commands)
+  (d2t-get-set-show)
+  (d2t-get-functions)
+  ;; convert the buffer from doc to texi, one element at a time
+  (message "Converting to texinfo ...")
+  (d2t-braces-atsigns)   ;; this must be the first conversion function
+  (d2t-comments)         ;; delete comments
+  (d2t-sectioning)       ;; chapters, sections, etc
+  (d2t-indexing)         ;; index markup
+  (d2t-tables)           ;; fix up tables
+  (d2t-handle-html)      ;; fix up html markup
+  (d2t-first-column)     ;; left justify normal text
+  (d2t-enclose-examples) ;; turn indented text into @examples
+  (message "Menus, nodes, xrefs ...")
+  (d2t-make-refs)
+  ;(d2t-make-menus)
+  ;(d2t-set-nodes)
+  (save-excursion        ;; fix a few more things explicitly
+    (goto-char (point-min))
+    (insert d2t-texi-header)
+    (search-forward "@node")
+    ;; (beginning-of-line)
+    ;; (insert "\n\n" d2t-main-menu "\n\n")
+    (search-forward "@node Old_bugs")	; `texinfo-all-menus-update' seems
+    (beginning-of-line)			; to miss this one.  how odd.
+    (insert "@menu\n* Old_bugs::\t\t\t\n@end menu\n\n")
+    (goto-char (point-max))
+    (insert d2t-texi-footer))
+  (load-library "texinfo") ;; now do the hard stuff with texinfo-mode
+  (texinfo-mode)
+  (let ((message-log-max 0)
+	(standard-output (get-buffer-create d2t-scratch-buffer-name)))
+    (message "Making texinfo nodes ...\n")
+    (texinfo-every-node-update)
+    (message "Making texinfo menus ...\n")
+    (texinfo-all-menus-update))
+  (write-file d2t-texi-filename) )  ; save it and done!
+
+(defun d2t-prepare-workspace ()
+  "Create a scratch buffer and populate it with gnuplot.doc."
+  (and d2t-verbose (message "  Doing d2t-prepare-workspace ..."))
+  (if (get-buffer d2t-work-buffer-name)
+      (kill-buffer d2t-work-buffer-name))
+  (if (get-buffer d2t-texi-filename)
+      (kill-buffer d2t-texi-filename))
+  (if (get-buffer d2t-terminal-buffer-name)
+      (kill-buffer d2t-terminal-buffer-name))
+  (get-buffer-create d2t-terminal-buffer-name)
+  (set-buffer (get-buffer-create d2t-work-buffer-name))
+  (insert-file-contents d2t-doc-file-name)
+  (goto-char (point-min)))
+
+
+(defun d2t-get-terminals ()
+  "Insert all appropriate terminal help."
+  (let ((case-fold-search t))
+    (if (string-match "linux" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("linux"))))
+    (if (string-match "amiga" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("amiga"))))
+    (if (string-match "atari" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("atarivdi" "multitos" "atariaes"))))
+    (if (string-match "mac" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("mac"))))
+    (if (string-match "beos" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("be"))))
+    (if (string-match "dos" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("emxvga" "djsvga" "fg" "pc"))))
+    (if (string-match "windows" (format "%s" system-type))
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("win"))))
+    (if (string-match "next" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("next"))))
+    (if (string-match "os2" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("pm" "emxvga"))))
+    (if (string-match "irix" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("iris4d"))))
+    (if (string-match "sco" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("cgi"))))
+    (if (string-match "sun" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("sun"))))
+    (if (string-match "vms" system-configuration)
+	(setq d2t-terminal-list (append d2t-terminal-list
+					'("vws"))))
+    (unless (member* system-configuration '("dos" "windows" "atari" "amiga")
+		     :test 'string-match)
+      (setq d2t-terminal-list
+	    (append d2t-terminal-list
+		    '("x11" "tgif" "gpic" "regis" "t410x" "tex" "xlib")))) )
+  (setq d2t-terminal-list (sort d2t-terminal-list 'string<))
+  (let ((list d2t-terminal-list) file node marker)
+    (save-excursion
+      (when (re-search-forward "^<4" (point-max) t)
+	(beginning-of-line)
+	(insert "@c ")
+	(forward-line 1)
+	(while list
+	  (and d2t-verbose (message "    %s ..." (car list)))
+	  (setq file (concat d2t-terminal-directory (car list) ".trm"))
+	  (when (file-exists-p file)
+	    (set-buffer d2t-terminal-buffer-name)
+	    (erase-buffer)
+	    (insert-file-contents file)
+	    ;; find the terminal help
+	    (when (search-forward "START_HELP" (point-max) "to_end")
+	      (forward-line 1)
+	      (delete-region (point-min) (point-marker))
+	      (search-forward "END_HELP" (point-max) "to_end")
+	      (beginning-of-line)
+	      (delete-region (point-marker) (point-max))
+	      ;; tidy up the terminal help content
+	      (goto-char (point-min))
+	      (while (re-search-forward "\",[ \t]*$" nil t)
+		(replace-match "" nil nil))
+	      (goto-char (point-min))
+	      (while (re-search-forward "^\"" nil t)
+		(replace-match "" nil nil))
+	      (goto-char (point-min))
+	      (while (re-search-forward "\\\\\"" nil t)
+		(replace-match "\"" nil nil))
+	      (goto-char (point-min))
+	      (while (re-search-forward "^1[ \t]+\\(.+\\)$" nil t)
+		(setq node   (match-string 1)
+		      marker (point-marker))
+		(replace-match (concat "4  " node) nil nil))
+	      (goto-char (point-min))
+	      (while (re-search-forward "^2" nil t)
+		(replace-match "5 " nil nil))
+	      (goto-char (point-min))
+	      ;; set up terminals index
+	      (while (re-search-forward "^\?\\([^ ]+\\)$" nil t)
+		(let ((word (match-string 1)))
+		  (unless (string-match "_\\|command-line-options" word)
+		    (setq d2t-terminals-alist
+			  (append d2t-terminals-alist
+				  (list (cons word (point-marker))))))))
+	      ;; and cram it into the doc buffer
+	      (set-buffer d2t-work-buffer-name)
+	      (insert-buffer-substring d2t-terminal-buffer-name)
+	      ))
+	  (setq list (cdr list))
+	  )))))
+
+;;; functions for obtaining lists of nodes in the document
+
+(defun d2t-get-levels ()
+  "Find positions of all nodes in the doc."
+  (and d2t-verbose (message "  Doing d2t-get-levels ..."))
+  (let ((list '("1" "2" "3" "4" "5")) str)
+    (while list
+      (setq str (concat "d2t-level-" (car list) "-alist"))
+      (and d2t-verbose (message "    %s ..." str))
+      (save-excursion
+	(while (not (eobp))
+	  (when (re-search-forward (concat "^" (car list) " \\(.+\\)$")
+				   (point-max) "to_end")
+	    (beginning-of-line)
+	    (set (intern str)
+		 (append (eval (intern str))
+			 (list (cons (match-string 1) (point-marker)))))
+	    (forward-line 1))))
+      (setq list (cdr list)))))
+
+
+(defun d2t-get-commands ()
+  "Find all commands in the doc."
+  (and d2t-verbose (message "  Doing d2t-get-commands ..."))
+  (save-excursion
+    (let ((alist d2t-level-1-alist) start end)
+      (while alist
+	(if (string= (caar alist) "Commands")
+	    (setq start (cdar  alist) ;; location of "1 Commands"
+		  end   (cdadr alist) ;; location of next level 1 heading
+		  alist nil)
+	  (setq alist (cdr alist))))
+      ;;(message "%S %S" start end)
+      (goto-char start)
+      (while (< (point) end)
+	(when (re-search-forward "^2 \\(.+\\)$" (point-max) "to_end")
+	  (beginning-of-line)
+	  (unless (> (point) end)
+	    (setq d2t-commands-alist
+		  (append d2t-commands-alist
+			  (list (cons (match-string 1) (point-marker))))))
+	  (forward-line 1))) )))
+
+(defun d2t-get-set-show ()
+  "Find all set-show options in the doc."
+  (and d2t-verbose (message "  Doing d2t-get-set-show ..."))
+  (save-excursion
+    (let ((alist d2t-commands-alist) start end)
+      (while alist
+	(if (string= (caar alist) "set-show")
+	    (setq start (cdar  alist) ;; location of "1 set-show"
+		  end   (cdadr alist) ;; location of next level 2 heading
+		  alist nil)
+	  (setq alist (cdr alist))))
+      ;;(message "%S %S" start end)
+      (goto-char start)
+      (while (< (point) end)
+	(when (re-search-forward "^3 \\(.+\\)$" (point-max) "to_end")
+	  (beginning-of-line)
+	  (unless (> (point) end)
+	    (setq d2t-set-show-alist
+		  (append d2t-set-show-alist
+			  (list (cons (match-string 1) (point-marker))))))
+	  (forward-line 1))) )))
+
+
+(defun d2t-get-functions ()
+  "Find all functions in the doc."
+  (and d2t-verbose (message "  Doing d2t-get-functions ..."))
+  (let (begin end)
+    (save-excursion			; determine bounds of functions
+      (when (re-search-forward "^3 Functions" (point-max) "to_end")
+	  (beginning-of-line)
+	  (setq begin (point-marker))
+	  (forward-line 1)
+	  (when (re-search-forward "^3 " (point-max) "to_end")
+	    (beginning-of-line)
+	    (setq end (point-marker))))
+      (goto-char begin)
+      (while (< (point) end)
+	(when (re-search-forward "^4 \\(.+\\)$" (point-max) "to_end")
+	  (beginning-of-line)
+	  (unless (> (point) end)
+	    (setq d2t-functions-alist
+		  (append d2t-functions-alist
+			  (list (cons (match-string 1) (point-marker))))))
+	  (forward-line 1))) )))
+
+;; buffer manipulation functions
+
+;; this can probably be made faster using a let-scoped alist rather
+;; than the big cons block
+(defun d2t-sectioning ()
+  "Find all lines starting with a number.
+These are chapters, sections, etc.  Delete these lines and insert the
+appropriate sectioning and @node commands."
+  (and d2t-verbose (message "  Doing d2t-sectioning ..."))
+  (save-excursion
+    (while (not (eobp))
+      (re-search-forward "^\\([1-9]\\) +\\(.+\\)$" (point-max) "to_end")
+      (unless (eobp)
+	(let* ((number (match-string 1))
+	       (word (match-string 2))
+	       (node (substitute ?_ ?  word :test 'char-equal))
+	       (eol  (save-excursion (end-of-line) (point-marker))))
+	  ;; some node names appear twice.  make the second one unique.
+	  ;; this will fail to work if a third pops up in the future!
+	  (if (member* node d2t-node-list :test 'string=)
+	      (setq node (concat node "_")))
+	  (setq d2t-node-list (append d2t-node-list (list node)))
+	  (beginning-of-line)
+	  (delete-region (point-marker) eol)
+	  (if (string-match "[1-4]" number) (insert "\n@node " node "\n"))
+	  (cond ((string= number "1")
+		 (insert "@chapter " word "\n"))
+		((string= number "2")
+		 (insert "@section " word "\n"))
+		((string= number "3")
+		 (insert "@subsection " word "\n"))
+		((string= number "4")
+		 (insert "@subsubsection " word "\n"))
+		(t
+		 (insert "\n\n@noindent --- " (upcase word) " ---\n")) ) )))))
+
+(defun d2t-indexing ()
+  "Find all lines starting with a question mark.
+These are index references.  Delete these lines and insert the
+appropriate indexing commands.  Only index one word ? entries,
+comment out the multi-word ? entries."
+  (and d2t-verbose (message "  Doing d2t-indexing ..."))
+  (save-excursion
+    (while (not (eobp))
+      (re-search-forward "^\\\?\\([^ \n]+\\) *$" (point-max) "to_end")
+      (unless (eobp)
+	(let ((word (match-string 1))
+	      (eol  (save-excursion (end-of-line) (point-marker))))
+	  (beginning-of-line)
+	  (delete-region (point-marker) eol)
+	  (insert "@cindex " word "\n")
+	  (cond ((assoc word d2t-commands-alist)
+		 (insert "@cmindex " word "\n\n"))
+		((assoc word d2t-set-show-alist)
+		 (insert "@opindex " word "\n\n"))
+		((assoc word d2t-terminals-alist)
+		 (insert "@tmindex " word "\n\n"))
+		((assoc word d2t-functions-alist)
+		 (insert "@findex " word "\n\n"))) )))
+    (goto-char (point-min))
+    (while (not (eobp))
+      (re-search-forward "^\\\?" (point-max) "to_end")
+      (unless (eobp)
+	(if (looking-at "functions? \\(tm_\\w+\\)")
+	    (progn
+	      (beginning-of-line)
+	      (insert "@findex " (match-string 1) "\n@c "))
+	  (beginning-of-line)
+	  (insert "@c ")))) ))
+
+(defun d2t-comments ()
+  "Delete comments and lines beginning with # or %.
+# and % lines are used in converting tables into various formats."
+  (and d2t-verbose (message "  Doing d2t-comments ..."))
+  (save-excursion
+    (while (not (eobp))
+      (re-search-forward "^[C#%]" (point-max) "to_end")
+      (unless (eobp)
+	(let ((eol  (save-excursion (end-of-line)
+				    (forward-char 1)
+				    (point-marker))))
+	  (beginning-of-line)
+	  (delete-region (point-marker) eol) )))))
+
+(defun d2t-first-column ()
+  "Justify normal text to the 0th column.
+This must be run before `d2t-enclose-examples'.
+This is rather slow since there are almost 9000 lines of text."
+  (and d2t-verbose (message "  Doing d2t-first-column ..."))
+  (save-excursion
+    (while (not (eobp))
+      (and (char-equal (char-after (point)) ? )
+	   (delete-char 1))
+      (forward-line))))
+
+(defun d2t-braces-atsigns ()
+  "Prepend @ to @, {, or } everywhere in the doc.
+This MUST be the first conversion function called in
+`d2t-doc-to-texi'."
+  (and d2t-verbose (message "  Doing d2t-braces-atsigns ..."))
+  (save-excursion
+    (while (not (eobp))
+      (re-search-forward "[@{}]" (point-max) "to_end")
+      (unless (eobp)
+	(backward-char 1)
+	(insert "@")
+	(forward-char 1)))))
+
+(defun d2t-tables ()
+  "Remove @start table and @end table tags.
+These will be made into @example's by `d2t-enclose-examples'.
+Thus, the plain text formatting already in the doc is used."
+  (and d2t-verbose (message "  Doing d2t-tables ..."))
+  (save-excursion
+    (while (not (eobp))
+      (re-search-forward "^ *@+start table" (point-max) "to_end")
+      (unless (eobp)
+	(let ((eol  (save-excursion (end-of-line) (point-marker))))
+	  (beginning-of-line)
+	  (delete-region (point-marker) eol))))
+	  ;;(insert "@example")
+    (goto-char (point-min))
+    (while (not (eobp))
+      (re-search-forward "^ *@+end table" (point-max) "to_end")
+      (unless (eobp)
+	(let ((eol  (save-excursion (end-of-line) (point-marker))))
+	  (beginning-of-line)
+	  (delete-region (point-marker) eol))))))
+	  ;;(insert "@end example")
+
+
+(defun d2t-enclose-examples ()
+  "Turn indented text in the doc into @examples.
+This must be run after `d2t-first-column'."
+  (and d2t-verbose (message "  Doing d2t-enclose-examples ..."))
+  (save-excursion
+    (while (not (eobp))
+      (re-search-forward "^ +[^ \n]" (point-max) "to_end")
+      (unless (eobp)
+	(beginning-of-line)
+	(insert "@example\n")
+	(forward-line 1)
+	(re-search-forward "^[^ ]" (point-max) "to_end")
+	(beginning-of-line)
+	(insert "@end example\n\n") ))))
+
+(defun d2t-handle-html ()
+  "Deal with all of the html markup in the doc."
+  (and d2t-verbose (message "  Doing d2t-handle-html ..."))
+  (save-excursion
+    (while (not (eobp))
+      (let ((rx (concat "^" (regexp-quote "^")
+			" *\\(<?\\)\\([^ \n]+\\)" )))
+	(re-search-forward rx (point-max) "to_end")
+	(unless (eobp)
+	  (let ((bracket (match-string 1))
+		(tag (match-string 2))
+		(eol  (save-excursion (end-of-line) (point-marker))))
+	    (beginning-of-line)
+	    (cond
+	     ;; comment out images
+	     ((and (string= bracket "<") (string= tag "img"))
+	      (insert "@c "))
+	     ;; tyepset anchors
+	     ((and (string= bracket "<") (string-match "^/?a" tag))
+	      ;(insert "@c fix me!!  ")
+	      (beginning-of-line)
+	      (if (looking-at (concat "\\^\\s-*<a\\s-+href=" ; opening tag
+				      "\"\\([^\"]+\\)\">\\s-*" ; url
+				      "\\([^<]+\\)" ; text
+				      "[ \t]*\\^?</a>" ; closing tag
+				      ))
+		  (replace-match (concat "@uref{"
+					 (match-string 1)
+					 ","
+					 (remove* ?^ (match-string 2)
+						  :test 'char-equal)
+					 "}"))))
+	     ;; translate <ul> </ul> to @itemize environment
+	     ((and (string= bracket "<") (string-match "^ul" tag))
+	      (delete-region (point) eol)
+	      (insert "\n@itemize @bullet"))
+	     ((and (string= bracket "<") (string-match "/ul" tag))
+	      (delete-region (point) eol)
+	      (insert "@end itemize\n"))
+	     ;; list items
+	     ((and (string= bracket "<") (string-match "^li" tag))
+	      (delete-char 5)
+	      (delete-horizontal-space)
+	      (insert "@item\n"))
+	     ;; fix up a few miscellaneous things
+	     (t ;;(looking-at ".*Terminal Types")
+	      (insert "@c ")) )
+	    (forward-line))) ))))
+
+
+(defvar d2t-dont-make-ref
+  "^fit f\(x\)\\|gnuplot\\|help\\s-+plotting")
+(defun d2t-make-refs ()
+  "Make cross-references in the text."
+  (and d2t-verbose (message "  Doing d2t-make-refs ..."))
+  (let ((big-alist (append d2t-level-1-alist
+			   d2t-level-2-alist
+			   d2t-level-3-alist
+			   d2t-level-4-alist)))
+    (save-excursion
+      (while (not (eobp))
+	(re-search-forward "\\(`\\([^`]+\\)`\\)" (point-max) "to_end")
+	(unless (eobp)
+	  (let* ((b (match-beginning 1))
+		 (e (match-end 1))
+		 (list (split-string (match-string 2)))
+		 (last (car (reverse list)))
+		 (text (concat "@ref{" last "}")))
+	    ;;(message "%s %s" (match-string 1) last)
+	    (when (and (equal t (try-completion last big-alist))
+		       (not (string= last "gnuplot")))
+	      (delete-region b e)
+	      (insert text))))
+	))))
+
+;;; doc2texi.el ends here
diff -urN gnuplot-3.7/docs/doc2texi.pl gnuplot-3.7.1/docs/doc2texi.pl
--- gnuplot-3.7/docs/doc2texi.pl	Wed Apr 15 20:16:44 1998
+++ gnuplot-3.7.1/docs/doc2texi.pl	Wed Apr 15 20:16:44 1998
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 #
-# $Id: doc2texi.pl,v 1.5 1996/12/08 12:29:25 drd Exp $
+# $Id: doc2texi.pl,v 1.1.1.1 1998/04/15 19:16:44 lhecking Exp $
 #
 # doc2texi.pl : Converts Gnuplot .doc files to Texinfo format.
 #
diff -urN gnuplot-3.7/docs/doc2x.h gnuplot-3.7.1/docs/doc2x.h
--- gnuplot-3.7/docs/doc2x.h	Tue Nov  3 12:47:36 1998
+++ gnuplot-3.7.1/docs/doc2x.h	Tue Nov  3 12:47:36 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: doc2x.h,v 1.3 1998/11/03 12:47:36 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/docs/gnuplot.doc gnuplot-3.7.1/docs/gnuplot.doc
--- gnuplot-3.7/docs/gnuplot.doc	Tue Dec 22 19:43:00 1998
+++ gnuplot-3.7.1/docs/gnuplot.doc	Wed Oct 27 11:10:16 1999
@@ -1,4 +1,4 @@
-C RCS $Id: gnuplot.doc,v 1.64 1998/06/18 14:59:14 ddenholm Exp $
+C RCS $Id: gnuplot.doc,v 1.20.2.3 1999/10/27 10:10:16 lhecking Exp $
 C 3 December 1998
 C Copyright (C) 1986 - 1993, 1998   Thomas Williams, Colin Kelley
 C
@@ -129,7 +129,7 @@
 
  The new `gnuplot` user should begin by reading about `plotting` (if on-line,
  type `help plotting`).
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/simple/simple.html"> Simple Plots Demo </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/simple.html"> Simple Plots Demo </a>
 2 Seeking-assistance
 ?seeking-assistance
  There is a mailing list for `gnuplot` users.  Note, however, that the
@@ -158,12 +158,13 @@
 ^ </a>
 
  Before seeking help, please check the
-^ <a href="http://www.uni-karlsruhe.de/~ig25/gnuplot-faq.html">
+^ <a href="http://www.ucc.ie/gnuplot/gnuplot-faq.html">
  FAQ (Frequently Asked Questions) list.
 ^ </a>
  If you do not have a copy of the FAQ, you may request a copy by email from
  the Majordomo address above, ftp a copy from
-       ftp://ftp.dartmouth.edu/pub/gnuplot
+       ftp://ftp.ucc.ie/pub/gnuplot/faq,
+       ftp://ftp.gnuplot.vt.edu/pub/gnuplot/faq,
  or see the WWW `gnuplot` page.
 
  When posting a question, please include full details of the version of
@@ -184,7 +185,7 @@
 
  3. `set timefmt` allows for the use of dates as input and output for time
  series plots.  See `Time/Date data` and
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/timefmt/timefmt.html">
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/timedat.html">
  timedat.dem.
 ^ </a>
 
@@ -529,8 +530,8 @@
 #\mbox{imag}(x)^{2}}}$ \\
 %abs(x)@any@absolute value of $x$, $|x|$; same type
 %abs(x)@complex@length of $x$, $sqrt{roman real (x) sup 2 + roman imag (x) sup 2}$
- The `abs` function returns the absolute value of its argument.  The returned
- value is of the same type as the argument.
+ The `abs(x)` function returns the absolute value of its argument.  The
+ returned value is of the same type as the argument.
 
  For complex arguments, abs(x) is defined as the length of x in the complex
  plane [i.e.,  sqrt(real(x)**2 + imag(x)**2) ].
@@ -540,24 +541,24 @@
 ?acos
 #acos(x) & any  & $\cos^{-1} x$ (inverse cosine) \\
 %acos(x)@any@$cos sup -1 x$ (inverse cosine)
- The `acos` function returns the arc cosine (inverse cosine) of its argument.
- `acos` returns its argument in radians or degrees, as selected by `set
- angles`.
+ The `acos(x)` function returns the arc cosine (inverse cosine) of its
+ argument.  `acos` returns its argument in radians or degrees, as selected by
+ `set angles`.
 4 acosh
 ?expressions functions acosh
 ?functions acosh
 ?acosh
 #acosh(x) & any  & $\cosh^{-1} x$ (inverse hyperbolic cosine) in radians \\
 %acosh(x)@any@$cosh sup -1 x$ (inverse hyperbolic cosine) in radians
- The `acosh` function returns the inverse hyperbolic cosine of its argument in
- radians.
+ The `acosh(x)` function returns the inverse hyperbolic cosine of its argument
+ in radians.
 4 arg
 ?expressions functions arg
 ?functions arg
 ?arg
 #arg(x) & complex & the phase of $x$ \\
 %arg(x)@complex@the phase of $x$
- The `arg` function returns the phase of a complex number in radians or
+ The `arg(x)` function returns the phase of a complex number in radians or
  degrees, as selected by `set angles`.
 4 asin
 ?expressions functions asin
@@ -565,7 +566,7 @@
 ?asin
 #asin(x) & any  & $\sin^{-1} x$ (inverse sin) \\
 %asin(x)@any@$sin sup -1 x$ (inverse sin)
- The `asin` function returns the arc sin (inverse sin) of its argument.
+ The `asin(x)` function returns the arc sin (inverse sin) of its argument.
  `asin` returns its argument in radians or degrees, as selected by `set
  angles`.
 4 asinh
@@ -574,7 +575,7 @@
 ?asinh
 #asinh(x) & any  & $\sinh^{-1} x$ (inverse hyperbolic sin) in radians \\
 %asinh(x)@any@$sinh sup -1 x$ (inverse hyperbolic sin) in radians
- The `asinh` function returns the inverse hyperbolic sin of its argument in
+ The `asinh(x)` function returns the inverse hyperbolic sin of its argument in
  radians.
 4 atan
 ?expressions functions atan
@@ -582,7 +583,7 @@
 ?atan
 #atan(x) & any  & $\tan^{-1} x$ (inverse tangent) \\
 %atan(x)@any@$tan sup -1 x$ (inverse tangent)
- The `atan` function returns the arc tangent (inverse tangent) of its
+ The `atan(x)` function returns the arc tangent (inverse tangent) of its
  argument.  `atan` returns its argument in radians or degrees, as selected by
  `set angles`.
 4 atan2
@@ -591,24 +592,24 @@
 ?atan2
 #atan2(y,x) & int or real & $\tan^{-1} (y/x)$ (inverse tangent) \\
 %atan2(y,x)@int or real@$tan sup -1 (y/x)$ (inverse tangent)
- The `atan2` function returns the arc tangent (inverse tangent) of the ratio
- of the real parts of its arguments.  `atan2` returns its argument in radians
- or degrees, as selected by `set angles`, in the correct quadrant.
+ The `atan2(y,x)` function returns the arc tangent (inverse tangent) of the
+ ratio of the real parts of its arguments.  `atan2` returns its argument in
+ radians or degrees, as selected by `set angles`, in the correct quadrant.
 4 atanh
 ?expressions functions atanh
 ?functions atanh
-?atan
+?atanh
 #atanh(x) & any  & $\tanh^{-1} x$ (inverse hyperbolic tangent) in radians \\
 %atanh(x)@any@$tanh sup -1 x$ (inverse hyperbolic tangent) in radians
- The `atanh` function returns the inverse hyperbolic tangent of its argument
- in radians.
+ The `atanh(x)` function returns the inverse hyperbolic tangent of its
+ argument in radians.
 4 besj0
 ?expressions functions besj0
 ?functions besj0
 ?besj0
 #besj0(x) & int or real &  $j_{0}$ Bessel function of $x$, in radians \\
 %besj0(x)@int or real@$j sub 0$ Bessel function of $x$, in radians
- The `besj0` function returns the j0th Bessel function of its argument.
+ The `besj0(x)` function returns the j0th Bessel function of its argument.
  `besj0` expects its argument to be in radians.
 4 besj1
 ?expressions functions besj1
@@ -616,7 +617,7 @@
 ?besj1
 #besj1(x) & int or real & $j_{1}$ Bessel function of $x$, in radians \\
 %besj1(x)@int or real@$j sub 1$ Bessel function of $x$, in radians
- The `besj1` function returns the j1st Bessel function of its argument.
+ The `besj1(x)` function returns the j1st Bessel function of its argument.
  `besj1` expects its argument to be in radians.
 4 besy0
 ?expressions functions besy0
@@ -632,7 +633,7 @@
 ?besy1
 #besy1(x) & int or real & $y_{1}$ Bessel function of $x$, in radians \\
 %besy1(x)@int or real@$y sub 1$ Bessel function of $x$, in radians
- The `besy1` function returns the y1st Bessel function of its argument.
+ The `besy1(x)` function returns the y1st Bessel function of its argument.
  `besy1` expects its argument to be in radians.
 4 ceil
 ?expressions functions ceil
@@ -641,7 +642,7 @@
 #ceil(x) & any & $\lceil x \rceil$, smallest integer not less than $x$
 #(real part) \\
 %ceil(x)@any@$left ceiling x right ceiling$, smallest integer not less than $x$ (real part)
- The `ceil` function returns the smallest integer that is not less than its
+ The `ceil(x)` function returns the smallest integer that is not less than its
  argument.  For complex numbers, `ceil` returns the smallest integer not less
  than the real part of its argument.
 4 cos
@@ -650,7 +651,7 @@
 ?cos
 #cos(x) & any & $\cos x$, cosine of $x$ \\
 %cos(x)@radians@$cos~x$, cosine of $x$
- The `cos` function returns the cosine of its argument.  `cos` accepts its
+ The `cos(x)` function returns the cosine of its argument.  `cos` accepts its
  argument in radians or degrees, as selected by `set angles`.
 4 cosh
 ?expressions functions cosh
@@ -658,7 +659,7 @@
 ?cosh
 #cosh(x) & any & $\cosh x$, hyperbolic cosine of $x$ in radians \\
 %cosh(x)@any@$cosh~x$, hyperbolic cosine of $x$ in radians
- The `cosh` function returns the hyperbolic cosine of its argument.  `cosh`
+ The `cosh(x)` function returns the hyperbolic cosine of its argument.  `cosh`
  expects its argument to be in radians.
 4 erf
 ?expressions functions erf
@@ -666,7 +667,7 @@
 ?erf
 #erf(x) & any & $\mbox{erf}(\mbox{real}(x))$,  error function of real($x$) \\
 %erf(x)@any@$erf ( roman real (x))$, error function of real ($x$)
- The `erf` function returns the error function of the real part of its
+ The `erf(x)` function returns the error function of the real part of its
  argument.  If the argument is a complex value, the imaginary component is
  ignored.
 4 erfc
@@ -675,8 +676,8 @@
 ?erfc
 #erfc(x) & any & $\mbox{erfc}(\mbox{real}(x))$,  1.0 - error function of real($x$) \\
 %erfc(x)@any@$erfc ( roman real (x))$, 1.0 - error function of real ($x$)
- The `erfc` function returns 1.0 - the error function of the real part of its
- argument.  If the argument is a complex value, the imaginary component is
+ The `erfc(x)` function returns 1.0 - the error function of the real part of
+ its argument.  If the argument is a complex value, the imaginary component is
  ignored.
 4 exp
 ?expressions functions exp
@@ -684,7 +685,7 @@
 ?exp
 #exp(x) & any & $e^{x}$,  exponential function of $x$ \\
 %exp(x)@any@$e sup x$, exponential function of $x$
- The `exp` function returns the exponential function of its argument (`e`
+ The `exp(x)` function returns the exponential function of its argument (`e`
  raised to the power of its argument).  On some implementations (notably
  suns), exp(-x) returns undefined for very large x.  A user-defined function
  like safe(x) = x<-100 ? 0 : exp(x) might prove useful in these cases.
@@ -695,7 +696,7 @@
 #floor(x) & any & $\lfloor x \rfloor$,  largest integer not greater
 #than $x$ (real part) \\
 %floor(x)@any@$left floor x right floor$, largest integer not greater than $x$ (real part)
- The `floor` function returns the largest integer not greater than its
+ The `floor(x)` function returns the largest integer not greater than its
  argument.  For complex numbers, `floor` returns the largest integer not
  greater than the real part of its argument.
 4 gamma
@@ -704,7 +705,7 @@
 ?gamma
 #gamma(x) & any & $\mbox{gamma}(\mbox{real}(x))$,  gamma function of real($x$) \\
 %gamma(x)@any@$GAMMA ( roman real (x))$, gamma function of real ($x$)
- The `gamma` function returns the gamma function of the real part of its
+ The `gamma(x)` function returns the gamma function of the real part of its
  argument.  For integer n, gamma(n+1) = n!.  If the argument is a complex
  value, the imaginary component is ignored.
 4 ibeta
@@ -713,16 +714,16 @@
 ?ibeta
 #ibeta(p,q,x) & any & $\mbox{ibeta}(\mbox{real}(p,q,x))$,  ibeta function of real($p$,$q$,$x$) \\
 %ibeta(p,q,x)@any@$ibeta ( roman real (p,q,x))$, ibeta function of real ($p$,$q$,$x$)
- The `ibeta` function returns the incomplete beta function of the real parts
- of its arguments. p, q > 0 and x in [0:1].  If the arguments are complex,
- the imaginary components are ignored.
+ The `ibeta(p,q,x)` function returns the incomplete beta function of the real
+ parts of its arguments. p, q > 0 and x in [0:1].  If the arguments are
+ complex, the imaginary components are ignored.
 4 inverf
 ?expressions functions inverf
 ?functions inverf
 ?inverf
 #inverf(x) & any &  inverse error function of real($x$)  \\
 %inverf(x)@any@inverse error function real($x$)
- The `inverf` function returns the inverse error function of the real part
+ The `inverf(x)` function returns the inverse error function of the real part
  of its argument.
 4 igamma
 ?expressions functions igamma
@@ -730,7 +731,7 @@
 ?igamma
 #igamma(a,x) & any & $\mbox{igamma}(\mbox{real}(a,x))$,  igamma function of real($a$,$x$) \\
 %igamma(a,x)@any@$igamma ( roman real (a,x))$, igamma function of real ($a$,$x$)
- The `igamma` function returns the incomplete gamma function of the real
+ The `igamma(a,x)` function returns the incomplete gamma function of the real
  parts of its arguments.  a > 0 and x >= 0.  If the arguments are complex,
  the imaginary components are ignored.
 4 imag
@@ -739,7 +740,7 @@
 ?imag
 #imag(x) & complex &  imaginary part of $x$ as a real number \\
 %imag(x)@complex@imaginary part of $x$ as a real number
- The `imag` function returns the imaginary part of its argument as a real
+ The `imag(x)` function returns the imaginary part of its argument as a real
  number.
 4 invnorm
 ?expressions functions invnorm
@@ -747,7 +748,7 @@
 ?invnorm
 #invnorm(x) & any &  inverse normal distribution function of real($x$)  \\
 %invnorm(x)@any@inverse normal distribution function real($x$)
- The `invnorm` function returns the inverse normal distribution function of
+ The `invnorm(x)` function returns the inverse normal distribution function of
  the real part of its argument.
 4 int
 ?expressions functions int
@@ -755,7 +756,7 @@
 ?int
 #int(x) & real &  integer part of $x$, truncated toward zero \\
 %int(x)@real@integer part of $x$, truncated toward zero
- The `int` function returns the integer part of its argument, truncated
+ The `int(x)` function returns the integer part of its argument, truncated
  toward zero.
 4 lgamma
 ?expressions functions lgamma
@@ -763,7 +764,7 @@
 ?lgamma
 #lgamma(x) & any & $\mbox{lgamma}(\mbox{real}(x))$,  lgamma function of real($x$) \\
 %lgamma(x)@any@$lgamma ( roman real (x))$, lgamma function of real ($x$)
- The `lgamma` function returns the natural logarithm of the gamma function
+ The `lgamma(x)` function returns the natural logarithm of the gamma function
  of the real part of its argument.  If the argument is a complex value, the
  imaginary component is ignored.
 4 log
@@ -772,21 +773,22 @@
 ?log
 #log(x) & any & $\log_{e} x$,  natural logarithm (base $e$) of $x$ \\
 %log(x)@any@$ln~x$, natural logarithm (base $e$) of $x$
- The `log` function returns the natural logarithm (base `e`) of its argument.
+ The `log(x)` function returns the natural logarithm (base `e`) of its
+ argument.
 4 log10
 ?expressions functions log10
 ?functions log10
 ?log10
 #log10(x) & any & $\log_{10} x$,  logarithm (base $10$) of $x$ \\
 %log10(x)@any@${log sub 10}~x$, logarithm (base $10$) of $x$
- The `log10` function returns the logarithm (base 10) of its argument.
+ The `log10(x)` function returns the logarithm (base 10) of its argument.
 4 norm
 ?expressions functions norm
 ?functions norm
 ?norm
 #norm(x) & any & normal distribution (Gaussian) function of real($x$) \\
 %norm(x)@any@$norm(x)$, normal distribution function of real($x$)
- The `norm` function returns the normal distribution function (or Gaussian)
+ The `norm(x)` function returns the normal distribution function (or Gaussian)
  of the real part of its argument.
 4 rand
 ?expressions functions rand
@@ -794,7 +796,7 @@
 ?rand
 #rand(x) & any & $\mbox{rand}(\mbox{real}(x))$,  pseudo random number generator \\
 %rand(x)@any@$rand ( roman real (x))$, pseudo random number generator
- The `rand` function returns a pseudo random number in the interval [0:1]
+ The `rand(x)` function returns a pseudo random number in the interval [0:1]
  using the real part of its argument as a seed.  If seed < 0, the sequence
  is (re)initialized.  If the argument is a complex value, the imaginary
  component is ignored.
@@ -804,23 +806,23 @@
 ?real
 #real(x) & any &  real part of $x$ \\
 %real(x)@any@real part of $x$
- The `real` function returns the real part of its argument.
+ The `real(x)` function returns the real part of its argument.
 4 sgn
 ?expressions functions sgn
 ?functions sgn
 ?sgn
 #sgn(x) & any & 1 if $x>0$, -1 if $x<0$, 0 if $x=0$. imag($x$) ignored \\
 %sgn(x)@any@1 if $x > 0$, -1 if $x < 0$, 0 if $x = 0$. $roman imag (x)$ ignored
- The `sgn` function returns 1 if its argument is positive, -1 if its argument
- is negative, and 0 if its argument is 0.  If the argument is a complex value,
- the imaginary component is ignored.
+ The `sgn(x)` function returns 1 if its argument is positive, -1 if its
+ argument is negative, and 0 if its argument is 0.  If the argument is a
+ complex value, the imaginary component is ignored.
 4 sin
 ?expressions functions sin
 ?functions sin
 ?sin
 #sin(x) & any & $\sin x$, sine of $x$ \\
 %sin(x)@any@$sin~x$, sine of $x$
- The `sin` function returns the sine of its argument.  `sin` expects its
+ The `sin(x)` function returns the sine of its argument.  `sin` expects its
  argument to be in radians or degrees, as selected by `set angles`.
 4 sinh
 ?expressions functions sinh
@@ -828,7 +830,7 @@
 ?sinh
 #sinh(x) & any & $\sinh x$, hyperbolic sine $x$ in radians \\
 %sinh(x)@any@$sinh~x$, hyperbolic sine $x$ in radians
- The `sinh` function returns the hyperbolic sine of its argument.  `sinh`
+ The `sinh(x)` function returns the hyperbolic sine of its argument.  `sinh`
  expects its argument to be in radians.
 4 sqrt
 ?expressions functions sqrt
@@ -836,14 +838,14 @@
 ?sqrt
 #sqrt(x) & any & $\sqrt{x}$,  square root of $x$ \\
 %sqrt(x)@any@$sqrt x $, square root of $x$
- The `sqrt` function returns the square root of its argument.
+ The `sqrt(x)` function returns the square root of its argument.
 4 tan
 ?expressions functions tan
 ?functions tan
 ?tan
 #tan(x) & any & $\tan x$,  tangent of $x$ \\
 %tan(x)@any@$tan~x$, tangent of $x$
- The `tan` function returns the tangent of its argument.  `tan` expects
+ The `tan(x)` function returns the tangent of its argument.  `tan` expects
  its argument to be in radians or degrees, as selected by `set angles`.
 4 tanh
 ?expressions functions tanh
@@ -851,7 +853,7 @@
 ?tanh
 #tanh(x) & any & $\tanh x$, hyperbolic tangent of $x$ in radians\\
 %tanh(x)@any@$tanh~x$, hyperbolic tangent of $x$ in radians
- The `tanh` function returns the hyperbolic tangent of its argument.  `tanh`
+ The `tanh(x)` function returns the hyperbolic tangent of its argument.  `tanh`
  expects its argument to be in radians.
 @end table
 
@@ -940,7 +942,7 @@
  `valid(x)` may be used only in expressions as part of `using` manipulations
  to fits or datafile plots.  See `plot datafile using`.
 @end table
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/airfoil/airfoil.html">Use of functions and complex variables for airfoils </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/airfoil.html">Use of functions and complex variables for airfoils </a>
 3 Operators
 ?expressions operators
 ?operators
@@ -2202,7 +2204,7 @@
        every :::::9     # selects the first 10 blocks
        every 2:2        # selects every other point in every other block
        every ::5::15    # selects points 5 through 15 in each block
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/simple/simple.html">Simple Plot Demos </a>,
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/simple.html">Simple Plot Demos </a>,
 ^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/surfacea/surfacea.html">Non-parametric splot demos </a>, and
 ^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/surfaceb/surfaceb.html">Parametric splot demos.</a>
 4 example datafile
@@ -2250,7 +2252,7 @@
 
  Example:
        plot 'file' index 4:5
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/multimsh/multimsh.html"> splot with indices demo. </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/multimsh.html"> splot with indices demo. </a>
 4 smooth
 ?commands plot datafile smooth
 ?plot datafile smooth
@@ -2357,7 +2359,7 @@
  The `unique` option makes the data monotonic in x; points with the same
  x-value are replaced by a single point having the average y-value.  The
  resulting points are then connected by straight line segments.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/mgr/mgr.html"> See demos. </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/mgr.html"> See demos. </a>
 4 special-filenames
 ?commands plot datafile special-filenames
 ?plot datafile special-filenames
@@ -2570,7 +2572,7 @@
 
  However, if you want to leave text in your data files, it is safer to put the
  comment character (#) in the first column of the text lines.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/using/using.html"> Feeble using demos. </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/using.html"> Feeble using demos. </a>
 3 errorbars
 ?commands plot errorbars
 ?commands splot errorbars
@@ -2642,7 +2644,7 @@
  parametric function has been completed:
 
        plot sin(t),t**2 title 'Parametric example' with linespoints
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/param/param.html"> Parametric Mode Demos. </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/param.html"> Parametric Mode Demos. </a>
 3 ranges
 ?commands plot ranges
 ?commands splot ranges
@@ -2939,7 +2941,7 @@
  set explicitly to guarantee that the five separate graphs (drawn on top of
  each other in multiplot mode) will have exactly the same axes.  The linetype
  must be specified; otherwise all the plots would be drawn with the same type.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/animate/animate.html"> Reread Animation Demo</a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/animate.html"> Reread Animation Demo</a>
 2 reset
 ?commands reset
 ?reset
@@ -3029,7 +3031,7 @@
        y=sinh(x)
        print y         #prints {1.16933, 0.154051}
        print asinh(y)  #prints {57.29578, 5.729578}
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/poldat/poldat.html"> Polar plot using `set angles`. </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/poldat.html"> Polar plot using `set angles`. </a>
 3 arrow
 ?commands set arrow
 ?commands set noarrow
@@ -3216,7 +3218,7 @@
 
  Explicitly setting one or two ranges but not others may lead to unexpected
  results.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/poldat/poldat.html"> See polar demos </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/poldat.html"> See polar demos </a>
 3 bar
 ?commands set bar
 ?commands show bar
@@ -3292,7 +3294,10 @@
 
  Using the optional <line_style>, <line_type> and <line_width>
  specifiers, the way the border lines are drawn can be influenced
- (limited by what the current terminal driver supports).
+ (limited by what the current terminal driver supports).  By default,
+ the border is drawn with twice the usual linewidth.  The <line_width>
+ specifier scales this default value; for example, `set border 15 lw 2`
+ will produce a border with four times the usual linewidth.
 
  Various axes or combinations of axes may be added together in the command.
 
@@ -3513,8 +3518,8 @@
 
  See also `set contour` for control of where the contours are drawn, and `set
  clabel` for control of the format of the contour labels and linetypes.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/contours/contours.html">Contours Demo</a> and
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/discrete/discrete.html">contours with User Defined Levels.</a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/contours.html">Contours Demo</a> and
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/discrete.html">contours with User Defined Levels.</a>
 3 contour
 ?commands set contour
 ?commands set nocontour
@@ -3564,8 +3569,8 @@
 
  If contours are desired from non-grid data, `set dgrid3d` can be used to
  create an appropriate grid.  See `set dgrid3d` for more information.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/contours/contours.html">Contours Demo</a> and
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/discrete/discrete.html">contours with User Defined Levels.</a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/contours.html">Contours Demo</a> and
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/discrete.html">contours with User Defined Levels.</a>
 3 data style
 ?commands set data style
 ?commands show data style
@@ -3641,7 +3646,7 @@
  The first specifies that a grid of size 10 by 10 is to be constructed using
  a norm value of 1 in the weight computation.  The second only modifies the
  norm, changing it to 4.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/scatter/scatter.html"> Dgrid3d Demo.</a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/scatter.html"> Dgrid3d Demo.</a>
 
 3 dummy
 ?commands set dummy
@@ -3727,7 +3732,7 @@
  after each number.  If you want "%" itself, double it: "%g %%".
 
  See also `set xtics` for more information about tic labels.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/electron/electron.html"> See demo. </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/electron.html"> See demo. </a>
 4 format specifiers
 ?commands set format specifiers
 ?set format specifiers
@@ -3948,8 +3953,8 @@
 
  For information about the definition and usage of functions in `gnuplot`,
  please see `expressions`.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/spline/spline.html"> Splines as User Defined Functions.</a>
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/airfoil/airfoil.html">Use of functions and complex variables for airfoils </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/spline.html"> Splines as User Defined Functions.</a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/airfoil.html">Use of functions and complex variables for airfoils </a>
 3 grid
 ?commands set grid
 ?commands set nogrid
@@ -3992,6 +3997,10 @@
  If no linetype is specified for the minor gridlines, the same linetype as the
  major gridlines is used.  The default polar angle is 30 degrees.
 
+ By default, grid lines are drawn with half the usual linewidth. The major and
+ minor linewidth specifiers scale this default value; for example, `set grid
+ lw .5` will draw grid lines with one quarter the usual linewidth.
+
  Z grid lines are drawn on the back of the plot.  This looks better if a
  partial box is drawn around the plot---see `set border`.
 3 hidden3d
@@ -4100,8 +4109,8 @@
  normally, making the resulting display hard to understand.  Therefore, the
  default option of `bentover` will turn it visible in this case.  If you don't
  want that, you may choose `nobentover` instead.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/hidden/hidden.html"> Hidden Line Removal Demo</a> and
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/singulr/singulr.html"> Complex Hidden Line Demo. </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/hidden.html"> Hidden Line Removal Demo</a> and
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/singulr.html"> Complex Hidden Line Demo. </a>
 3 isosamples
 ?commands set isosamples
 ?commands show isosamples
@@ -4482,17 +4491,15 @@
  necessary if the data in the file are not in the required order.
 
  `mapping` has no effect on `plot`.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/world/world.html">Mapping Demos.</a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/world.html">Mapping Demos.</a>
 3 margin
 ?commands set margin
 ?commands show margin
 ?set margin
 ?show margin
 ?margin
- Normally the margins of a plot are automatically calculated based on tics
- and axis labels (and the size of the graph correspondingly adjusted.)  These
- computed values can be overridden by the `set margin` commands.  `show margin`
- shows the current settings.
+ The computed margins can be overridden by the `set margin` commands.  `show
+ margin` shows the current settings.
 
  Syntax:
        set bmargin {<margin>}
@@ -4504,6 +4511,14 @@
  The units of <margin> are character heights or widths, as appropriate.  A
  positive value defines the absolute size of the margin.  A negative value
  (or none) causes `gnuplot` to revert to the computed value.
+
+ Normally the margins of a plot are automatically calculated based on tics,
+ tic labels, axis labels, the plot title, the timestamp and the size of the
+ key if it is outside the borders.  If, however, tics are attached to the
+ axes (`set xtics axis`, for example), neither the tics themselves nor their
+ labels will be included in either the margin calculation or the calculation
+ of the positions of other text to be written in the margin.  This can lead
+ to tic labels overwriting other text if the axis is very close to the border.
 3 missing
 ?commands set missing
 ?set missing
@@ -4583,7 +4598,7 @@
  in character units, so the appearance of the graph in the remaining space
  will depend on the screen size of the display device, e.g., perhaps quite
  different on a video display and a printer.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/multiplot/multiplt.html"> See demo. </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/multiplt.html"> See demo. </a>
 3 mx2tics
 ?commands set mx2tics
 ?commands set nomx2tics
@@ -4876,8 +4891,8 @@
 
  You may want to `set size square` to have `gnuplot` try to make the aspect
  ratio equal to unity, so that circles look circular.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/polar/polar.html">Polar demos </a>
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/poldat/poldat.html">Polar Data Plot. </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/polar.html">Polar demos </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/poldat.html">Polar Data Plot. </a>
 3 rmargin
 ?commands set rmargin
 ?set rmargin
@@ -4975,7 +4990,7 @@
  To make the graph twice as high as wide use:
        set size ratio 2
 
-^<a href="http://www.nas.nasa.gov/~woo/gnuplot/airfoil/airfoil.html"> See demo. </a>
+^<a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/airfoil.html"> See demo. </a>
 3 style
 ?commands set function style
 ?commands show function style
@@ -5126,7 +5141,7 @@
  The `fsteps` style is only relevant to 2-d plotting.  It connects consecutive
  points with two line segments: the first from (x1,y1) to (x1,y2) and the
  second from (x1,y2) to (x2,y2).
-^<a href="http://www.nas.nasa.gov/~woo/gnuplot/steps/steps.html"> See demo. </a>
+^<a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/steps.html"> See demo. </a>
 4 histeps
 ?commands set style histeps
 ?set style histeps
@@ -5141,7 +5156,7 @@
 
  If `autoscale` is in effect, it selects the xrange from the data rather than
  the steps, so the end points will appear only half as wide as the others.
-^<a href="http://www.nas.nasa.gov/~woo/gnuplot/steps/steps.html"> See demo. </a>
+^<a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/steps.html"> See demo. </a>
 
  `histeps` is only a plotting style; `gnuplot` does not have the ability to
  create bins and determine their population from some data set.
@@ -5189,7 +5204,7 @@
  The `steps` style is only relevant to 2-d plotting.  It connects consecutive
  points with two line segments: the first from (x1,y1) to (x2,y1) and the
  second from (x2,y1) to (x2,y2).
-^<a href="http://www.nas.nasa.gov/~woo/gnuplot/steps/steps.html"> See demo. </a>
+^<a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/steps.html"> See demo. </a>
 4 vector
 ?commands set style vector
 ?set style vector
@@ -5474,7 +5489,7 @@
  tells `gnuplot` to read date and time separated by tab.  (But look closely at
  your data---what began as a tab may have been converted to spaces somewhere
  along the line; the format string must match what is actually in the file.)
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/timedat/timedat.html"> Time Data Demo </a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/timedat.html"> Time Data Demo </a>
 3 title
 ?commands set title
 ?commands show title
@@ -5903,20 +5918,26 @@
  The same syntax applies to `ytics`, `ztics`, `x2tics` and `y2tics`.
 
  `axis` or `border` tells `gnuplot` to put the tics (both the tics themselves
- and the accompanying labels) along the axis or the border, respectively.
- `mirror` tells it to put unlabelled tics at the same positions on the
- opposite border.  `nomirror` does what you think it does.  `rotate` asks
- `gnuplot` to rotate the text through 90 degrees, if the underlying terminal
- driver supports text rotation.  `norotate` cancels this.  The defaults are
- `border mirror norotate` for tics on the x and y axes, and `border nomirror
- norotate` for tics on the x2 and y2 axes.  For the z axis, the the `{axis |
- border}` option is not available and the default is `nomirror`.  If you do
- want to mirror the z-axis tics, you might want to create a bit more room for
- them with `set border`.
-
- `set xtics` with no options restores the default border if xtics are not
- being displayed;  otherwise it has no effect.  Any previously specified
- tic frequency or position {and labels} are retained.
+ and the accompanying labels) along the axis or the border, respectively.  If
+ the axis is very close to the border, the `axis` option can result in tic
+ labels overwriting other text written in the margin.
+
+ `mirror` tells `gnuplot` to put unlabelled tics at the same positions on the
+ opposite border.  `nomirror` does what you think it does.
+
+ `rotate` asks `gnuplot` to rotate the text through 90 degrees, which will be
+ done if the terminal driver in use supports text rotation.  `norotate`
+ cancels this.
+
+ The defaults are `border mirror norotate` for tics on the x and y axes, and
+ `border nomirror norotate` for tics on the x2 and y2 axes.  For the z axis,
+ the the `{axis | border}` option is not available and the default is
+ `nomirror`.  If you do want to mirror the z-axis tics, you might want to
+ create a bit more room for them with `set border`.
+
+ `set xtics` with no options restores the default border or axis if xtics are
+ being displayed;  otherwise it has no effect.  Any previously specified tic
+ frequency or position {and labels} are retained.
 
  Positions of the tics are calculated automatically by default or if the
  `autofreq` option is given; otherwise they may be specified in either of
@@ -6384,7 +6405,7 @@
  The `index` keyword is not supported, since the file format allows only one
  surface per file.  The `every` and `using` filters are supported.  `using`
  operates as if the data were read in the above triplet form.
-^ <a href="http://www.nas.nasa.gov/~woo/gnuplot/binary/binary.html">Binary File Splot Demo.</a>
+^ <a href="http://www.gnuplot.vt.edu/gnuplot/gpdocs/binary.html">Binary File Splot Demo.</a>
 4 example datafile
 ?commands splot datafile example
 ?splot datafile example
diff -urN gnuplot-3.7/docs/gnuplot.texi gnuplot-3.7.1/docs/gnuplot.texi
--- gnuplot-3.7/docs/gnuplot.texi	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/docs/gnuplot.texi	Wed Oct 27 11:54:42 1999
@@ -0,0 +1,11148 @@
+\input texinfo   @c -*-texinfo-*-
+
+@c %**start of header
+@setfilename gnuplot.info
+@settitle Gnuplot: An Interactive Plotting Program
+@setchapternewpage odd
+@c %**end of header
+
+@c define the command and options indeces
+@defindex cm
+@defindex op
+@defindex tm
+
+@direntry
+* GNUPLOT: (gnuplot).             An Interactive Plotting Program
+@end direntry
+
+@ifnottex
+@node Top, gnuplot, (dir), (dir)
+@top Master Menu
+@end ifnottex
+
+@example
+                       GNUPLOT
+
+            An Interactive Plotting Program
+             Thomas Williams & Colin Kelley
+          Version 3.7 organized by: David Denholm
+
+ Copyright (C) 1986 - 1993, 1998   Thomas Williams, Colin Kelley
+
+       Mailing list for comments: info-gnuplot@@dartmouth.edu
+     Mailing list for bug reports: bug-gnuplot@@dartmouth.edu
+
+         This manual was prepared by Dick Crawford
+                   3 December 1998
+
+
+Major contributors (alphabetic order):
+@end example
+
+@c ^ <h2> An Interactive Plotting Program </h2><p>
+@c ^ <h2>  Thomas Williams & Colin Kelley</h2><p>
+@c ^ <h2>   Version 3.7 organized by: David Denholm </h2><p>
+@c ^ <h2>Major contributors (alphabetic order):</h2>
+
+@itemize @bullet
+@item
+Hans-Bernhard Broeker
+@item
+John Campbell
+@item
+Robert Cunningham
+@item
+David Denholm
+@item
+Gershon Elber
+@item
+Roger Fearick
+@item
+Carsten Grammes
+@item
+Lucas Hart
+@item
+Lars Hecking
+@item
+Thomas Koenig
+@item
+David Kotz
+@item
+Ed Kubaitis
+@item
+Russell Lang
+@item
+Alexander Lehmann
+@item
+Alexander Mai
+@item
+Carsten Steger
+@item
+Tom Tkacik
+@item
+Jos Van der Woude
+@item
+James R. Van Zandt
+@item
+Alex Woo
+@end itemize
+
+@c ^<h2>  Copyright (C) 1986 - 1993, 1998   Thomas Williams, Colin Kelley<p>
+@c ^   Mailing list for comments: info-gnuplot@@dartmouth.edu <p>
+@c ^   Mailing list for bug reports: bug-gnuplot@@dartmouth.edu<p>
+@c ^</h2><p>
+@c ^<h3> This manual was prepared by Dick Crawford</h3><p>
+@c ^<h3> 3 December 1998</h3><p>
+@c ^<hr>
+
+@menu
+* gnuplot::                     
+* Commands::                    
+* Graphical_User_Interfaces::   
+* Bugs::                        
+* Concept_Index::               
+* Command_Index::               
+* Options_Index::               
+* Function_Index::              
+* Terminal_Index::              
+@end menu
+
+@node gnuplot, Commands, Top, Top
+@chapter gnuplot
+
+
+@menu
+* Copyright::                   
+* Introduction::                
+* Seeking-assistance::          
+* What's_New_in_version_3.7::   
+* Batch/Interactive_Operation::  
+* Command-line-editing::        
+* Comments::                    
+* Coordinates::                 
+* Environment::                 
+* Expressions::                 
+* Glossary::                    
+* Plotting::                    
+* Start-up::                    
+* Substitution::                
+* Syntax::                      
+* Time/Date_data::              
+@end menu
+
+@node Copyright, Introduction, gnuplot, gnuplot
+@section Copyright
+
+@cindex copyright
+
+@cindex license
+
+@example
+      Copyright (C) 1986 - 1993, 1998   Thomas Williams, Colin Kelley
+
+@end example
+
+Permission to use, copy, and distribute this software and its
+documentation for any purpose with or without fee is hereby granted,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation.
+
+Permission to modify the software is granted, but not the right to
+distribute the complete modified source code.  Modifications are to
+be distributed as patches to the released version.  Permission to
+distribute binaries produced by compiling modified sources is granted,
+provided you
+@example
+  1. distribute the corresponding source modifications from the
+   released version in the form of a patch file along with the binaries,
+  2. add special version identification to distinguish your version
+   in addition to the base release version number,
+  3. provide your name and address as the primary contact for the
+   support of your modified version, and
+  4. retain our contact information in regard to use of the base
+   software.
+@end example
+
+Permission to distribute the released version of the source code along
+with corresponding source modifications in the form of a patch file is
+granted with same provisions 2 through 4 for binary distributions.
+
+This software is provided "as is" without express or implied warranty
+to the extent permitted by applicable law.
+
+
+@example
+      AUTHORS
+
+@end example
+
+@example
+      Original Software:
+         Thomas Williams,  Colin Kelley.
+
+@end example
+
+@example
+      Gnuplot 2.0 additions:
+         Russell Lang, Dave Kotz, John Campbell.
+
+@end example
+
+@example
+      Gnuplot 3.0 additions:
+         Gershon Elber and many others.
+
+@end example
+
+@node Introduction, Seeking-assistance, Copyright, gnuplot
+@section Introduction
+
+@cindex introduction
+
+@c ?
+`gnuplot` is a command-driven interactive function and data plotting program.
+It is case sensitive (commands and function names written in lowercase are
+not the same as those written in CAPS).  All command names may be abbreviated
+as long as the abbreviation is not ambiguous.  Any number of commands may
+appear on a line (with the exception that @ref{load} or @ref{call} must be the final
+command), separated by semicolons (;).  Strings are indicated with quotes.
+They may be either single or double quotation marks, e.g.,
+
+@example
+      load "filename"
+      cd 'dir'
+
+@end example
+
+although there are some subtle differences (see `syntax` for more details).
+
+Any command-line arguments are assumed to be names of files containing
+`gnuplot` commands, with the exception of standard X11 arguments, which are
+processed first.  Each file is loaded with the @ref{load} command, in the order
+specified.  `gnuplot` exits after the last file is processed.  When no load
+files are named, `gnuplot` enters into an interactive mode.  The special
+filename "-" is used to denote standard input.  See "help batch/interactive"
+for more details.
+
+Many `gnuplot` commands have multiple options.  These options must appear in
+the proper order, although unwanted ones may be omitted in most cases.  Thus
+if the entire command is "command a b c", then "command a c" will probably
+work, but "command c a" will fail.
+
+Commands may extend over several input lines by ending each line but the last
+with a backslash (\).  The backslash must be the _last_ character on each
+line.  The effect is as if the backslash and newline were not there.  That
+is, no white space is implied, nor is a comment terminated.  Therefore,
+commenting out a continued line comments out the entire command (see
+`comment`).  But note that if an error occurs somewhere on a multi-line
+command, the parser may not be able to locate precisely where the error is
+and in that case will not necessarily point to the correct line.
+
+In this document, curly braces (@{@}) denote optional arguments and a vertical
+bar (|) separates mutually exclusive choices.  `gnuplot` keywords or @ref{help}
+topics are indicated by backquotes or `boldface` (where available).  Angle
+brackets (<>) are used to mark replaceable tokens.  In many cases, a default
+value of the token will be taken for optional arguments if the token is
+omitted, but these cases are not always denoted with braces around the angle
+brackets.
+
+For on-line help on any topic, type @ref{help} followed by the name of the topic
+or just @ref{help} or `?` to get a menu of available topics.
+
+The new `gnuplot` user should begin by reading about `plotting` (if on-line,
+type `help plotting`).
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/simple.html,Simple Plots Demo }
+
+@node Seeking-assistance, What's_New_in_version_3.7, Introduction, gnuplot
+@section Seeking-assistance
+
+@cindex seeking-assistance
+
+There is a mailing list for `gnuplot` users.  Note, however, that the
+newsgroup
+@example
+      comp.graphics.apps.gnuplot
+@end example
+
+is identical to the mailing list (they both carry the same set of messages).
+We prefer that you read the messages through the newsgroup rather than
+subscribing to the mailing list.  Administrative requests should be sent to
+@example
+      majordomo@@dartmouth.edu
+@end example
+
+Send a message with the body (not the subject) consisting of the single word
+"help" (without the quotes) for more details.
+
+The address for mailing to list members is:
+@example
+      info-gnuplot@@dartmouth.edu
+
+@end example
+
+Bug reports and code contributions should be mailed to:
+@example
+      bug-gnuplot@@dartmouth.edu
+
+@end example
+
+The list of those interested in beta-test versions is:
+@example
+      info-gnuplot-beta@@dartmouth.edu
+
+@end example
+
+There is also a World Wide Web page with up-to-date information, including
+known bugs:
+@uref{http://www.cs.dartmouth.edu/gnuplot_info.html,http://www.cs.dartmouth.edu/gnuplot_info.html
+}
+
+Before seeking help, please check the
+@uref{http://www.ucc.ie/gnuplot/gnuplot-faq.html,FAQ (Frequently Asked Questions) list.
+}
+If you do not have a copy of the FAQ, you may request a copy by email from
+the Majordomo address above, ftp a copy from
+@example
+      ftp://ftp.ucc.ie/pub/gnuplot/faq,
+      ftp://ftp.gnuplot.vt.edu/pub/gnuplot/faq,
+@end example
+
+or see the WWW `gnuplot` page.
+
+When posting a question, please include full details of the version of
+`gnuplot`, the machine, and operating system you are using.  A _small_ script
+demonstrating the problem may be useful.  Function plots are preferable to
+datafile plots.  If email-ing to info-gnuplot, please state whether or not
+you are subscribed to the list, so that users who use news will know to email
+a reply to you.  There is a form for such postings on the WWW site.
+
+@node What's_New_in_version_3.7, Batch/Interactive_Operation, Seeking-assistance, gnuplot
+@section What's New in version 3.7
+
+@cindex new-features
+
+Gnuplot version 3.7 contains many new features.  This section gives a partial
+list and links to the new items in no particular order.
+
+1. `fit f(x) 'file' via` uses the Marquardt-Levenberg method to fit data.
+(This is only slightly different from the `gnufit` patch available for 3.5.)
+
+2. Greatly expanded @ref{using} command.  See @ref{using}.
+
+3. @ref{timefmt} allows for the use of dates as input and output for time
+series plots.  See `Time/Date data` and
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/timedat.html,timedat.dem.
+}
+
+4. Multiline labels and font selection in some drivers.
+
+5. Minor (unlabeled) tics.  See @ref{mxtics}.
+
+6. @ref{key} options for moving the key box in the page (and even outside of the
+plot), putting a title on it and a box around it, and more.  See @ref{key}.
+
+7. Multiplots on a single logical page with @ref{multiplot}.
+
+8. Enhanced `postscript` driver with super/subscripts and font changes.
+(This was a separate driver (`enhpost`) that was available as a patch for
+3.5.)
+
+9. Second axes:  use the top and right axes independently of the bottom and
+left, both for plotting and labels.  See @ref{plot}.
+
+10. Special datafile names `'-'` and `""`.  See @ref{special-filenames}.
+
+11. Additional coordinate systems for labels and arrows.  See `coordinates`.
+
+12. @ref{size} can try to plot with a specified aspect ratio.
+
+13. @ref{missing} now treats missing data correctly.
+
+14. The @ref{call} command: @ref{load} with arguments.
+
+15. More flexible `range` commands with `reverse` and `writeback` keywords.
+
+16. @ref{encoding} for multi-lingual encoding.
+
+17. New `x11` driver with persistent and multiple windows.
+
+18. New plotting styles: @ref{xerrorbars}, @ref{histeps}, @ref{financebars} and more.
+See @ref{style}.
+
+19. New tic label formats, including `"%l %L"` which uses the mantissa and
+exponents to a given base for labels.  See `set format`.
+
+20. New drivers, including `cgm` for inclusion into MS-Office applications
+and `gif` for serving plots to the WEB.
+
+21. Smoothing and spline-fitting options for @ref{plot}.  See @ref{smooth}.
+
+22. @ref{margin} and @ref{origin} give much better control over where a
+graph appears on the page.
+
+23. @ref{border} now controls each border individually.
+
+24. The new commands @ref{if} and @ref{reread} allow command loops.
+
+25. Point styles and sizes, line types and widths can be specified on the
+@ref{plot} command.  Line types and widths can also be specified for grids,
+borders, tics and arrows.  See @ref{with}.  Furthermore these types may be
+combined and stored for further use.  See @ref{linestyle}.
+
+26. Text (labels, tic labels, and the time stamp) can be written vertically
+by those terminals capable of doing so.
+
+@node Batch/Interactive_Operation, Command-line-editing, What's_New_in_version_3.7, gnuplot
+@section Batch/Interactive Operation
+
+@cindex batch/interactive
+
+`gnuplot` may be executed in either batch or interactive modes, and the two
+may even be mixed together on many systems.
+
+Any command-line arguments are assumed to be names of files containing
+`gnuplot` commands (with the exception of standard X11 arguments, which are
+processed first).  Each file is loaded with the @ref{load} command, in the order
+specified.  `gnuplot` exits after the last file is processed.  When no load
+files are named, `gnuplot` enters into an interactive mode.  The special
+filename "-" is used to denote standard input.
+
+Both the @ref{exit} and @ref{quit} commands terminate the current command file and
+@ref{load} the next one, until all have been processed.
+
+Examples:
+
+To launch an interactive session:
+@example
+      gnuplot
+
+@end example
+
+To launch a batch session using two command files "input1" and "input2":
+@example
+      gnuplot input1 input2
+
+@end example
+
+To launch an interactive session after an initialization file "header" and
+followed by another command file "trailer":
+@example
+      gnuplot header - trailer
+
+@end example
+
+@node Command-line-editing, Comments, Batch/Interactive_Operation, gnuplot
+@section Command-line-editing
+
+@cindex line-editing
+
+@cindex editing
+
+@cindex history
+
+@cindex command-line-editing
+
+Command-line editing is supported by the Unix, Atari, VMS, MS-DOS and OS/2
+versions of `gnuplot`.  Also, a history mechanism allows previous commands to
+be edited and re-executed.  After the command line has been edited, a newline
+or carriage return will enter the entire line without regard to where the
+cursor is positioned.
+
+(The readline function in `gnuplot` is not the same as the readline used in
+GNU Bash and GNU Emacs.  If the GNU version is desired, it may be selected
+instead of the `gnuplot` version at compile time.)
+
+
+The editing commands are as follows:
+
+
+@example
+      `Line-editing`:
+
+@end example
+
+@example
+      ^B    moves back a single character.
+      ^F    moves forward a single character.
+      ^A    moves to the beginning of the line.
+      ^E    moves to the end of the line.
+      ^H    and DEL delete the previous character.
+      ^D    deletes the current character.
+      ^K    deletes from current position to the end of line.
+      ^L,^R redraws line in case it gets trashed.
+      ^U    deletes the entire line.
+      ^W    deletes the last word.
+
+@end example
+
+@example
+      `History`:
+
+@end example
+
+@example
+      ^P    moves back through history.
+      ^N    moves forward through history.
+
+@end example
+
+
+On the IBM PC, the use of a TSR program such as DOSEDIT or CED may be desired
+for line editing.  The default makefile assumes that this is the case;  by
+default `gnuplot` will be compiled with no line-editing capability.  If you
+want to use `gnuplot`'s line editing, set READLINE in the makefile and add
+readline.obj to the link file.  The following arrow keys may be used on the
+IBM PC and Atari versions if readline is used:
+
+
+@example
+      Left  Arrow      - same as ^B.
+      Right Arrow      - same as ^F.
+      Ctrl Left  Arrow - same as ^A.
+      Ctrl Right Arrow - same as ^E.
+      Up    Arrow      - same as ^P.
+      Down  Arrow      - same as ^N.
+
+@end example
+
+
+The Atari version of readline defines some additional key aliases:
+
+
+@example
+      Undo            - same as ^L.
+      Home            - same as ^A.
+      Ctrl Home       - same as ^E.
+      Esc             - same as ^U.
+      Help            - @ref{help} plus return.
+      Ctrl Help       - `help `.
+
+@end example
+
+
+@node Comments, Coordinates, Command-line-editing, gnuplot
+@section Comments
+
+@cindex comments
+
+Comments are supported as follows: a `#` may appear in most places in a line
+and `gnuplot` will ignore the rest of the line.  It will not have this effect
+inside quotes, inside numbers (including complex numbers), inside command
+substitutions, etc.  In short, it works anywhere it makes sense to work.
+
+@node Coordinates, Environment, Comments, gnuplot
+@section Coordinates
+
+@cindex coordinates
+
+The commands @ref{arrow}, @ref{key}, and @ref{label} allow you to draw
+something at an arbitrary position on the graph.  This position is specified
+by the syntax:
+
+@example
+      @{<system>@} <x>, @{<system>@} <y> @{,@{<system>@} <z>@}
+
+@end example
+
+Each <system> can either be `first`, `second`, `graph` or `screen`.
+
+`first` places the x, y, or z coordinate in the system defined by the left
+and bottom axes; `second` places it in the system defined by the second axes
+(top and right); `graph` specifies the area within the axes---0,0 is bottom
+left and 1,1 is top right (for splot, 0,0,0 is bottom left of plotting area;
+use negative z to get to the base---see @ref{ticslevel}); and `screen`
+specifies the screen area (the entire area---not just the portion selected by
+@ref{size}), with 0,0 at bottom left and 1,1 at top right.
+
+If the coordinate system for x is not specified, `first` is used.  If the
+system for y is not specified, the one used for x is adopted.
+
+If one (or more) axis is timeseries, the appropriate coordinate should
+be given as a quoted time string according to the @ref{timefmt} format string.
+See @ref{xdata} and @ref{timefmt}.  `gnuplot` will also accept an integer
+expression, which will be interpreted as seconds from 1 January 2000.
+
+@node Environment, Expressions, Coordinates, gnuplot
+@section Environment
+
+@cindex environment
+
+A number of shell environment variables are understood by `gnuplot`.  None of
+these are required, but may be useful.
+
+If GNUTERM is defined, it is used as the name of the terminal type to be
+used.  This overrides any terminal type sensed by `gnuplot` on start-up, but
+is itself overridden by the .gnuplot (or equivalent) start-up file (see
+`start-up`) and, of course, by later explicit changes.
+
+On Unix, AmigaOS, AtariTOS, MS-DOS and OS/2, GNUHELP may be defined to be the
+pathname of the HELP file (gnuplot.gih).
+
+On VMS, the logical name GNUPLOT$HELP should be defined as the name of the
+help library for `gnuplot`.  The `gnuplot` help can be put inside any system
+help library, allowing access to help from both within and outside `gnuplot`
+if desired.
+
+On Unix, HOME is used as the name of a directory to search for a .gnuplot
+file if none is found in the current directory.  On AmigaOS, AtariTOS,
+MS-DOS and OS/2, gnuplot is used.  On VMS, SYS$LOGIN: is used. See `help
+start-up`.
+
+On Unix, PAGER is used as an output filter for help messages.
+
+On Unix, AtariTOS and AmigaOS, SHELL is used for the @ref{shell} command.  On
+MS-DOS and OS/2, COMSPEC is used for the @ref{shell} command.
+
+On MS-DOS, if the BGI or Watcom interface is used, PCTRM is used to tell
+the maximum resolution supported by your monitor by setting it to
+S<max. horizontal resolution>. E.g. if your monitor's maximum resolution is
+800x600, then use:
+@example
+      set PCTRM=S800
+@end example
+
+If PCTRM is not set, standard VGA is used.
+
+FIT_SCRIPT may be used to specify a `gnuplot` command to be executed when a
+fit is interrupted---see `fit`.  FIT_LOG specifies the filename of the
+logfile maintained by fit.
+
+@node Expressions, Glossary, Environment, gnuplot
+@section Expressions
+
+@cindex expressions
+
+In general, any mathematical expression accepted by C, FORTRAN, Pascal, or
+BASIC is valid.  The precedence of these operators is determined by the
+specifications of the C programming language.  White space (spaces and tabs)
+is ignored inside expressions.
+
+Complex constants are expressed as @{<real>,<imag>@}, where <real> and <imag>
+must be numerical constants.  For example, @{3,2@} represents 3 + 2i; @{0,1@}
+represents 'i' itself.  The curly braces are explicitly required here.
+
+Note that gnuplot uses both "real" and "integer" arithmetic, like FORTRAN and
+C.  Integers are entered as "1", "-10", etc; reals as "1.0", "-10.0", "1e1",
+3.5e-1, etc.  The most important difference between the two forms is in
+division: division of integers truncates: 5/2 = 2; division of reals does
+not: 5.0/2.0 = 2.5.  In mixed expressions, integers are "promoted" to reals
+before evaluation: 5/2e0 = 2.5.  The result of division of a negative integer
+by a positive one may vary among compilers.  Try a test like "print -5/2" to
+determine if your system chooses -2 or -3 as the answer.
+
+The integer expression "1/0" may be used to generate an "undefined" flag,
+which causes a point to ignored; the `ternary` operator gives an example.
+
+The real and imaginary parts of complex expressions are always real, whatever
+the form in which they are entered: in @{3,2@} the "3" and "2" are reals, not
+integers.
+
+@menu
+* Functions::                   
+* Operators::                   
+* User-defined::                
+@end menu
+
+@node Functions, Operators, Expressions, Expressions
+@subsection Functions
+
+@c ?expressions functions
+@cindex functions
+@opindex functions
+
+
+The functions in `gnuplot` are the same as the corresponding functions in
+the Unix math library, except that all functions accept integer, real, and
+complex arguments, unless otherwise noted.
+
+For those functions that accept or return angles that may be given in either
+degrees or radians (sin(x), cos(x), tan(x), asin(x), acos(x), atan(x),
+atan2(x) and arg(z)), the unit may be selected by @ref{angles}, which
+defaults to radians.
+
+
+
+@menu
+* abs::                         
+* acos::                        
+* acosh::                       
+* arg::                         
+* asin::                        
+* asinh::                       
+* atan::                        
+* atan2::                       
+* atanh::                       
+* besj0::                       
+* besj1::                       
+* besy0::                       
+* besy1::                       
+* ceil::                        
+* cos::                         
+* cosh::                        
+* erf::                         
+* erfc::                        
+* exp::                         
+* floor::                       
+* gamma::                       
+* ibeta::                       
+* inverf::                      
+* igamma::                      
+* imag::                        
+* invnorm::                     
+* int::                         
+* lgamma::                      
+* log::                         
+* log10::                       
+* norm::                        
+* rand::                        
+* real::                        
+* sgn::                         
+* sin::                         
+* sinh::                        
+* sqrt::                        
+* tan::                         
+* tanh::                        
+* column::                      
+* tm_hour::                     
+* tm_mday::                     
+* tm_min::                      
+* tm_mon::                      
+* tm_sec::                      
+* tm_wday::                     
+* tm_yday::                     
+* tm_year::                     
+* valid::                       
+@end menu
+
+@node abs, acos, Functions, Functions
+@subsubsection abs
+
+@c ?expressions functions abs
+@c ?functions abs
+@cindex abs
+@findex abs
+
+
+The `abs(x)` function returns the absolute value of its argument.  The
+returned value is of the same type as the argument.
+
+For complex arguments, abs(x) is defined as the length of x in the complex
+plane [i.e.,  sqrt(real(x)**2 + imag(x)**2) ].
+
+@node acos, acosh, abs, Functions
+@subsubsection acos
+
+@c ?expressions functions acos
+@c ?functions acos
+@cindex acos
+@findex acos
+
+
+The `acos(x)` function returns the arc cosine (inverse cosine) of its
+argument.  `acos` returns its argument in radians or degrees, as selected by
+@ref{angles}.
+
+@node acosh, arg, acos, Functions
+@subsubsection acosh
+
+@c ?expressions functions acosh
+@c ?functions acosh
+@cindex acosh
+@findex acosh
+
+
+The `acosh(x)` function returns the inverse hyperbolic cosine of its argument
+in radians.
+
+@node arg, asin, acosh, Functions
+@subsubsection arg
+
+@c ?expressions functions arg
+@c ?functions arg
+@cindex arg
+@findex arg
+
+
+The `arg(x)` function returns the phase of a complex number in radians or
+degrees, as selected by @ref{angles}.
+
+@node asin, asinh, arg, Functions
+@subsubsection asin
+
+@c ?expressions functions asin
+@c ?functions asin
+@cindex asin
+@findex asin
+
+
+The `asin(x)` function returns the arc sin (inverse sin) of its argument.
+`asin` returns its argument in radians or degrees, as selected by @ref{angles}.
+
+@node asinh, atan, asin, Functions
+@subsubsection asinh
+
+@c ?expressions functions asinh
+@c ?functions asinh
+@cindex asinh
+@findex asinh
+
+
+The `asinh(x)` function returns the inverse hyperbolic sin of its argument in
+radians.
+
+@node atan, atan2, asinh, Functions
+@subsubsection atan
+
+@c ?expressions functions atan
+@c ?functions atan
+@cindex atan
+@findex atan
+
+
+The `atan(x)` function returns the arc tangent (inverse tangent) of its
+argument.  `atan` returns its argument in radians or degrees, as selected by
+@ref{angles}.
+
+@node atan2, atanh, atan, Functions
+@subsubsection atan2
+
+@c ?expressions functions atan2
+@c ?functions atan2
+@cindex atan2
+@findex atan2
+
+
+The `atan2(y,x)` function returns the arc tangent (inverse tangent) of the
+ratio of the real parts of its arguments.  @ref{atan2} returns its argument in
+radians or degrees, as selected by @ref{angles}, in the correct quadrant.
+
+@node atanh, besj0, atan2, Functions
+@subsubsection atanh
+
+@c ?expressions functions atanh
+@c ?functions atanh
+@cindex atanh
+@findex atanh
+
+
+The `atanh(x)` function returns the inverse hyperbolic tangent of its
+argument in radians.
+
+@node besj0, besj1, atanh, Functions
+@subsubsection besj0
+
+@c ?expressions functions besj0
+@c ?functions besj0
+@cindex besj0
+@findex besj0
+
+
+The `besj0(x)` function returns the j0th Bessel function of its argument.
+@ref{besj0} expects its argument to be in radians.
+
+@node besj1, besy0, besj0, Functions
+@subsubsection besj1
+
+@c ?expressions functions besj1
+@c ?functions besj1
+@cindex besj1
+@findex besj1
+
+
+The `besj1(x)` function returns the j1st Bessel function of its argument.
+@ref{besj1} expects its argument to be in radians.
+
+@node besy0, besy1, besj1, Functions
+@subsubsection besy0
+
+@c ?expressions functions besy0
+@c ?functions besy0
+@cindex besy0
+@findex besy0
+
+
+The @ref{besy0} function returns the y0th Bessel function of its argument.
+@ref{besy0} expects its argument to be in radians.
+
+@node besy1, ceil, besy0, Functions
+@subsubsection besy1
+
+@c ?expressions functions besy1
+@c ?functions besy1
+@cindex besy1
+@findex besy1
+
+
+The `besy1(x)` function returns the y1st Bessel function of its argument.
+@ref{besy1} expects its argument to be in radians.
+
+@node ceil, cos, besy1, Functions
+@subsubsection ceil
+
+@c ?expressions functions ceil
+@c ?functions ceil
+@cindex ceil
+@findex ceil
+
+
+The `ceil(x)` function returns the smallest integer that is not less than its
+argument.  For complex numbers, @ref{ceil} returns the smallest integer not less
+than the real part of its argument.
+
+@node cos, cosh, ceil, Functions
+@subsubsection cos
+
+@c ?expressions functions cos
+@c ?functions cos
+@cindex cos
+@findex cos
+
+
+The `cos(x)` function returns the cosine of its argument.  `cos` accepts its
+argument in radians or degrees, as selected by @ref{angles}.
+
+@node cosh, erf, cos, Functions
+@subsubsection cosh
+
+@c ?expressions functions cosh
+@c ?functions cosh
+@cindex cosh
+@findex cosh
+
+
+The `cosh(x)` function returns the hyperbolic cosine of its argument.  @ref{cosh}
+expects its argument to be in radians.
+
+@node erf, erfc, cosh, Functions
+@subsubsection erf
+
+@c ?expressions functions erf
+@c ?functions erf
+@cindex erf
+@findex erf
+
+
+The `erf(x)` function returns the error function of the real part of its
+argument.  If the argument is a complex value, the imaginary component is
+ignored.
+
+@node erfc, exp, erf, Functions
+@subsubsection erfc
+
+@c ?expressions functions erfc
+@c ?functions erfc
+@cindex erfc
+@findex erfc
+
+
+The `erfc(x)` function returns 1.0 - the error function of the real part of
+its argument.  If the argument is a complex value, the imaginary component is
+ignored.
+
+@node exp, floor, erfc, Functions
+@subsubsection exp
+
+@c ?expressions functions exp
+@c ?functions exp
+@cindex exp
+@findex exp
+
+
+The `exp(x)` function returns the exponential function of its argument (`e`
+raised to the power of its argument).  On some implementations (notably
+suns), exp(-x) returns undefined for very large x.  A user-defined function
+like safe(x) = x<-100 ? 0 : exp(x) might prove useful in these cases.
+
+@node floor, gamma, exp, Functions
+@subsubsection floor
+
+@c ?expressions functions floor
+@c ?functions floor
+@cindex floor
+@findex floor
+
+
+The `floor(x)` function returns the largest integer not greater than its
+argument.  For complex numbers, @ref{floor} returns the largest integer not
+greater than the real part of its argument.
+
+@node gamma, ibeta, floor, Functions
+@subsubsection gamma
+
+@c ?expressions functions gamma
+@c ?functions gamma
+@cindex gamma
+@findex gamma
+
+
+The `gamma(x)` function returns the gamma function of the real part of its
+argument.  For integer n, gamma(n+1) = n!.  If the argument is a complex
+value, the imaginary component is ignored.
+
+@node ibeta, inverf, gamma, Functions
+@subsubsection ibeta
+
+@c ?expressions functions ibeta
+@c ?functions ibeta
+@cindex ibeta
+@findex ibeta
+
+
+The `ibeta(p,q,x)` function returns the incomplete beta function of the real
+parts of its arguments. p, q > 0 and x in [0:1].  If the arguments are
+complex, the imaginary components are ignored.
+
+@node inverf, igamma, ibeta, Functions
+@subsubsection inverf
+
+@c ?expressions functions inverf
+@c ?functions inverf
+@cindex inverf
+@findex inverf
+
+
+The `inverf(x)` function returns the inverse error function of the real part
+of its argument.
+
+@node igamma, imag, inverf, Functions
+@subsubsection igamma
+
+@c ?expressions functions igamma
+@c ?functions igamma
+@cindex igamma
+@findex igamma
+
+
+The `igamma(a,x)` function returns the incomplete gamma function of the real
+parts of its arguments.  a > 0 and x >= 0.  If the arguments are complex,
+the imaginary components are ignored.
+
+@node imag, invnorm, igamma, Functions
+@subsubsection imag
+
+@c ?expressions functions imag
+@c ?functions imag
+@cindex imag
+@findex imag
+
+
+The `imag(x)` function returns the imaginary part of its argument as a real
+number.
+
+@node invnorm, int, imag, Functions
+@subsubsection invnorm
+
+@c ?expressions functions invnorm
+@c ?functions invnorm
+@cindex invnorm
+@findex invnorm
+
+
+The `invnorm(x)` function returns the inverse normal distribution function of
+the real part of its argument.
+
+@node int, lgamma, invnorm, Functions
+@subsubsection int
+
+@c ?expressions functions int
+@c ?functions int
+@cindex int
+@findex int
+
+
+The `int(x)` function returns the integer part of its argument, truncated
+toward zero.
+
+@node lgamma, log, int, Functions
+@subsubsection lgamma
+
+@c ?expressions functions lgamma
+@c ?functions lgamma
+@cindex lgamma
+@findex lgamma
+
+
+The `lgamma(x)` function returns the natural logarithm of the gamma function
+of the real part of its argument.  If the argument is a complex value, the
+imaginary component is ignored.
+
+@node log, log10, lgamma, Functions
+@subsubsection log
+
+@c ?expressions functions log
+@c ?functions log
+@cindex log
+@findex log
+
+
+The `log(x)` function returns the natural logarithm (base `e`) of its
+argument.
+
+@node log10, norm, log, Functions
+@subsubsection log10
+
+@c ?expressions functions log10
+@c ?functions log10
+@cindex log10
+@findex log10
+
+
+The `log10(x)` function returns the logarithm (base 10) of its argument.
+
+@node norm, rand, log10, Functions
+@subsubsection norm
+
+@c ?expressions functions norm
+@c ?functions norm
+@cindex norm
+@findex norm
+
+
+The `norm(x)` function returns the normal distribution function (or Gaussian)
+of the real part of its argument.
+
+@node rand, real, norm, Functions
+@subsubsection rand
+
+@c ?expressions functions rand
+@c ?functions rand
+@cindex rand
+@findex rand
+
+
+The `rand(x)` function returns a pseudo random number in the interval [0:1]
+using the real part of its argument as a seed.  If seed < 0, the sequence
+is (re)initialized.  If the argument is a complex value, the imaginary
+component is ignored.
+
+@node real, sgn, rand, Functions
+@subsubsection real
+
+@c ?expressions functions real
+@c ?functions real
+@cindex real
+@findex real
+
+
+The `real(x)` function returns the real part of its argument.
+
+@node sgn, sin, real, Functions
+@subsubsection sgn
+
+@c ?expressions functions sgn
+@c ?functions sgn
+@cindex sgn
+@findex sgn
+
+
+The `sgn(x)` function returns 1 if its argument is positive, -1 if its
+argument is negative, and 0 if its argument is 0.  If the argument is a
+complex value, the imaginary component is ignored.
+
+@node sin, sinh, sgn, Functions
+@subsubsection sin
+
+@c ?expressions functions sin
+@c ?functions sin
+@cindex sin
+@findex sin
+
+
+The `sin(x)` function returns the sine of its argument.  `sin` expects its
+argument to be in radians or degrees, as selected by @ref{angles}.
+
+@node sinh, sqrt, sin, Functions
+@subsubsection sinh
+
+@c ?expressions functions sinh
+@c ?functions sinh
+@cindex sinh
+@findex sinh
+
+
+The `sinh(x)` function returns the hyperbolic sine of its argument.  @ref{sinh}
+expects its argument to be in radians.
+
+@node sqrt, tan, sinh, Functions
+@subsubsection sqrt
+
+@c ?expressions functions sqrt
+@c ?functions sqrt
+@cindex sqrt
+@findex sqrt
+
+
+The `sqrt(x)` function returns the square root of its argument.
+
+@node tan, tanh, sqrt, Functions
+@subsubsection tan
+
+@c ?expressions functions tan
+@c ?functions tan
+@cindex tan
+@findex tan
+
+
+The `tan(x)` function returns the tangent of its argument.  `tan` expects
+its argument to be in radians or degrees, as selected by @ref{angles}.
+
+@node tanh, column, tan, Functions
+@subsubsection tanh
+
+@c ?expressions functions tanh
+@c ?functions tanh
+@cindex tanh
+@findex tanh
+
+
+The `tanh(x)` function returns the hyperbolic tangent of its argument.  @ref{tanh}
+expects its argument to be in radians.
+
+
+A few additional functions are also available.
+
+
+
+@node column, tm_hour, tanh, Functions
+@subsubsection column
+
+@c ?expressions functions column
+@c ?functions column
+@cindex column
+@findex column
+
+
+`column(x)` may be used only in expressions as part of @ref{using} manipulations
+to fits or datafile plots.  See @ref{using}.
+
+@node tm_hour, tm_mday, column, Functions
+@subsubsection tm_hour
+
+@c ?expressions tm_hour
+@findex tm_hour
+@c ?functions tm_hour
+The @ref{tm_hour} function interprets its argument as a time, in seconds from
+1 Jan 2000.  It returns the hour (an integer in the range 0--23) as a real.
+
+@node tm_mday, tm_min, tm_hour, Functions
+@subsubsection tm_mday
+
+@c ?expressions tm_mday
+@findex tm_mday
+@c ?functions tm_mday
+The @ref{tm_mday} function interprets its argument as a time, in seconds from
+1 Jan 2000.  It returns the day of the month (an integer in the range 1--31)
+as a real.
+
+@node tm_min, tm_mon, tm_mday, Functions
+@subsubsection tm_min
+
+@c ?expressions tm_min
+@findex tm_min
+@c ?functions tm_min
+The @ref{tm_min} function interprets its argument as a time, in seconds from
+1 Jan 2000.  It returns the minute (an integer in the range 0--59) as a real.
+
+@node tm_mon, tm_sec, tm_min, Functions
+@subsubsection tm_mon
+
+@c ?expressions tm_mon
+@findex tm_mon
+@c ?functions tm_mon
+The @ref{tm_mon} function interprets its argument as a time, in seconds from
+1 Jan 2000.  It returns the month (an integer in the range 1--12) as a real.
+
+@node tm_sec, tm_wday, tm_mon, Functions
+@subsubsection tm_sec
+
+@c ?expressions tm_sec
+@findex tm_sec
+@c ?functions tm_sec
+The @ref{tm_sec} function interprets its argument as a time, in seconds from
+1 Jan 2000.  It returns the second (an integer in the range 0--59) as a real.
+
+@node tm_wday, tm_yday, tm_sec, Functions
+@subsubsection tm_wday
+
+@c ?expressions tm_wday
+@findex tm_wday
+@c ?functions tm_wday
+The @ref{tm_wday} function interprets its argument as a time, in seconds from
+1 Jan 2000.  It returns the day of the week (an integer in the range 1--7) as
+a real.
+
+@node tm_yday, tm_year, tm_wday, Functions
+@subsubsection tm_yday
+
+@c ?expressions tm_yday
+@findex tm_yday
+@c ?functions tm_yday
+The @ref{tm_yday} function interprets its argument as a time, in seconds from
+1 Jan 2000.  It returns the day of the year (an integer in the range 1--366)
+as a real.
+
+@node tm_year, valid, tm_yday, Functions
+@subsubsection tm_year
+
+@c ?expressions tm_year
+@findex tm_year
+@c ?functions tm_year
+The @ref{tm_year} function interprets its argument as a time, in seconds from
+1 Jan 2000.  It returns the year (an integer) as a real.
+
+@node valid,  , tm_year, Functions
+@subsubsection valid
+
+@c ?expressions functions valid
+@c ?functions valid
+@cindex valid
+@findex valid
+
+
+`valid(x)` may be used only in expressions as part of @ref{using} manipulations
+to fits or datafile plots.  See @ref{using}.
+
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/airfoil.html,Use of functions and complex variables for airfoils }
+
+@node Operators, User-defined, Functions, Expressions
+@subsection Operators
+
+@c ?expressions operators
+@cindex operators
+
+The operators in `gnuplot` are the same as the corresponding operators in the
+C programming language, except that all operators accept integer, real, and
+complex arguments, unless otherwise noted.  The ** operator (exponentiation)
+is supported, as in FORTRAN.
+
+Parentheses may be used to change order of evaluation.
+
+@menu
+* Unary::                       
+* Binary::                      
+* Ternary::                     
+@end menu
+
+@node Unary, Binary, Operators, Operators
+@subsubsection Unary
+
+@c ?expressions operators unary
+@c ?operators unary
+@cindex unary
+
+The following is a list of all the unary operators and their usages:
+
+
+@example
+    Symbol      Example    Explanation
+      -           -a          unary minus
+      +           +a          unary plus (no-operation)
+      ~           ~a        * one's complement
+      !           !a        * logical negation
+      !           a!        * factorial
+      $           $3        * call arg/column during @ref{using} manipulation
+
+@end example
+
+(*) Starred explanations indicate that the operator requires an integer
+argument.
+
+Operator precedence is the same as in Fortran and C.  As in those languages,
+parentheses may be used to change the order of operation.  Thus -2**2 = -4,
+but (-2)**2 = 4.
+
+The factorial operator returns a real number to allow a greater range.
+
+@node Binary, Ternary, Unary, Operators
+@subsubsection Binary
+
+@c ?expressions operators binary
+@c ?operators binary
+@cindex binary
+
+The following is a list of all the binary operators and their usages:
+
+
+@example
+    Symbol       Example      Explanation
+      **          a**b          exponentiation
+      *           a*b           multiplication
+      /           a/b           division
+      %           a%b         * modulo
+      +           a+b           addition
+      -           a-b           subtraction
+      ==          a==b          equality
+      !=          a!=b          inequality
+      <           a<b           less than
+      <=          a<=b          less than or equal to
+      >           a>b           greater than
+      >=          a>=b          greater than or equal to
+      &           a&b         * bitwise AND
+      ^           a^b         * bitwise exclusive OR
+      |           a|b         * bitwise inclusive OR
+      &&          a&&b        * logical AND
+      ||          a||b        * logical OR
+
+@end example
+
+
+(*) Starred explanations indicate that the operator requires integer
+arguments.
+
+Logical AND (&&) and OR (||) short-circuit the way they do in C.  That is,
+the second `&&` operand is not evaluated if the first is false; the second
+`||` operand is not evaluated if the first is true.
+
+@node Ternary,  , Binary, Operators
+@subsubsection Ternary
+
+@c ?expressions operators ternary
+@c ?operators ternary
+@cindex ternary
+
+There is a single ternary operator:
+
+
+@example
+    Symbol       Example      Explanation
+      ?:          a?b:c     ternary operation
+
+@end example
+
+
+The ternary operator behaves as it does in C.  The first argument (a), which
+must be an integer, is evaluated.  If it is true (non-zero), the second
+argument (b) is evaluated and returned; otherwise the third argument (c) is
+evaluated and returned.
+
+The ternary operator is very useful both in constructing piecewise functions
+and in plotting points only when certain conditions are met.
+
+Examples:
+
+Plot a function that is to equal sin(x) for 0 <= x < 1, 1/x for 1 <= x < 2,
+and undefined elsewhere:
+@example
+      f(x) = 0<=x && x<1 ? sin(x) : 1<=x && x<2 ? 1/x : 1/0
+      plot f(x)
+@end example
+
+@c ^ <img align=bottom src="http://www.nas.nasa.gov/~woo/gnuplot/doc/ternary.gif" alt="[ternary.gif]" width=640 height=480>
+Note that `gnuplot` quietly ignores undefined values, so the final branch of
+the function (1/0) will produce no plottable points.  Note also that f(x)
+will be plotted as a continuous function across the discontinuity if a line
+style is used.  To plot it discontinuously, create separate functions for the
+two pieces.  (Parametric functions are also useful for this purpose.)
+
+For data in a file, plot the average of the data in columns 2 and 3 against
+the datum in column 1, but only if the datum in column 4 is non-negative:
+
+@example
+      plot 'file' using 1:( $4<0 ? 1/0 : ($2+$3)/2 )
+
+@end example
+
+Please see @ref{using} for an explanation of the @ref{using} syntax.
+
+@node User-defined,  , Operators, Expressions
+@subsection User-defined
+
+@c ?expressions user-defined
+@cindex user-defined
+
+@cindex variables
+@opindex variables
+
+
+New user-defined variables and functions of one through five variables may
+be declared and used anywhere, including on the @ref{plot} command itself.
+
+User-defined function syntax:
+@example
+      <func-name>( <dummy1> @{,<dummy2>@} ... @{,<dummy5>@} ) = <expression>
+
+@end example
+
+where <expression> is defined in terms of <dummy1> through <dummy5>.
+
+User-defined variable syntax:
+@example
+      <variable-name> = <constant-expression>
+
+@end example
+
+Examples:
+@example
+      w = 2
+      q = floor(tan(pi/2 - 0.1))
+      f(x) = sin(w*x)
+      sinc(x) = sin(pi*x)/(pi*x)
+      delta(t) = (t == 0)
+      ramp(t) = (t > 0) ? t : 0
+      min(a,b) = (a < b) ? a : b
+      comb(n,k) = n!/(k!*(n-k)!)
+      len3d(x,y,z) = sqrt(x*x+y*y+z*z)
+      plot f(x) = sin(x*a), a = 0.2, f(x), a = 0.4, f(x)
+
+@end example
+
+@c ^ <img align=bottom src="http://www.nas.nasa.gov/~woo/gnuplot/doc/userdefined.gif" alt="[userdefined.gif]" width=640 height=480>
+Note that the variable `pi` is already defined.  But it is in no way magic;
+you may redefine it to be whatever you like.
+
+Valid names are the same as in most programming languages: they must begin
+with a letter, but subsequent characters may be letters, digits, "$", or "_".
+Note, however, that the `fit` mechanism uses several variables with names
+that begin "FIT_".  It is safest to avoid using such names.  "FIT_LIMIT",
+however, is one that you may wish to redefine. See the documentation
+on `fit` for details.
+
+
+See @ref{functions}, @ref{variables}, and `fit`.
+
+@node Glossary, Plotting, Expressions, gnuplot
+@section Glossary
+
+@cindex glossary
+
+Throughout this document an attempt has been made to maintain consistency of
+nomenclature.  This cannot be wholly successful because as `gnuplot` has
+evolved over time, certain command and keyword names have been adopted that
+preclude such perfection.  This section contains explanations of the way
+some of these terms are used.
+
+A "page" or "screen" is the entire area addressable by `gnuplot`.  On a
+monitor, it is the full screen; on a plotter, it is a single sheet of paper.
+
+A screen may contain one or more "plots".  A plot is defined by an abscissa
+and an ordinate, although these need not actually appear on it, as well as
+the margins and any text written therein.
+
+A plot contains one "graph".  A graph is defined by an abscissa and an
+ordinate, although these need not actually appear on it.
+
+A graph may contain one or more "lines".  A line is a single function or
+data set.  "Line" is also a plotting style.  The word will also be used in
+sense "a line of text".  Presumably the context will remove any ambiguity.
+
+The lines on a graph may have individual names.  These may be listed
+together with a sample of the plotting style used to represent them in
+the "key", sometimes also called the "legend".
+
+The word "title" occurs with multiple meanings in `gnuplot`.  In this
+document, it will always be preceded by the adjective "plot", "line", or
+"key" to differentiate among them.
+
+A graph may have up to four labelled axes.  Various commands have the name of
+an axis built into their names, such as @ref{xlabel}.  Other commands have
+one or more axis names as options, such as `set logscale xy`.  The names of
+the four axes for these usages are "x" for the axis along the bottom border
+of the plot, "y" for the left border, "x2" for the top border, and "y2" for
+the right border.  "z" also occurs in commands used with 3-d plotting.
+
+When discussing data files, the term "record" will be resurrected and used
+to denote a single line of text in the file, that is, the characters between
+newline or end-of-record characters.  A "point" is the datum extracted from
+a single record.  A "datablock" is a set of points from consecutive records,
+delimited by blank records.  A line, when referred to in the context of a
+data file, is a subset of a datablock.
+
+@node Plotting, Start-up, Glossary, gnuplot
+@section Plotting
+
+@cindex plotting
+
+There are three `gnuplot` commands which actually create a plot: @ref{plot},
+`splot` and @ref{replot}.  @ref{plot} generates 2-d plots, `splot` generates 3-d
+plots (actually 2-d projections, of course), and @ref{replot} appends its
+arguments to the previous @ref{plot} or `splot` and executes the modified
+command.
+
+Much of the general information about plotting can be found in the discussion
+of @ref{plot}; information specific to 3-d can be found in the `splot` section.
+
+@ref{plot} operates in either rectangular or polar coordinates -- see `set polar`
+for details of the latter.  `splot` operates only in rectangular coordinates,
+but the @ref{mapping} command allows for a few other coordinate systems to be
+treated.  In addition, the @ref{using} option allows both @ref{plot} and `splot` to
+treat almost any coordinate system you'd care to define.
+
+`splot` can plot surfaces and contours in addition to points and/or lines.
+In addition to `splot`, see @ref{isosamples} for information about defining
+the grid for a 3-d function;  `splot datafile` for information about the
+requisite file structure for 3-d data values; and @ref{contour} and @ref{cntrparam} for information about contours.
+
+@node Start-up, Substitution, Plotting, gnuplot
+@section Start-up
+
+@cindex startup
+
+@cindex start
+
+@cindex .gnuplot
+
+When `gnuplot` is run, it looks for an initialization file to load.  This
+file is called `.gnuplot` on Unix and AmigaOS systems, and `GNUPLOT.INI` on
+other systems.  If this file is not found in the current directory, the
+program will look for it in the home directory (under AmigaOS,
+Atari(single)TOS, MS-DOS and OS/2, the environment variable `gnuplot` should
+contain the name of this directory).  Note: if NOCWDRC is defined during the
+installation, `gnuplot` will not read from the current directory.
+
+If the initialization file is found, `gnuplot` executes the commands in it.
+These may be any legal `gnuplot` commands, but typically they are limited to
+setting the terminal and defining frequently-used functions or variables.
+
+@node Substitution, Syntax, Start-up, gnuplot
+@section Substitution
+
+@cindex substitution
+
+Command-line substitution is specified by a system command enclosed in
+backquotes.  This command is spawned and the output it produces replaces
+the name of the command (and backquotes) on the command line.  Some
+implementations also support pipes;  see @ref{special-filenames}.
+
+Newlines in the output produced by the spawned command are replaced with
+blanks.
+
+Command-line substitution can be used anywhere on the `gnuplot` command
+line.
+
+Example:
+
+This will run the program `leastsq` and replace `leastsq` (including
+backquotes) on the command line with its output:
+@example
+      f(x) = `leastsq`
+
+@end example
+
+or, in VMS
+@example
+      f(x) = `run leastsq`
+
+@end example
+
+@node Syntax, Time/Date_data, Substitution, gnuplot
+@section Syntax
+
+@cindex syntax
+
+@cindex specify
+
+@cindex punctuation
+
+The general rules of syntax and punctuation in `gnuplot` are that keywords
+and options are order-dependent.  Options and any accompanying parameters are
+separated by spaces whereas lists and coordinates are separated by commas.
+Ranges are separated by colons and enclosed in brackets [], text and file
+names are enclosed in quotes, and a few miscellaneous things are enclosed
+in parentheses.  Braces @{@} are used for a few special purposes.
+
+Commas are used to separate coordinates on the `set` commands @ref{arrow},
+@ref{key}, and @ref{label}; the list of variables being fitted (the list after the
+`via` keyword on the `fit` command); lists of discrete contours or the loop
+parameters which specify them on the @ref{cntrparam} command; the arguments
+of the `set` commands @ref{dgrid3d}, @ref{dummy}, @ref{isosamples}, @ref{offsets}, @ref{origin},
+@ref{samples}, @ref{size}, `time`, and @ref{view}; lists of tics or the loop parameters
+which specify them; the offsets for titles and axis labels; parametric
+functions to be used to calculate the x, y, and z coordinates on the @ref{plot},
+@ref{replot} and `splot` commands; and the complete sets of keywords specifying
+individual plots (data sets or functions) on the @ref{plot}, @ref{replot} and `splot`
+commands.
+
+Parentheses are used to delimit sets of explicit tics (as opposed to loop
+parameters) and to indicate computations in the @ref{using} filter of the `fit`,
+@ref{plot}, @ref{replot} and `splot` commands.
+
+(Parentheses and commas are also used as usual in function notation.)
+
+Brackets are used to delimit ranges, whether they are given on `set`, @ref{plot}
+or `splot` commands.
+
+Colons are used to separate extrema in `range` specifications (whether they
+are given on `set`, @ref{plot} or `splot` commands) and to separate entries in
+the @ref{using} filter of the @ref{plot}, @ref{replot}, `splot` and `fit` commands.
+
+Semicolons are used to separate commands given on a single command line.
+
+Braces are used in text to be specially processed by some terminals, like
+`postscript`.  They are also used to denote complex numbers: @{3,2@} = 3 + 2i.
+
+Text may be enclosed in single- or double-quotes.  Backslash processing of
+sequences like \n (newline) and \345 (octal character code) is performed for
+double-quoted strings, but not for single-quoted strings.
+
+The justification is the same for each line of a multi-line string.  Thus the
+center-justified string
+@example
+      "This is the first line of text.\nThis is the second line."
+@end example
+
+will produce
+@example
+                       This is the first line of text.
+                          This is the second line.
+@end example
+
+but
+@example
+      'This is the first line of text.\nThis is the second line.'
+@end example
+
+will produce
+@example
+          This is the first line of text.\nThis is the second line.
+
+@end example
+
+Filenames may be entered with either single- or double-quotes.  In this
+manual the command examples generally single-quote filenames and double-quote
+other string tokens for clarity.
+
+At present you should not embed \n inside @{@} when using the enhanced option
+of the postscript terminal.
+
+The EEPIC, Imagen, Uniplex, LaTeX, and TPIC drivers allow a newline to be
+specified by \\ in a single-quoted string or \\\\ in a double-quoted string.
+
+Back-quotes are used to enclose system commands for substitution.
+
+@node Time/Date_data,  , Syntax, gnuplot
+@section Time/Date data
+
+@cindex time/date
+
+`gnuplot` supports the use of time and/or date information as input data.
+This feature is activated by the commands `set xdata time`, `set ydata time`,
+etc.
+
+Internally all times and dates are converted to the number of seconds from
+the year 2000.  The command @ref{timefmt} defines the format for all inputs:
+data files, ranges, tics, label positions---in short, anything that accepts a
+data value must receive it in this format.  Since only one input format can
+be in force at a given time, all time/date quantities being input at the same
+time must be presented in the same format.  Thus if both x and y data in a
+file are time/date, they must be in the same format.
+
+The conversion to and from seconds assumes Universal Time (which is the same
+as Greenwich Standard Time).  There is no provision for changing the time
+zone or for daylight savings.  If all your data refer to the same time zone
+(and are all either daylight or standard) you don't need to worry about these
+things.  But if the absolute time is crucial for your application, you'll
+need to convert to UT yourself.
+
+Commands like @ref{xrange} will re-interpret the integer according to
+@ref{timefmt}.  If you change @ref{timefmt}, and then `show` the quantity again, it
+will be displayed in the new @ref{timefmt}.  For that matter, if you give the
+deactivation command (like @ref{xdata}), the quantity will be shown in its
+numerical form.
+
+The command `set format` defines the format that will be used for tic labels,
+whether or not the specified axis is time/date.
+
+If time/date information is to be plotted from a file, the @ref{using} option
+_must_ be used on the @ref{plot} or `splot` command.  These commands simply use
+white space to separate columns, but white space may be embedded within the
+time/date string.  If you use tabs as a separator, some trial-and-error may
+be necessary to discover how your system treats them.
+
+The following example demonstrates time/date plotting.
+
+Suppose the file "data" contains records like
+
+@example
+      03/21/95 10:00  6.02e23
+
+@end example
+
+This file can be plotted by
+
+@example
+      set xdata time
+      set timefmt "%m/%d/%y"
+      set xrange ["03/21/95":"03/22/95"]
+      set format x "%m/%d"
+      set timefmt "%m/%d/%y %H:%M"
+      plot "data" using 1:3
+
+@end example
+
+which will produce xtic labels that look like "03/21".
+
+See the descriptions of each command for more details.
+
+@node Commands, Graphical_User_Interfaces, gnuplot, Top
+@chapter Commands
+
+@cindex commands
+
+This section lists the commands acceptable to `gnuplot` in alphabetical
+order.  Printed versions of this document contain all commands; on-line
+versions may not be complete.  Indeed, on some systems there may be no
+commands at all listed under this heading.
+
+Note that in most cases unambiguous abbreviations for command names and their
+options are permissible, i.e., "`p f(x) w l`" instead of "`plot f(x) with
+lines`".
+
+In the syntax descriptions, braces (@{@}) denote optional arguments and a
+vertical bar (|) separates mutually exclusive choices.
+
+@menu
+* cd::                          
+* call::                        
+* clear::                       
+* exit::                        
+* fit::                         
+* help::                        
+* if::                          
+* load::                        
+* pause::                       
+* plot::                        
+* print::                       
+* pwd::                         
+* quit::                        
+* replot::                      
+* reread::                      
+* reset::                       
+* save::                        
+* set-show::                    
+* shell::                       
+* splot::                       
+* test::                        
+* update::                      
+@end menu
+
+@node cd, call, Commands, Commands
+@section cd
+
+@c ?commands cd
+@cindex cd
+@cmindex cd
+
+
+The @ref{cd} command changes the working directory.
+
+Syntax:
+@example
+      cd '<directory-name>'
+
+@end example
+
+The directory name must be enclosed in quotes.
+
+Examples:
+@example
+      cd 'subdir'
+      cd ".."
+
+@end example
+
+DOS users _must_ use single-quotes---backslash [\] has special significance
+inside double-quotes.  For example,
+@example
+      cd "c:\newdata"
+@end example
+
+fails, but
+@example
+      cd 'c:\newdata'
+@end example
+
+works as expected.
+
+@node call, clear, cd, Commands
+@section call
+
+@c ?commands call
+@cindex call
+@cmindex call
+
+
+The @ref{call} command is identical to the load command with one exception: you
+can have up to ten additional parameters to the command (delimited according
+to the standard parser rules) which can be substituted into the lines read
+from the file.  As each line is read from the @ref{call}ed input file, it is
+scanned for the sequence `$` (dollar-sign) followed by a digit (0--9).  If
+found, the sequence is replaced by the corresponding parameter from the
+@ref{call} command line.  If the parameter was specified as a string in the
+@ref{call} line, it is substituted without its enclosing quotes.  `$` followed by
+any character other than a digit will be that character.  E.g. use `$$` to
+get a single `$`.  Providing more than ten parameters on the @ref{call} command
+line will cause an error.  A parameter that was not provided substitutes as
+nothing.  Files being @ref{call}ed may themselves contain @ref{call} or @ref{load}
+commands.
+
+The @ref{call} command _must_ be the last command on a multi-command line.
+
+Syntax:
+@example
+      call "<input-file>" <parameter-0> <parm-1> ... <parm-9>
+
+@end example
+
+The name of the input file must be enclosed in quotes, and it is recommended
+that parameters are similarly enclosed in quotes (future versions of gnuplot
+may treat quoted and unquoted arguments differently).
+
+Example:
+
+If the file 'calltest.gp' contains the line:
+@example
+      print "p0=$0 p1=$1 p2=$2 p3=$3 p4=$4 p5=$5 p6=$6 p7=x$7x"
+
+@end example
+
+entering the command:
+@example
+      call 'calltest.gp' "abcd" 1.2 + "'quoted'" -- "$2"
+
+@end example
+
+will display:
+@example
+      p0=abcd p1=1.2 p2=+ p3='quoted' p4=- p5=- p6=$2 p7=xx
+
+@end example
+
+NOTE: there is a clash in syntax with the datafile @ref{using} callback
+operator.  Use `$$n` or `column(n)` to access column n from a datafile inside
+a @ref{call}ed datafile plot.
+
+@node clear, exit, call, Commands
+@section clear
+
+@c ?commands clear
+@cindex clear
+@cmindex clear
+
+
+The @ref{clear} command erases the current screen or output device as specified
+by @ref{output}.  This usually generates a formfeed on hardcopy devices.  Use
+@ref{terminal} to set the device type.
+
+For some terminals @ref{clear} erases only the portion of the plotting surface
+defined by @ref{size}, so for these it can be used in conjunction with @ref{multiplot} to create an inset.
+
+Example:
+@example
+      set multiplot
+      plot sin(x)
+      set origin 0.5,0.5
+      set size 0.4,0.4
+      clear
+      plot cos(x)
+      set nomultiplot
+
+@end example
+
+Please see @ref{multiplot}, @ref{size}, and @ref{origin} for details of these
+commands.
+
+@node exit, fit, clear, Commands
+@section exit
+
+@c ?commands exit
+@cindex exit
+@cmindex exit
+
+
+The commands @ref{exit} and @ref{quit} and the END-OF-FILE character will exit the
+current `gnuplot` command file and @ref{load} the next one.  See "help
+batch/interactive" for more details.
+
+Each of these commands will clear the output device (as does the @ref{clear}
+command) before exiting.
+
+@node fit, help, exit, Commands
+@section fit
+
+@c ?commands fit
+@cindex fit
+@cmindex fit
+
+
+@cindex least-squares
+
+@cindex Marquardt
+
+The `fit` command can fit a user-defined function to a set of data points
+(x,y) or (x,y,z), using an implementation of the nonlinear least-squares
+(NLLS) Marquardt-Levenberg algorithm.  Any user-defined variable occurring in
+the function body may serve as a fit parameter, but the return type of the
+function must be real.
+
+Syntax:
+@example
+      fit @{[xrange] @{[yrange]@}@} <function> '<datafile>'
+          @{datafile-modifiers@}
+          via '<parameter file>' | <var1>@{,<var2>,...@}
+
+@end example
+
+Ranges may be specified to temporarily limit the data which is to be fitted;
+any out-of-range data points are ignored. The syntax is
+@example
+      [@{dummy_variable=@}@{<min>@}@{:<max>@}],
+@end example
+
+analogous to @ref{plot}; see @ref{ranges}.
+
+<function> is any valid `gnuplot` expression, although it is usual to use a
+previously user-defined function of the form f(x) or f(x,y).
+
+<datafile> is treated as in the @ref{plot} command.  All the `plot datafile`
+modifiers (@ref{using}, @ref{every},...) except @ref{smooth} are applicable to `fit`.
+See `plot datafile`.
+
+The default data formats for fitting functions with a single independent
+variable, y=f(x), are @{x:@}y or x:y:s; those formats can be changed with
+the datafile @ref{using} qualifier.  The third item, (a column number or an
+expression), if present, is interpreted as the standard deviation of the
+corresponding y value and is used to compute a weight for the datum, 1/s**2.
+Otherwise, all data points are weighted equally, with a weight of one.
+
+To fit a function with two independent variables, z=f(x,y), the required
+format is @ref{using} with four items, x:y:z:s.  The complete format must be
+given---no default columns are assumed for a missing token.  Weights for
+each data point are evaluated from 's' as above.  If error estimates are
+not available, a constant value can be specified as a constant expression
+(see @ref{using}), e.g., `using 1:2:3:(1)`.
+
+Multiple datasets may be simultaneously fit with functions of one
+independent variable by making y a 'pseudo-variable', e.g., the dataline
+number, and fitting as two independent variables.  See `fit multibranch`.
+
+The `via` qualifier specifies which parameters are to be adjusted, either
+directly, or by referencing a parameter file.
+
+Examples:
+@example
+      f(x) = a*x**2 + b*x + c
+      g(x,y) = a*x**2 + b*y**2 + c*x*y
+      FIT_LIMIT = 1e-6
+      fit f(x) 'measured.dat' via 'start.par'
+      fit f(x) 'measured.dat' using 3:($7-5) via 'start.par'
+      fit f(x) './data/trash.dat' using 1:2:3 via a, b, c
+      fit g(x,y) 'surface.dat' using 1:2:3:(1) via a, b, c
+
+@end example
+
+After each iteration step, detailed information about the current state
+of the fit is written to the display.  The same information about the
+initial and final states is written to a log file, "fit.log".  This file
+is always appended to, so as to not lose any previous fit history;  it
+should be deleted or renamed as desired.
+
+The fit may be interrupted by pressing Ctrl-C (any key but Ctrl-C under
+MSDOS and Atari Multitasking Systems).  After the current iteration
+completes, you have the option to (1) stop the fit and accept the current
+parameter values, (2) continue the fit, (3) execute a `gnuplot` command
+as specified by the environment variable FIT_SCRIPT.  The default for
+FIT_SCRIPT is @ref{replot}, so if you had previously plotted both the data
+and the fitting function in one graph, you can display the current state
+of the fit.
+
+Once `fit` has finished, the @ref{update} command may be used to store final
+values in a file for subsequent use as a parameter file.   See @ref{update}
+for details.
+
+@menu
+* adjustable_parameters::       
+* beginner's_guide::            
+* error_estimates::             
+* fit_controlling::             
+* multi-branch::                
+* starting_values::             
+* tips::                        
+@end menu
+
+@node adjustable_parameters, beginner's_guide, fit, fit
+@subsection adjustable parameters
+
+@c ?commands fit parameters
+@c ?fit parameters
+@c ?commands fit adjustable_parameters
+@c ?fit adjustable_parameters
+@cindex fit_parameters
+
+There are two ways that `via` can specify the parameters to be adjusted,
+either directly on the command line or indirectly, by referencing a
+parameter file.  The two use different means to set initial values.
+
+Adjustable parameters can be specified by a comma-separated list of variable
+names after the `via` keyword.  Any variable that is not already defined is
+is created with an initial value of 1.0.  However, the fit is more likely
+to converge rapidly if the variables have been previously declared with more
+appropriate starting values.
+
+In a parameter file, each parameter to be varied and a corresponding initial
+value are specified, one per line, in the form
+@example
+      varname = value
+
+@end example
+
+Comments, marked by '#', and blank lines are permissible.  The
+special form
+@example
+      varname = value       # FIXED
+
+@end example
+
+means that the variable is treated as a 'fixed parameter', initialized by the
+parameter file, but not adjusted by `fit`.  For clarity, it may be useful to
+designate variables as fixed parameters so that their values are reported by
+`fit`.  The keyword `# FIXED` has to appear in exactly this form.
+
+
+@node beginner's_guide, error_estimates, adjustable_parameters, fit
+@subsection beginner's guide
+
+@c ?commands fit beginners_guide
+@c ?fit beginners_guide
+@c ?fit guide
+@cindex fitting
+
+`fit` is used to find a set of parameters that 'best' fits your data to your
+user-defined function.  The fit is judged on the basis of the the sum of the
+squared differences or 'residuals' (SSR) between the input data points and
+the function values, evaluated at the same places.  This quantity is often
+called 'chisquare' (i.e., the Greek letter chi, to the power of 2).  The
+algorithm attempts to minimize SSR, or more precisely, WSSR, as the residuals
+are 'weighted' by the input data errors (or 1.0) before being squared; see
+`fit error_estimates` for details.
+
+That's why it is called 'least-squares fitting'.  Let's look at an example
+to see what is meant by 'non-linear', but first we had better go over some
+terms.  Here it is convenient to use z as the dependent variable for
+user-defined functions of either one independent variable, z=f(x), or two
+independent variables, z=f(x,y).  A parameter is a user-defined variable
+that `fit` will adjust, i.e., an unknown quantity in the function
+declaration.  Linearity/non-linearity refers to the relationship of the
+dependent variable, z, to the parameters which `fit` is adjusting, not of
+z to the independent variables, x and/or y.  (To be technical, the
+second @{and higher@} derivatives of the fitting function with respect to
+the parameters are zero for a linear least-squares problem).
+
+For linear least-squares (LLS), the user-defined function will be a sum of
+simple functions, not involving any parameters, each multiplied by one
+parameter.  NLLS handles more complicated functions in which parameters can
+be used in a large number of ways.  An example that illustrates the
+difference between linear and nonlinear least-squares is the Fourier series.
+One member may be written as
+@example
+     z=a*sin(c*x) + b*cos(c*x).
+@end example
+
+If a and b are the unknown parameters and c is constant, then estimating
+values of the parameters is a linear least-squares problem.  However, if
+c is an unknown parameter, the problem is nonlinear.
+
+In the linear case, parameter values can be determined by comparatively
+simple linear algebra, in one direct step.  However LLS is a special case
+which is also solved along with more general NLLS problems by the iterative
+procedure that `gnuplot` uses.  `fit` attempts to find the minimum by doing
+a search.  Each step (iteration) calculates WSSR with a new set of parameter
+values.  The Marquardt-Levenberg algorithm selects the parameter values for
+the next iteration.  The process continues until a preset criterium is met,
+either (1) the fit has "converged" (the relative change in WSSR is less than
+FIT_LIMIT), or (2) it reaches a preset iteration count limit, FIT_MAXITER
+(see @ref{variables}).  The fit may also be interrupted
+and subsequently halted from the keyboard (see `fit`).
+
+Often the function to be fitted will be based on a model (or theory) that
+attempts to describe or predict the behaviour of the data.  Then `fit` can
+be used to find values for the free parameters of the model, to determine
+how well the data fits the model, and to estimate an error range for each
+parameter.  See `fit error_estimates`.
+
+Alternatively, in curve-fitting, functions are selected independent of
+a model (on the basis of experience as to which are likely to describe
+the trend of the data with the desired resolution and a minimum number
+of parameters*functions.)  The `fit` solution then provides an analytic
+representation of the curve.
+
+However, if all you really want is a smooth curve through your data points,
+the @ref{smooth} option to @ref{plot} may be what you've been looking for rather
+than `fit`.
+
+@node error_estimates, fit_controlling, beginner's_guide, fit
+@subsection error estimates
+
+@c ?commands fit error_estimate
+@c ?fit error_estimate
+@c ?fit errors
+In `fit`, the term "error" is used in two different contexts, data error
+estimates and parameter error estimates.
+
+Data error estimates are used to calculate the relative weight of each data
+point when determining the weighted sum of squared residuals, WSSR or
+chisquare.  They can affect the parameter estimates, since they determine
+how much influence the deviation of each data point from the fitted function
+has on the final values.  Some of the `fit` output information, including
+the parameter error estimates, is more meaningful if accurate data error
+estimates have been provided.
+
+The 'statistical overview' describes some of the `fit` output and gives some
+background for the 'practical guidelines'.
+
+@menu
+* statistical_overview::        
+* practical_guidelines::        
+@end menu
+
+@node statistical_overview, practical_guidelines, error_estimates, error_estimates
+@subsubsection statistical overview
+
+@c ?commands fit error statistical_overview
+@c ?fit error statistical_overview
+@cindex statistical_overview
+
+The theory of non-linear least-squares (NLLS) is generally described in terms
+of a normal distribution of errors, that is, the input data is assumed to be
+a sample from a population having a given mean and a Gaussian (normal)
+distribution about the mean with a given standard deviation.  For a sample of
+sufficiently large size, and knowing the population standard deviation, one
+can use the statistics of the chisquare distribution to describe a "goodness
+of fit" by looking at the variable often called "chisquare".  Here, it is
+sufficient to say that a reduced chisquare (chisquare/degrees of freedom,
+where degrees of freedom is the number of datapoints less the number of
+parameters being fitted) of 1.0 is an indication that the weighted sum of
+squared deviations between the fitted function and the data points is the
+same as that expected for a random sample from a population characterized by
+the function with the current value of the parameters and the given standard
+deviations.
+
+If the standard deviation for the population is not constant, as in counting
+statistics where variance = counts, then each point should be individually
+weighted when comparing the observed sum of deviations and the expected sum
+of deviations.
+
+At the conclusion `fit` reports 'stdfit', the standard deviation of the fit,
+which is the rms of the residuals, and the variance of the residuals, also
+called 'reduced chisquare' when the data points are weighted.  The number of
+degrees of freedom (the number of data points minus the number of fitted
+parameters) is used in these estimates because the parameters used in
+calculating the residuals of the datapoints were obtained from the same data.
+
+To estimate confidence levels for the parameters, one can use the minimum
+chisquare obtained from the fit and chisquare statistics to determine the
+value of chisquare corresponding to the desired confidence level, but
+considerably more calculation is required to determine the combinations of
+parameters which produce such values.
+
+Rather than determine confidence intervals, `fit` reports parameter error
+estimates which are readily obtained from the variance-covariance matrix
+after the final iteration.  By convention, these estimates are called
+"standard errors" or "asymptotic standard errors", since they are calculated
+in the same way as the standard errors (standard deviation of each parameter)
+of a linear least-squares problem, even though the statistical conditions for
+designating the quantity calculated to be a standard deviation are not
+generally valid for the NLLS problem.  The asymptotic standard errors are
+generally over-optimistic and should not be used for determining confidence
+levels, but are useful for qualitative purposes.
+
+The final solution also produces a correlation matrix, which gives an
+indication of the correlation of parameters in the region of the solution;
+if one parameter is changed, increasing chisquare, does changing another
+compensate?  The main diagonal elements, autocorrelation, are all 1; if
+all parameters were independent, all other elements would be nearly 0.  Two
+variables which completely compensate each other would have an off-diagonal
+element of unit magnitude, with a sign depending on whether the relation is
+proportional or inversely proportional.  The smaller the magnitudes of the
+off-diagonal elements, the closer the estimates of the standard deviation
+of each parameter would be to the asymptotic standard error.
+
+@node practical_guidelines,  , statistical_overview, error_estimates
+@subsubsection practical guidelines
+
+@c ?commands fit error practical_guidelines
+@c ?fit error practical_guidelines
+@cindex practical_guidelines
+
+@cindex guidelines
+
+If you have a basis for assigning weights to each data point, doing so lets
+you make use of additional knowledge about your measurements, e.g., take into
+account that some points may be more reliable than others.  That may affect
+the final values of the parameters.
+
+Weighting the data provides a basis for interpreting the additional `fit`
+output after the last iteration.  Even if you weight each point equally,
+estimating an average standard deviation rather than using a weight of 1
+makes WSSR a dimensionless variable, as chisquare is by definition.
+
+Each fit iteration will display information which can be used to evaluate
+the progress of the fit.  (An '*' indicates that it did not find a smaller
+WSSR and is trying again.)  The 'sum of squares of residuals', also called
+'chisquare', is the WSSR between the data and your fitted function; `fit`
+has minimized that.  At this stage, with weighted data, chisquare is expected
+to approach the number of degrees of freedom (data points minus parameters).
+The WSSR can be used to calculate the reduced chisquare (WSSR/ndf) or stdfit,
+the standard deviation of the fit, sqrt(WSSR/ndf).  Both of these are
+reported for the final WSSR.
+
+If the data are unweighted, stdfit is the rms value of the deviation of the
+data from the fitted function, in user units.
+
+If you supplied valid data errors, the number of data points is large enough,
+and the model is correct, the reduced chisquare should be about unity.  (For
+details, look up the 'chi-squared distribution' in your favourite statistics
+reference.)  If so, there are additional tests, beyond the scope of this
+overview, for determining how well the model fits the data.
+
+A reduced chisquare much larger than 1.0 may be due to incorrect data error
+estimates, data errors not normally distributed, systematic measurement
+errors, 'outliers', or an incorrect model function.  A plot of the residuals,
+e.g., `plot 'datafile' using 1:($2-f($1))`, may help to show any systematic
+trends.  Plotting both the data points and the function may help to suggest
+another model.
+
+Similarly, a reduced chisquare less than 1.0 indicates WSSR is less than that
+expected for a random sample from the function with normally distributed
+errors.  The data error estimates may be too large, the statistical
+assumptions may not be justified, or the model function may be too general,
+fitting fluctuations in a particular sample in addition to the underlying
+trends.  In the latter case, a simpler function may be more appropriate.
+
+You'll have to get used to both `fit` and the kind of problems you apply it
+to before you can relate the standard errors to some more practical estimates
+of parameter uncertainties or evaluate the significance of the correlation
+matrix.
+
+Note that `fit`, in common with most NLLS implementations, minimizes the
+weighted sum of squared distances (y-f(x))**2.  It does not provide any means
+to account for "errors" in the values of x, only in y.  Also, any "outliers"
+(data points outside the normal distribution of the model) will have an
+exaggerated effect on the solution.
+
+@node fit_controlling, multi-branch, error_estimates, fit
+@subsection fit controlling
+
+@c ?commands fit_control
+@cindex fit_control
+
+@c ?fit control
+There are a number of `gnuplot` variables that can be defined to affect
+`fit`.  Those which can be defined once `gnuplot` is running are listed
+under 'control_variables' while those defined before starting `gnuplot`
+are listed under 'environment_variables'.
+
+@menu
+* control_variables::           
+* environment_variables::       
+@end menu
+
+@node control_variables, environment_variables, fit_controlling, fit_controlling
+@subsubsection control variables
+
+@c ?commands fit_control variables
+@c ?fit_control variables
+@c ?fit control variables
+The default epsilon limit (1e-5) may be changed by declaring a value for
+@example
+      FIT_LIMIT
+@end example
+
+When the sum of squared residuals changes between two iteration steps by
+a factor less than this number (epsilon), the fit is considered to have
+'converged'.
+
+The maximum number of iterations may be limited by declaring a value for
+@example
+      FIT_MAXITER
+@end example
+
+A value of 0 (or not defining it at all)  means that there is no limit.
+
+If you need even more control about the algorithm, and know the
+Marquardt-Levenberg algorithm well, there are some more variables to
+influence it. The startup value of `lambda` is normally calculated
+automatically from the ML-matrix, but if you want to, you may provide
+your own one with
+@example
+      FIT_START_LAMBDA
+@end example
+
+Specifying FIT_START_LAMBDA as zero or less will re-enable the automatic
+selection. The variable
+@example
+      FIT_LAMBDA_FACTOR
+@end example
+
+gives the factor by which `lambda` is increased or decreased whenever
+the chi-squared target function increased or decreased significantly.
+Setting FIT_LAMBDA_FACTOR to zero re-enables the default factor of
+10.0.
+
+Oher variables with the FIT_ prefix may be added to `fit`, so it is safer
+not to use that prefix for user-defined variables.
+
+The variables FIT_SKIP and FIT_INDEX were used by earlier releases of
+`gnuplot` with a 'fit' patch called `gnufit` and are no longer available.
+The datafile @ref{every} modifier provides the functionality of FIT_SKIP.
+FIT_INDEX was used for multi-branch fitting, but multi-branch fitting of
+one independent variable is now done as a pseudo-3D fit in which the
+second independent variable and @ref{using} are used to specify the branch.
+See @ref{multi-branch}.
+
+@node environment_variables,  , control_variables, fit_controlling
+@subsubsection environment variables
+
+@c ?commands fit_control environment
+@c ?fit_control environment
+@c ?fit control environment
+The environment variables must be defined before `gnuplot` is executed; how
+to do so depends on your operating system.
+
+@example
+      FIT_LOG
+@end example
+
+changes the name (and/or path) of the file to which the fit log will be
+written from the default of "fit.log" in the working directory.
+
+@example
+      FIT_SCRIPT
+@end example
+
+specifies a command that may be executed after an user interrupt. The default
+is @ref{replot}, but a @ref{plot} or @ref{load} command may be useful to display a plot
+customized to highlight the progress of the fit.
+
+@node multi-branch, starting_values, fit_controlling, fit
+@subsection multi-branch
+
+@c ?commands fit multi-branch
+@c ?fit multi-branch
+@cindex multi-branch
+
+@cindex branch
+
+In multi-branch fitting, multiple data sets can be simultaneously fit with
+functions of one independent variable having common parameters by minimizing
+the total WSSR.  The function and parameters (branch) for each data set are
+selected by using a 'pseudo-variable', e.g., either the dataline number (a
+'column' index of -1) or the datafile index (-2), as the second independent
+variable.
+
+Example:  Given two exponential decays of the form, z=f(x), each describing
+a different data set but having a common decay time, estimate the values of
+the parameters.  If the datafile has the format x:z:s, then
+@example
+     f(x,y) = (y==0) ? a*exp(-x/tau) : b*exp(-x/tau)
+     fit f(x,y) 'datafile' using  1:-1:2:3  via a, b, tau
+
+@end example
+
+For a more complicated example, see the file "hexa.fnc" used by the
+"fit.dem" demo.
+
+Appropriate weighting may be required since unit weights may cause one
+branch to predominate if there is a difference in the scale of the dependent
+variable.  Fitting each branch separately, using the multi-branch solution
+as initial values, may give an indication as to the relative effect of each
+branch on the joint solution.
+
+@node starting_values, tips, multi-branch, fit
+@subsection starting values
+
+@c ?commands fit starting_values
+@c ?fit starting_values
+@cindex starting_values
+
+Nonlinear fitting is not guaranteed to converge to the global optimum (the
+solution with the smallest sum of squared residuals, SSR), and can get stuck
+at a local minimum.  The routine has no way to determine that;  it is up to
+you to judge whether this has happened.
+
+`fit` may, and often will get "lost" if started far from a solution, where
+SSR is large and changing slowly as the parameters are varied, or it may
+reach a numerically unstable region (e.g., too large a number causing a
+floating point overflow) which results in an "undefined value" message
+or `gnuplot` halting.
+
+To improve the chances of finding the global optimum, you should set the
+starting values at least roughly in the vicinity of the solution, e.g.,
+within an order of magnitude, if possible.  The closer your starting values
+are to the solution, the less chance of stopping at another minimum.  One way
+to find starting values is to plot data and the fitting function on the same
+graph and change parameter values and @ref{replot} until reasonable similarity
+is reached.  The same plot is also useful to check whether the fit stopped at
+a minimum with a poor fit.
+
+Of course, a reasonably good fit is not proof there is not a "better" fit (in
+either a statistical sense, characterized by an improved goodness-of-fit
+criterion, or a physical sense, with a solution more consistent with the
+model.)  Depending on the problem, it may be desirable to `fit` with various
+sets of starting values, covering a reasonable range for each parameter.
+
+@node tips,  , starting_values, fit
+@subsection tips
+
+@c ?commands fit tips
+@c ?fit tips
+@cindex tips
+
+Here are some tips to keep in mind to get the most out of `fit`.  They're not
+very organized, so you'll have to read them several times until their essence
+has sunk in.
+
+The two forms of the `via` argument to `fit` serve two largely distinct
+purposes.  The `via "file"` form is best used for (possibly unattended) batch
+operation, where you just supply the startup values in a file and can later
+use @ref{update} to copy the results back into another (or the same) parameter
+file.
+
+The `via var1, var2, ...` form is best used interactively, where the command
+history mechanism may be used to edit the list of parameters to be fitted or
+to supply new startup values for the next try.  This is particularly useful
+for hard problems, where a direct fit to all parameters at once won't work
+without good starting values.  To find such, you can iterate several times,
+fitting only some of the parameters, until the values are close enough to the
+goal that the final fit to all parameters at once will work.
+
+Make sure that there is no mutual dependency among parameters of the function
+you are fitting.  For example, don't try to fit a*exp(x+b), because
+a*exp(x+b)=a*exp(b)*exp(x).  Instead, fit either a*exp(x) or exp(x+b).
+
+A technical issue:  the parameters must not be too different in magnitude.
+The larger the ratio of the largest and the smallest absolute parameter
+values, the slower the fit will converge.  If the ratio is close to or above
+the inverse of the machine floating point precision, it may take next to
+forever to converge, or refuse to converge at all.  You will have to adapt
+your function to avoid this, e.g., replace 'parameter' by '1e9*parameter' in
+the function definition, and divide the starting value by 1e9.
+
+If you can write your function as a linear combination of simple functions
+weighted by the parameters to be fitted, by all means do so.  That helps a
+lot, because the problem is no longer nonlinear and should converge with only
+a small number of iterations, perhaps just one.
+
+Some prescriptions for analysing data, given in practical experimentation
+courses, may have you first fit some functions to your data, perhaps in a
+multi-step process of accounting for several aspects of the underlying
+theory one by one, and then extract the information you really wanted from
+the fitting parameters of those functions.  With `fit`, this may often be
+done in one step by writing the model function directly in terms of the
+desired parameters.  Transforming data can also quite often be avoided,
+though sometimes at the cost of a more difficult fit problem.  If you think
+this contradicts the previous paragraph about simplifying the fit function,
+you are correct.
+
+A "singular matrix" message indicates that this implementation of the
+Marquardt-Levenberg algorithm can't calculate parameter values for the next
+iteration.  Try different starting values, writing the function in another
+form, or a simpler function.
+
+Finally, a nice quote from the manual of another fitting package (fudgit),
+that kind of summarizes all these issues:  "Nonlinear fitting is an art!"
+
+@node help, if, fit, Commands
+@section help
+
+@c ?commands help
+@cindex help
+@cmindex help
+
+
+The @ref{help} command displays on-line help. To specify information on a
+particular topic use the syntax:
+
+@example
+      help @{<topic>@}
+
+@end example
+
+If <topic> is not specified, a short message is printed about `gnuplot`.
+After help for the requested topic is given, a menu of subtopics is given;
+help for a subtopic may be requested by typing its name, extending the help
+request.  After that subtopic has been printed, the request may be extended
+again or you may go back one level to the previous topic.  Eventually, the
+`gnuplot` command line will return.
+
+If a question mark (?) is given as the topic, the list of topics currently
+available is printed on the screen.
+
+@node if, load, help, Commands
+@section if
+
+@c ?commands if
+@cindex if
+@cmindex if
+
+
+The @ref{if} command allows commands to be executed conditionally.
+
+Syntax:
+@example
+      if (<condition>) <command-line>
+
+@end example
+
+<condition> will be evaluated.  If it is true (non-zero), then the command(s)
+of the <command-line> will be executed.  If <condition> is false (zero), then
+the entire <command-line> is ignored.  Note that use of `;` to allow multiple
+commands on the same line will _not_ end the conditionalized commands.
+
+Examples:
+@example
+      pi=3
+      if (pi!=acos(-1)) print "?Fixing pi!"; pi=acos(-1); print pi
+@end example
+
+will display:
+@example
+      ?Fixing pi!
+      3.14159265358979
+@end example
+
+but
+@example
+      if (1==2) print "Never see this"; print "Or this either"
+@end example
+
+will not display anything.
+
+See @ref{reread} for an example of how @ref{if} and @ref{reread} can be used together to
+perform a loop.
+
+@node load, pause, if, Commands
+@section load
+
+@c ?commands load
+@cindex load
+@cmindex load
+
+
+The @ref{load} command executes each line of the specified input file as if it
+had been typed in interactively.  Files created by the @ref{save} command can
+later be @ref{load}ed.  Any text file containing valid commands can be created
+and then executed by the @ref{load} command.  Files being @ref{load}ed may themselves
+contain @ref{load} or @ref{call} commands.  See `comment` for information about
+comments in commands.  To @ref{load} with arguments, see @ref{call}.
+
+The @ref{load} command _must_ be the last command on a multi-command line.
+
+Syntax:
+@example
+      load "<input-file>"
+
+@end example
+
+The name of the input file must be enclosed in quotes.
+
+The special filename "-" may be used to @ref{load} commands from standard input.
+This allows a `gnuplot` command file to accept some commands from standard
+input.  Please see "help batch/interactive" for more details.
+
+Examples:
+@example
+      load 'work.gnu'
+      load "func.dat"
+
+@end example
+
+The @ref{load} command is performed implicitly on any file names given as
+arguments to `gnuplot`.  These are loaded in the order specified, and
+then `gnuplot` exits.
+
+@node pause, plot, load, Commands
+@section pause
+
+@c ?commands pause
+@cindex pause
+@cmindex pause
+
+
+The @ref{pause} command displays any text associated with the command and then
+waits a specified amount of time or until the carriage return is pressed.
+@ref{pause} is especially useful in conjunction with @ref{load} files.
+
+Syntax:
+@example
+      pause <time> @{"<string>"@}
+
+@end example
+
+<time> may be any integer constant or expression.  Choosing -1 will wait
+until a carriage return is hit, zero (0) won't pause at all, and a positive
+integer will wait the specified number of seconds.  `pause 0` is synonymous
+with @ref{print}.
+
+Note: Since @ref{pause} communicates with the operating system rather than the
+graphics, it may behave differently with different device drivers (depending
+upon how text and graphics are mixed).
+
+Examples:
+@example
+      pause -1    # Wait until a carriage return is hit
+      pause 3     # Wait three seconds
+      pause -1  "Hit return to continue"
+      pause 10  "Isn't this pretty?  It's a cubic spline."
+
+@end example
+
+
+@node plot, print, pause, Commands
+@section plot
+
+@c ?commands plot
+@cindex plot
+@cmindex plot
+
+
+@ref{plot} is the primary command for drawing plots with `gnuplot`.  It creates
+plots of functions and data in many, many ways.  @ref{plot} is used to draw 2-d
+functions and data; `splot` draws 2-d projections of 3-d surfaces and data.
+@ref{plot} and `splot` contain many common features; see `splot` for differences.
+Note specifically that `splot`'s @ref{binary} and @ref{matrix} options do not exist
+for @ref{plot}.
+
+Syntax:
+@example
+      plot @{<ranges>@}
+           @{<function> | @{"<datafile>" @{datafile-modifiers@}@}@}
+           @{axes <axes>@} @{<title-spec>@} @{with <style>@}
+           @{, @{definitions,@} <function> ...@}
+
+@end example
+
+where either a <function> or the name of a data file enclosed in quotes is
+supplied.  A function is a mathematical expression or a pair of mathematical
+expressions in parametric mode.  The expressions may be defined completely or
+in part earlier in the stream of `gnuplot` commands (see `user-defined`).
+
+It is also possible to define functions and parameters on the @ref{plot} command
+itself.  This is done merely by isolating them from other items with commas.
+
+There are four possible sets of axes available; the keyword <axes> is used to
+select the axes for which a particular line should be scaled.  `x1y1` refers
+to the axes on the bottom and left; `x2y2` to those on the top and right;
+`x1y2` to those on the bottom and right; and `x2y1` to those on the top and
+left.  Ranges specified on the @ref{plot} command apply only to the first set of
+axes (bottom left).
+
+Examples:
+@example
+      plot sin(x)
+      plot f(x) = sin(x*a), a = .2, f(x), a = .4, f(x)
+      plot [t=1:10] [-pi:pi*2] tan(t), \
+           "data.1" using (tan($2)):($3/$4) smooth csplines \
+                    axes x1y2 notitle with lines 5
+
+@end example
+
+
+@menu
+* data-file::                   
+* errorbars::                   
+* parametric::                  
+* ranges::                      
+* title::                       
+* with::                        
+@end menu
+
+@node data-file, errorbars, plot, plot
+@subsection data-file
+
+@c ?commands plot datafile
+@c ?plot datafile
+@cindex data-file
+
+@cindex datafile
+
+@cindex data
+
+Discrete data contained in a file can be displayed by specifying the name of
+the data file (enclosed in single or double quotes) on the @ref{plot} command line.
+
+Syntax:
+@example
+      plot '<file_name>' @{index <index list>@}
+                            @{every <every list>@}
+                            @{thru <thru expression>@}
+                            @{using <using list>@}
+                            @{smooth <option>@}
+
+@end example
+
+The modifiers @ref{index}, @ref{every}, @ref{thru}, @ref{using}, and @ref{smooth} are discussed
+separately.  In brief, @ref{index} selects which data sets in a multi-data-set
+file are to be plotted, @ref{every} specifies which points within a single data
+set are to be plotted, @ref{using} determines how the columns within a single
+record are to be interpreted (@ref{thru} is a special case of @ref{using}), and
+@ref{smooth} allows for simple interpolation and approximation.  ('splot' has a
+similar syntax, but does not support the @ref{smooth} and @ref{thru} options.)
+
+Data files should contain at least one data point per record (@ref{using} can
+select one data point from the record).  Records beginning with `#` (and
+also with `!` on VMS) will be treated as comments and ignored.  Each data
+point represents an (x,y) pair.  For @ref{plot}s with error bars (see @ref{errorbars}), each data point is (x,y,ydelta), (x,y,ylow,yhigh), (x,y,xdelta),
+(x,y,xlow,xhigh), or (x,y,xlow,xhigh,ylow,yhigh).  In all cases, the numbers
+on each record of a data file must be separated by white space (one or more
+blanks or tabs), unless a format specifier is provided by the @ref{using} option.
+This white space divides each record into columns.
+
+Data may be written in exponential format with the exponent preceded by the
+letter e, E, d, D, q, or Q.
+
+Only one column (the y value) need be provided.  If x is omitted, `gnuplot`
+provides integer values starting at 0.
+
+In datafiles, blank records (records with no characters other than blanks and
+a newline and/or carriage return) are significant---pairs of blank records
+separate @ref{index}es (see @ref{index}).  Data separated by double
+blank records are treated as if they were in separate data files.
+
+Single blank records designate discontinuities in a @ref{plot}; no line will join
+points separated by a blank records (if they are plotted with a line style).
+
+If autoscaling has been enabled (@ref{autoscale}), the axes are automatically
+extended to include all datapoints, with a whole number of tic marks if tics
+are being drawn.  This has two consequences: i) For `splot`, the corner of
+the surface may not coincide with the corner of the base.  In this case, no
+vertical line is drawn.  ii) When plotting data with the same x range on a
+dual-axis graph, the x coordinates may not coincide if the x2tics are not
+being drawn.  This is because the x axis has been autoextended to a whole
+number of tics, but the x2 axis has not.  The following example illustrates
+the problem:
+
+@example
+      reset; plot '-', '-'
+      1 1
+      19 19
+      e
+      1 1
+      19 19
+      e
+
+@end example
+
+@menu
+* every::                       
+* example_datafile::            
+* index::                       
+* smooth::                      
+* special-filenames::           
+* thru::                        
+* using::                       
+@end menu
+
+@node every, example_datafile, data-file, data-file
+@subsubsection every
+
+@c ?commands plot datafile every
+@c ?plot datafile every
+@c ?plot every
+@c ?data-file every
+@c ?datafile every
+@cindex every
+
+The @ref{every} keyword allows a periodic sampling of a data set to be plotted.
+
+In the discussion a "point" is a datum defined by a single record in the
+file; "block" here will mean the same thing as "datablock" (see `glossary`).
+
+Syntax:
+@example
+      plot 'file' every @{<point_incr>@}
+                          @{:@{<block_incr>@}
+                            @{:@{<start_point>@}
+                              @{:@{<start_block>@}
+                                @{:@{<end_point>@}
+                                  @{:<end_block>@}@}@}@}@}
+
+@end example
+
+The data points to be plotted are selected according to a loop from
+<`start_point`> to <`end_point`> with increment <`point_incr`> and the
+blocks according to a loop from <`start_block`> to <`end_block`> with
+increment <`block_incr`>.
+
+The first datum in each block is numbered '0', as is the first block in the
+file.
+
+Note that records containing unplottable information are counted.
+
+Any of the numbers can be omitted; the increments default to unity, the start
+values to the first point or block, and the end values to the last point or
+block.  If @ref{every} is not specified, all points in all lines are plotted.
+
+Examples:
+@example
+      every :::3::3    # selects just the fourth block ('0' is first)
+      every :::::9     # selects the first 10 blocks
+      every 2:2        # selects every other point in every other block
+      every ::5::15    # selects points 5 through 15 in each block
+@end example
+
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/simple.html,Simple Plot Demos },
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/surfacea/surfacea.html,Non-parametric splot demos }, and
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/surfaceb/surfaceb.html,Parametric splot demos.}
+
+@node example_datafile, index, every, data-file
+@subsubsection example datafile
+
+@c ?commands plot datafile example
+@c ?plot datafile example
+@c ?plot example
+@c ?datafile example
+@c ?data-file example
+@cindex example
+
+This example plots the data in the file "population.dat" and a theoretical
+curve:
+
+@example
+      pop(x) = 103*exp((1965-x)/10)
+      plot [1960:1990] 'population.dat', pop(x)
+
+@end example
+
+The file "population.dat" might contain:
+
+@example
+      # Gnu population in Antarctica since 1965
+         1965   103
+         1970   55
+         1975   34
+         1980   24
+         1985   10
+
+@end example
+
+@c ^ <img align=bottom src="http://www.nas.nasa.gov/~woo/gnuplot/doc/population.gif" alt="[population.gif]" width=640 height=480>
+
+@node index, smooth, example_datafile, data-file
+@subsubsection index
+
+@c ?commands plot datafile index
+@c ?plot datafile index
+@c ?plot index
+@c ?data-file index
+@c ?datafile index
+@cindex index
+
+The @ref{index} keyword allows only some of the data sets in a multi-data-set
+file to be plotted.
+
+Syntax:
+@example
+      plot 'file' index <m>@{@{:<n>@}:<p>@}
+
+@end example
+
+Data sets are separated by pairs of blank records.  `index <m>` selects only
+set <m>; `index <m>:<n>` selects sets in the range <m> to <n>; and `index
+<m>:<n>:<p>` selects indices <m>, <m>+<p>, <m>+2<p>, etc., but stopping at
+<n>.  Following C indexing, the index 0 is assigned to the first data set in
+the file.  Specifying too large an index results in an error message.  If
+@ref{index} is not specified, all sets are plotted as a single data set.
+
+Example:
+@example
+      plot 'file' index 4:5
+@end example
+
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/multimsh.html,splot with indices demo. }
+
+@node smooth, special-filenames, index, data-file
+@subsubsection smooth
+
+@c ?commands plot datafile smooth
+@c ?plot datafile smooth
+@c ?plot smooth
+@c ?data-file smooth
+@c ?datafile smooth
+@cindex smooth
+
+`gnuplot` includes a few general-purpose routines for interpolation and
+approximation of data; these are grouped under the @ref{smooth} option.  More
+sophisticated data processing may be performed by preprocessing the data
+externally or by using `fit` with an appropriate model.
+
+Syntax:
+@example
+      smooth @{unique | csplines | acsplines | bezier | sbezier@}
+
+@end example
+
+`unique` plots the data after making them monotonic.  Each of the other
+routines uses the data to determine the coefficients of a continuous curve
+between the endpoints of the data.  This curve is then plotted in the same
+manner as a function, that is, by finding its value at uniform intervals
+along the abscissa (see @ref{samples}) and connecting these points with
+straight line segments (if a line style is chosen).
+
+If @ref{autoscale} is in effect, the ranges will be computed such that the
+plotted curve lies within the borders of the graph.
+
+If too few points are available to allow the selected option to be applied,
+an error message is produced.  The minimum number is one for `unique`, four
+for `acsplines`, and three for the others.
+
+The @ref{smooth} options have no effect on function plots.
+
+
+@noindent --- ACSPLINES ---
+
+@c ?commands plot datafile smooth acsplines
+@c ?plot datafile smooth acsplines
+@c ?data-file smooth acsplines
+@c ?datafile smooth acsplines
+@c ?plot smooth acsplines
+@c ?plot acsplines
+@c ?smooth acsplines
+@cindex acsplines
+
+The `acsplines` option approximates the data with a "natural smoothing spline".
+After the data are made monotonic in x (see `smooth unique`), a curve is
+piecewise constructed from segments of cubic polynomials whose coefficients
+are found by the weighting the data points; the weights are taken from the
+third column in the data file.  That default can be modified by the third
+entry in the @ref{using} list, e.g.,
+@example
+      plot 'data-file' using 1:2:(1.0) smooth acsplines
+
+@end example
+
+Qualitatively, the absolute magnitude of the weights determines the number
+of segments used to construct the curve.  If the weights are large, the
+effect of each datum is large and the curve approaches that produced by
+connecting consecutive points with natural cubic splines.  If the weights are
+small, the curve is composed of fewer segments and thus is smoother; the
+limiting case is the single segment produced by a weighted linear least
+squares fit to all the data.  The smoothing weight can be expressed in terms
+of errors as a statistical weight for a point divided by a "smoothing factor"
+for the curve so that (standard) errors in the file can be used as smoothing
+weights.
+
+Example:
+@example
+      sw(x,S)=1/(x*x*S)
+      plot 'data_file' using 1:2:(sw($3,100)) smooth acsplines
+
+@end example
+
+
+@noindent --- BEZIER ---
+
+@c ?commands plot datafile smooth bezier
+@c ?plot datafile smooth bezier
+@c ?plot smooth bezier
+@c ?data-file smooth bezier
+@c ?datafile smooth bezier
+@c ?plot bezier
+@c ?smooth bezier
+@cindex bezier
+
+The `bezier` option approximates the data with a Bezier curve of degree n
+(the number of data points) that connects the endpoints.
+
+
+@noindent --- CSPLINES ---
+
+@c ?commands plot datafile smooth csplines
+@c ?plot datafile smooth csplines
+@c ?plot smooth csplines
+@c ?data-file smooth csplines
+@c ?datafile smooth csplines
+@c ?plot csplines
+@c ?smooth csplines
+@cindex csplines
+
+The `csplines` option connects consecutive points by natural cubic splines
+after rendering the data monotonic (see `smooth unique`).
+
+
+@noindent --- SBEZIER ---
+
+@c ?commands plot datafile smooth sbezier
+@c ?plot datafile smooth sbezier
+@c ?plot smooth sbezier
+@c ?data-file smooth sbezier
+@c ?datafile smooth sbezier
+@c ?plot sbezier
+@c ?smooth sbezier
+@cindex sbezier
+
+The `sbezier` option first renders the data monotonic (`unique`) and then
+applies the `bezier` algorithm.
+
+
+@noindent --- UNIQUE ---
+
+@c ?commands plot datafile smooth unique
+@c ?plot datafile smooth unique
+@c ?plot smooth unique
+@c ?data-file smooth unique
+@c ?datafile smooth unique
+@c ?plot unique
+@c ?smooth unique
+@cindex unique
+
+The `unique` option makes the data monotonic in x; points with the same
+x-value are replaced by a single point having the average y-value.  The
+resulting points are then connected by straight line segments.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/mgr.html,See demos. }
+
+@node special-filenames, thru, smooth, data-file
+@subsubsection special-filenames
+
+@c ?commands plot datafile special-filenames
+@c ?plot datafile special-filenames
+@c ?plot special-filenames
+@c ?datafile special-filenames
+@cindex special-filenames
+
+A special filename of `'-'` specifies that the data are inline; i.e., they
+follow the command.  Only the data follow the command; @ref{plot} options like
+filters, titles, and line styles remain on the 'plot' command line.  This is
+similar to << in unix shell script, and $DECK in VMS DCL.  The data are
+entered as though they are being read from a file, one data point per record.
+The letter "e" at the start of the first column terminates data entry.  The
+@ref{using} option can be applied to these data---using it to filter them through
+a function might make sense, but selecting columns probably doesn't!
+
+`'-'` is intended for situations where it is useful to have data and commands
+together, e.g., when `gnuplot` is run as a sub-process of some front-end
+application.  Some of the demos, for example, might use this feature.  While
+@ref{plot} options such as @ref{index} and @ref{every} are recognized, their use forces
+you to enter data that won't be used.  For example, while
+
+@example
+      plot '-' index 0, '-' index 1
+      2
+      4
+      6
+
+@end example
+
+
+@example
+      10
+      12
+      14
+      e
+      2
+      4
+      6
+
+@end example
+
+
+@example
+      10
+      12
+      14
+      e
+
+@end example
+
+does indeed work,
+
+@example
+      plot '-', '-'
+      2
+      4
+      6
+      e
+      10
+      12
+      14
+      e
+
+@end example
+
+is a lot easier to type.
+
+If you use `'-'` with @ref{replot}, you may need to enter the data more than once
+(see @ref{replot}).
+
+A blank filename ('') specifies that the previous filename should be reused.
+This can be useful with things like
+
+@example
+      plot 'a/very/long/filename' using 1:2, '' using 1:3, '' using 1:4
+
+@end example
+
+(If you use both `'-'` and `''` on the same @ref{plot} command, you'll need to
+have two sets of inline data, as in the example above.)
+
+On some computer systems with a popen function (Unix), the datafile can be
+piped through a shell command by starting the file name with a '<'.  For
+example,
+
+@example
+      pop(x) = 103*exp(-x/10)
+      plot "< awk '@{print $1-1965, $2@}' population.dat", pop(x)
+
+@end example
+
+would plot the same information as the first population example but with
+years since 1965 as the x axis.  If you want to execute this example, you
+have to delete all comments from the data file above or substitute the
+following command for the first part of the command above (the part up to
+the comma):
+
+@example
+      plot "< awk '$0 !~ /^#/ @{print $1-1965, $2@}' population.dat"
+
+@end example
+
+While this approach is most flexible, it is possible to achieve simple
+filtering with the @ref{using} or @ref{thru} keywords.
+
+@node thru, using, special-filenames, data-file
+@subsubsection thru
+
+@c ?commands plot datafile thru
+@c ?plot datafile thru
+@c ?plot thru
+@c ?data-file thru
+@c ?datafile thru
+@cindex thru
+
+The @ref{thru} function is provided for backward compatibility.
+
+Syntax:
+@example
+      plot 'file' thru f(x)
+
+@end example
+
+It is equivalent to:
+
+@example
+      plot 'file' using 1:(f($2))
+
+@end example
+
+While the latter appears more complex, it is much more flexible.  The more
+natural
+
+@example
+      plot 'file' thru f(y)
+
+@end example
+
+also works (i.e. you can use y as the dummy variable).
+
+@ref{thru} is parsed for `splot` and `fit` but has no effect.
+
+@node using,  , thru, data-file
+@subsubsection using
+
+@c ?commands plot datafile using
+@c ?plot datafile using
+@c ?plot using
+@c ?data-file using
+@c ?datafile using
+@cindex using
+
+The most common datafile modifier is @ref{using}.
+
+Syntax:
+@example
+      plot 'file' using @{<entry> @{:<entry> @{:<entry> ...@}@}@} @{'format'@}
+
+@end example
+
+If a format is specified, each datafile record is read using the C library's
+'scanf' function, with the specified format string.  Otherwise the record is
+read and broken into columns at spaces or tabs.  A format cannot be specified
+if time-format data is being used (this must be done by `set data time`).
+
+The resulting array of data is then sorted into columns according to the
+entries.  Each <entry> may be a simple column number, which selects the
+datum, an expression enclosed in parentheses, or empty.  The expression can
+use $1 to access the first item read, $2 for the second item, and so on.  It
+can also use `column(x)` and `valid(x)` where x is an arbitrary expression
+resulting in an integer.  `column(x)` returns the x'th datum; `valid(x)`
+tests that the datum in the x'th column is a valid number.  A column number
+of 0 generates a number increasing (from zero) with each point, and is reset
+upon encountering two blank records.  A column number of -1 gives the
+dataline number, which starts at 0, increments at single blank records, and
+is reset at double blank records.  A column number of -2 gives the index
+number, which is incremented only when two blank records are found.  An empty
+<entry> will default to its order in the list of entries.  For example,
+`using ::4` is interpreted as `using 1:2:4`.
+
+N.B.---the @ref{call} command also uses $'s as a special character.  See @ref{call}
+for details about how to include a column number in a @ref{call} argument list.
+
+If the @ref{using} list has but a single entry, that <entry> will be used for y
+and the data point number is used for x; for example, "`plot 'file' using 1`"
+is identical to "`plot 'file' using 0:1`".  If the @ref{using} list has two
+entries, these will be used for x and y.  Additional entries are usually
+errors in x and/or y.  See @ref{style} for details about plotting styles that
+make use of error information, and `fit` for use of error information in
+curve fitting.
+
+'scanf' accepts several numerical specifications but `gnuplot` requires all
+inputs to be double-precision floating-point variables, so `lf` is the only
+permissible specifier.  'scanf' expects to see white space---a blank, tab
+("\t"), newline ("\n"), or formfeed ("\f")---between numbers; anything else
+in the input stream must be explicitly skipped.
+
+Note that the use of "\t", "\n", or "\f" or requires use of double-quotes
+rather than single-quotes.
+
+Examples:
+
+This creates a plot of the sum of the 2nd and 3rd data against the first:
+(The format string specifies comma- rather than space-separated columns.)
+@example
+      plot 'file' using 1:($2+$3) '%lf,%lf,%lf'
+
+@end example
+
+In this example the data are read from the file "MyData" using a more
+complicated format:
+@example
+      plot 'MyData' using "%*lf%lf%*20[^\n]%lf"
+
+@end example
+
+The meaning of this format is:
+
+@example
+      %*lf        ignore a number
+      %lf         read a double-precision number (x by default)
+      %*20[^\n]   ignore 20 non-newline characters
+      %lf         read a double-precision number (y by default)
+
+@end example
+
+One trick is to use the ternary `?:` operator to filter data:
+
+@example
+      plot 'file' using 1:($3>10 ? $2 : 1/0)
+
+@end example
+
+which plots the datum in column two against that in column one provided
+the datum in column three exceeds ten.  `1/0` is undefined; `gnuplot`
+quietly ignores undefined points, so unsuitable points are suppressed.
+
+In fact, you can use a constant expression for the column number, provided it
+doesn't start with an opening parenthesis; constructs like `using
+0+(complicated expression)` can be used.  The crucial point is that the
+expression is evaluated once if it doesn't start with a left parenthesis, or
+once for each data point read if it does.
+
+If timeseries data are being used, the time can span multiple columns.  The
+starting column should be specified.  Note that the spaces within the time
+must be included when calculating starting columns for other data.  E.g., if
+the first element on a line is a time with an embedded space, the y value
+should be specified as column three.
+
+It should be noted that `plot 'file'`, `plot 'file' using 1:2`, and `plot
+'file' using ($1):($2)` can be subtly different: 1) if `file` has some lines
+with one column and some with two, the first will invent x values when they
+are missing, the second will quietly ignore the lines with one column, and
+the third will store an undefined value for lines with one point (so that in
+a plot with lines, no line joins points across the bad point); 2) if a line
+contains text at the first column, the first will abort the plot on an error,
+but the second and third should quietly skip the garbage.
+
+In fact, it is often possible to plot a file with lots of lines of garbage at
+the top simply by specifying
+
+@example
+      plot 'file' using 1:2
+
+@end example
+
+However, if you want to leave text in your data files, it is safer to put the
+comment character (#) in the first column of the text lines.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/using.html,Feeble using demos. }
+
+@node errorbars, parametric, data-file, plot
+@subsection errorbars
+
+@c ?commands plot errorbars
+@c ?commands splot errorbars
+@c ?plot errorbars
+@c ?splot errorbars
+@cindex errorbars
+
+Error bars are supported for 2-d data file plots by reading one to four
+additional columns (or @ref{using} entries); these additional values are used in
+different ways by the various errorbar styles.
+
+In the default situation, `gnuplot` expects to see three, four, or six
+numbers on each line of the data file---either
+
+@example
+      (x, y, ydelta),
+      (x, y, ylow, yhigh),
+      (x, y, xdelta),
+      (x, y, xlow, xhigh),
+      (x, y, xdelta, ydelta), or
+      (x, y, xlow, xhigh, ylow, yhigh).
+
+@end example
+
+The x coordinate must be specified.  The order of the numbers must be
+exactly as given above, though the @ref{using} qualifier can manipulate the order
+and provide values for missing columns.  For example,
+
+@example
+      plot 'file' with errorbars
+      plot 'file' using 1:2:(sqrt($1)) with xerrorbars
+      plot 'file' using 1:2:($1-$3):($1+$3):4:5 with xyerrorbars
+
+@end example
+
+The last example is for a file containing an unsupported combination of
+relative x and absolute y errors.  The @ref{using} entry generates absolute x min
+and max from the relative error.
+
+The y error bar is a vertical line plotted from (x, ylow) to (x, yhigh).
+If ydelta is specified instead of ylow and yhigh, ylow = y - ydelta and
+yhigh = y + ydelta are derived.  If there are only two numbers on the record,
+yhigh and ylow are both set to y.  The x error bar is a horizontal line
+computed in the same fashion.  To get lines plotted between the data points,
+@ref{plot} the data file twice, once with errorbars and once with lines (but
+remember to use the `notitle` option on one to avoid two entries in the key).
+
+The error bars have crossbars at each end unless @ref{bar} is used (see @ref{bar} for details).
+
+If autoscaling is on, the ranges will be adjusted to include the error bars.
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/errorbar/errorbar.html,Errorbar demos. }
+
+See @ref{using}, @ref{with}, and @ref{style} for more information.
+
+@node parametric, ranges, errorbars, plot
+@subsection parametric
+
+@c ?commands plot parametric
+@c ?commands splot parametric
+@c ?plot parametric
+@c ?splot parametric
+@cindex parametric
+@opindex parametric
+
+
+When in parametric mode (`set parametric`) mathematical expressions must be
+given in pairs for @ref{plot} and in triplets for `splot`.
+
+Examples:
+@example
+      plot sin(t),t**2
+      splot cos(u)*cos(v),cos(u)*sin(v),sin(u)
+
+@end example
+
+Data files are plotted as before, except any preceding parametric function
+must be fully specified before a data file is given as a plot.  In other
+words, the x parametric function (`sin(t)` above) and the y parametric
+function (`t**2` above) must not be interrupted with any modifiers or data
+functions; doing so will generate a syntax error stating that the parametric
+function is not fully specified.
+
+Other modifiers, such as @ref{with} and `title`, may be specified only after the
+parametric function has been completed:
+
+@example
+      plot sin(t),t**2 title 'Parametric example' with linespoints
+@end example
+
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/param.html,Parametric Mode Demos. }
+
+@node ranges, title, parametric, plot
+@subsection ranges
+
+@c ?commands plot ranges
+@c ?commands splot ranges
+@c ?plot ranges
+@c ?splot ranges
+@cindex ranges
+
+The optional ranges specify the region of the graph that will be displayed.
+
+Syntax:
+@example
+      [@{<dummy-var>=@}@{@{<min>@}:@{<max>@}@}]
+      [@{@{<min>@}:@{<max>@}@}]
+
+@end example
+
+The first form applies to the independent variable (@ref{xrange} or @ref{trange}, if
+in parametric mode).  The second form applies to the dependent variable
+@ref{yrange} (and @ref{xrange}, too, if in parametric mode).  <dummy-var> is a new
+name for the independent variable.  (The defaults may be changed with @ref{dummy}.)  The optional <min> and <max> terms can be constant expressions or *.
+
+In non-parametric mode, the order in which ranges must be given is @ref{xrange}
+and @ref{yrange}.
+
+In parametric mode, the order for the @ref{plot} command is @ref{trange}, @ref{xrange},
+and @ref{yrange}.  The following @ref{plot} command shows setting the @ref{trange} to
+[-pi:pi], the @ref{xrange} to [-1.3:1.3] and the @ref{yrange} to [-1:1] for the
+duration of the graph:
+
+@example
+      plot [-pi:pi] [-1.3:1.3] [-1:1] sin(t),t**2
+
+@end example
+
+Note that the x2range and y2range cannot be specified here---@ref{x2range}
+and @ref{y2range} must be used.
+
+Ranges are interpreted in the order listed above for the appropriate mode.
+Once all those needed are specified, no further ones must be listed, but
+unneeded ones cannot be skipped---use an empty range `[]` as a placeholder.
+
+`*` can be used to allow autoscaling of either of min and max.  See also
+@ref{autoscale}.
+
+Ranges specified on the @ref{plot} or `splot` command line affect only that
+graph; use the @ref{xrange}, @ref{yrange}, etc., commands to change the
+default ranges for future graphs.
+
+With time data, you must provide the range (in the same manner as the time
+appears in the datafile) within quotes.  `gnuplot` uses the @ref{timefmt} string
+to read the value---see @ref{timefmt}.
+
+Examples:
+
+This uses the current ranges:
+@example
+      plot cos(x)
+
+@end example
+
+This sets the x range only:
+@example
+      plot [-10:30] sin(pi*x)/(pi*x)
+
+@end example
+
+This is the same, but uses t as the dummy-variable:
+@example
+      plot [t = -10 :30]  sin(pi*t)/(pi*t)
+
+@end example
+
+This sets both the x and y ranges:
+@example
+      plot [-pi:pi] [-3:3]  tan(x), 1/x
+
+@end example
+
+This sets only the y range, and turns off autoscaling on both axes:
+@example
+      plot [ ] [-2:sin(5)*-8] sin(x)**besj0(x)
+
+@end example
+
+This sets xmax and ymin only:
+@example
+      plot [:200] [-pi:]  exp(sin(x))
+
+@end example
+
+This sets the x range for a timeseries:
+@example
+      set timefmt "%d/%m/%y %H:%M"
+      plot ["1/6/93 12:00":"5/6/93 12:00"] 'timedata.dat'
+
+@end example
+
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/ranges/ranges.html,See Demo. }
+
+@node title, with, ranges, plot
+@subsection title
+
+@c ?commands plot title
+@c ?commands splot title
+@c ?plot title
+@c ?splot title
+A line title for each function and data set appears in the key, accompanied
+by a sample of the line and/or symbol used to represent it.  It can be
+changed by using the `title` option.
+
+Syntax:
+@example
+      title "<title>" | notitle
+
+@end example
+
+where <title> is the new title of the line and must be enclosed in quotes.
+The quotes will not be shown in the key.  A special character may be given as
+a backslash followed by its octal value ("\345").  The tab character "\t" is
+understood.  Note that backslash processing occurs only for strings enclosed
+in double quotes---use single quotes to prevent such processing.  The newline
+character "\n" is not processed in key entries in either type of string.
+
+The line title and sample can be omitted from the key by using the keyword
+`notitle`.  A null title (`title ''`) is equivalent to `notitle`.  If only
+the sample is wanted, use one or more blanks (`title ' '`).
+
+By default the line title is the function or file name as it appears on the
+@ref{plot} command.  If it is a file name, any datafile modifiers specified will
+be included in the default title.
+
+The layout of the key itself (position, title justification, etc.) can be
+controlled by @ref{key}.  Please see @ref{key} for details.
+
+Examples:
+
+This plots y=x with the title 'x':
+@example
+      plot x
+
+@end example
+
+This plots x squared with title "x^2" and file "data.1" with title
+"measured data":
+@example
+      plot x**2 title "x^2", 'data.1' t "measured data"
+
+@end example
+
+This puts an untitled circular border around a polar graph:
+@example
+      set polar; plot my_function(t), 1 notitle
+
+@end example
+
+@node with,  , title, plot
+@subsection with
+
+@c ?commands plot with
+@c ?commands splot with
+@c ?commands plot style
+@c ?commands splot style
+@c ?plot with
+@c ?plot style
+@c ?splot with
+@c ?splot style
+@cindex style
+@opindex style
+
+
+@cindex with
+
+Functions and data may be displayed in one of a large number of styles.
+The @ref{with} keyword provides the means of selection.
+
+Syntax:
+@example
+      with <style> @{ @{linestyle | ls <line_style>@}
+                     | @{@{linetype | lt <line_type>@}
+                        @{linewidth | lw <line_width>@}
+                        @{pointtype | pt <point_type>@}
+                        @{pointsize | ps <point_size>@}@} @}
+
+@end example
+
+where <style> is either `lines`, `points`, @ref{linespoints}, @ref{impulses}, @ref{dots},
+@ref{steps}, @ref{fsteps}, @ref{histeps}, @ref{errorbars}, @ref{xerrorbars}, @ref{yerrorbars},
+@ref{xyerrorbars}, @ref{boxes}, @ref{boxerrorbars}, @ref{boxxyerrorbars}, @ref{financebars},
+@ref{candlesticks} or @ref{vector}.  Some of these styles require additional
+information.  See `set style <style>` for details of each style.
+
+Default styles are chosen with the @ref{style} and @ref{style}
+commands.
+
+By default, each function and data file will use a different line type and
+point type, up to the maximum number of available types.  All terminal
+drivers support at least six different point types, and re-use them, in
+order, if more are required.  The LaTeX driver supplies an additional six
+point types (all variants of a circle), and thus will only repeat after 12
+curves are plotted with points.  The PostScript drivers (`postscript`)
+supplies a total of 64.
+
+If you wish to choose the line or point type for a single plot, <line_type>
+and <point_type> may be specified.  These are positive integer constants (or
+expressions) that specify the line type and point type to be used for the
+plot.  Use @ref{test} to display the types available for your terminal.
+
+You may also scale the line width and point size for a plot by using
+<line_width> and <point_size>, which are specified relative to the default
+values for each terminal.  The pointsize may also be altered globally---see
+@ref{pointsize} for details.  But note that both <point_size> as set here and
+as set by @ref{pointsize} multiply the default point size---their effects are
+not cumulative.  That is, `set pointsize 2; plot x w p ps 3` will use points
+three times default size, not six.
+
+If you have defined specific line type/width and point type/size combinations
+with @ref{linestyle}, one of these may be selected by setting <line_style> to
+the index of the desired style.
+
+The keywords may be abbreviated as indicated.
+
+Note that the `linewidth` and @ref{pointsize} options are not supported by all
+terminals.
+
+Examples:
+
+This plots sin(x) with impulses:
+@example
+      plot sin(x) with impulses
+
+@end example
+
+This plots x with points, x**2 with the default:
+@example
+      plot x*y w points, x**2 + y**2
+
+@end example
+
+This plots tan(x) with the default function style, file "data.1" with lines:
+@example
+      plot [ ] [-2:5] tan(x), 'data.1' with l
+
+@end example
+
+This plots "leastsq.dat" with impulses:
+@example
+      plot 'leastsq.dat' w i
+
+@end example
+
+This plots the data file "population" with boxes:
+@example
+      plot 'population' with boxes
+
+@end example
+
+This plots "exper.dat" with errorbars and lines connecting the points
+(errorbars require three or four columns):
+@example
+      plot 'exper.dat' w lines, 'exper.dat' notitle w errorbars
+
+@end example
+
+This plots sin(x) and cos(x) with linespoints, using the same line type but
+different point types:
+@example
+      plot sin(x) with linesp lt 1 pt 3, cos(x) with linesp lt 1 pt 4
+
+@end example
+
+This plots file "data" with points of type 3 and twice usual size:
+@example
+      plot 'data' with points pointtype 3 pointsize 2
+
+@end example
+
+This plots two data sets with lines differing only by weight:
+@example
+      plot 'd1' t "good" w l lt 2 lw 3, 'd2' t "bad" w l lt 2 lw 1
+
+@end example
+
+See @ref{style} to change the default styles.
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/styles/styles.html,Styles demos. }
+
+@node print, pwd, plot, Commands
+@section print
+
+@c ?commands print
+@cindex print
+@cmindex print
+
+
+The @ref{print} command prints the value of <expression> to the screen.  It is
+synonymous with `pause 0`.  <expression> may be anything that `gnuplot` can
+evaluate that produces a number, or it can be a string.
+
+Syntax:
+@example
+      print <expression> @{, <expression>, ...@}
+
+@end example
+
+See `expressions`.
+
+@node pwd, quit, print, Commands
+@section pwd
+
+@c ?commands pwd
+@cindex pwd
+@cmindex pwd
+
+
+The @ref{pwd} command prints the name of the working directory to the screen.
+
+@node quit, replot, pwd, Commands
+@section quit
+
+@c ?commands quit
+@cindex quit
+@cmindex quit
+
+
+The @ref{exit} and @ref{quit} commands and END-OF-FILE character will exit `gnuplot`.
+Each of these commands will clear the output device (as does the @ref{clear}
+command) before exiting.
+
+@node replot, reread, quit, Commands
+@section replot
+
+@c ?commands replot
+@cindex replot
+@cmindex replot
+
+
+The @ref{replot} command without arguments repeats the last @ref{plot} or `splot`
+command.  This can be useful for viewing a plot with different `set` options,
+or when generating the same plot for several devices.
+
+Arguments specified after a @ref{replot} command will be added onto the last
+@ref{plot} or `splot` command (with an implied ',' separator) before it is
+repeated.  @ref{replot} accepts the same arguments as the @ref{plot} and `splot`
+commands except that ranges cannot be specified.  Thus you can use @ref{replot}
+to plot a function against the second axes if the previous command was @ref{plot}
+but not if it was `splot`, and similarly you can use @ref{replot} to add a plot
+from a binary file only if the previous command was `splot`.
+
+N.B.---use of
+
+@example
+      plot '-' ; ... ; replot
+
+@end example
+
+is not recommended.  `gnuplot` does not store the inline data internally, so
+since @ref{replot} appends new information to the previous @ref{plot} and then
+executes the modified command, the `'-'` from the initial @ref{plot} will expect
+to read inline data again.
+
+Note that @ref{replot} does not work in @ref{multiplot} mode, since it reproduces
+only the last plot rather than the entire screen.
+
+See also `command-line-editing` for ways to edit the last @ref{plot} (`splot`)
+command.
+
+@node reread, reset, replot, Commands
+@section reread
+
+@c ?commands reread
+@cindex reread
+@cmindex reread
+
+
+The @ref{reread} command causes the current `gnuplot` command file, as specified
+by a @ref{load} command or on the command line, to be reset to its starting
+point before further commands are read from it.  This essentially implements
+an endless loop of the commands from the beginning of the command file to
+the @ref{reread} command.  (But this is not necessarily a disaster---@ref{reread} can
+be very useful when used in conjunction with @ref{if}.  See @ref{if} for details.)
+The @ref{reread} command has no effect if input from standard input.
+
+Examples:
+
+Suppose the file "looper" contains the commands
+@example
+      a=a+1
+      plot sin(x*a)
+      pause -1
+      if(a<5) reread
+@end example
+
+and from within `gnuplot` you submit the commands
+@example
+      a=0
+      load 'looper'
+@end example
+
+The result will be four plots (separated by the @ref{pause} message).
+
+Suppose the file "data" contains six columns of numbers with a total yrange
+from 0 to 10; the first is x and the next are five different functions of x.
+Suppose also that the file "plotter" contains the commands
+@example
+      c_p = c_p+1
+      plot "$0" using 1:c_p with lines linetype c_p
+      if(c_p <  n_p) reread
+@end example
+
+and from within `gnuplot` you submit the commands
+@example
+      n_p=6
+      c_p=1
+      set nokey
+      set yrange [0:10]
+      set multiplot
+      call 'plotter' 'data'
+      set nomultiplot
+@end example
+
+The result is a single graph consisting of five plots.  The yrange must be
+set explicitly to guarantee that the five separate graphs (drawn on top of
+each other in multiplot mode) will have exactly the same axes.  The linetype
+must be specified; otherwise all the plots would be drawn with the same type.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/animate.html,Reread Animation Demo}
+
+@node reset, save, reread, Commands
+@section reset
+
+@c ?commands reset
+@cindex reset
+@cmindex reset
+
+
+The @ref{reset} command causes all options that can be set with the `set`
+command to take on their default values.  The only exceptions are that the
+terminal set with `set term` and the output file set with @ref{output} are
+left unchanged.  This command is useful, e.g., to restore the default
+settings at the end of a command file, or to return to a defined state after
+lots of settings have been changed within a command file.  Please refer to
+the `set` command to see the default values that the various options take.
+
+@node save, set-show, reset, Commands
+@section save
+
+@c ?commands save
+@cindex save
+@cmindex save
+
+
+The @ref{save} command saves user-defined functions, variables, `set` options,
+or all three, plus the last @ref{plot} (`splot`) command to the specified file.
+
+Syntax:
+@example
+      save  @{<option>@} '<filename>'
+
+@end example
+
+where <option> is @ref{functions}, @ref{variables} or `set`. If no option is used,
+`gnuplot` saves functions, variables, `set` options and the last @ref{plot}
+(`splot`) command.
+
+@ref{save}d files are written in text format and may be read by the @ref{load}
+command.
+
+The filename must be enclosed in quotes.
+
+Examples:
+@example
+      save 'work.gnu'
+      save functions 'func.dat'
+      save var 'var.dat'
+      save set 'options.dat'
+
+@end example
+
+@node set-show, shell, save, Commands
+@section set-show
+
+@c ?commands set
+@c ?commands show
+@cindex set
+
+@cindex show
+
+@c ?show all
+The `set` command can be used to sets _lots_ of options.  No screen is
+drawn, however, until a @ref{plot}, `splot`, or @ref{replot} command is given.
+
+The `show` command shows their settings;  `show all` shows all the
+settings.
+
+If a variable contains time/date data, `show` will display it according to
+the format currently defined by @ref{timefmt}, even if that was not in effect
+when the variable was initially defined.
+
+@menu
+* angles::                      
+* arrow::                       
+* autoscale::                   
+* bar::                         
+* bmargin::                     
+* border::                      
+* boxwidth::                    
+* clabel::                      
+* clip::                        
+* cntrparam::                   
+* contour::                     
+* data_style::                  
+* dgrid3d::                     
+* dummy::                       
+* encoding::                    
+* format::                      
+* function_style::              
+* functions::                   
+* grid::                        
+* hidden3d::                    
+* isosamples::                  
+* key::                         
+* label::                       
+* linestyle::                   
+* lmargin::                     
+* locale::                      
+* logscale::                    
+* mapping::                     
+* margin::                      
+* missing::                     
+* multiplot::                   
+* mx2tics::                     
+* mxtics::                      
+* my2tics::                     
+* mytics::                      
+* mztics::                      
+* offsets::                     
+* origin::                      
+* output::                      
+* parametric_::                 
+* pointsize::                   
+* polar::                       
+* rmargin::                     
+* rrange::                      
+* samples::                     
+* size::                        
+* style::                       
+* surface::                     
+* terminal::                    
+* tics::                        
+* ticslevel::                   
+* ticscale::                    
+* timestamp::                   
+* timefmt::                     
+* title_::                      
+* tmargin::                     
+* trange::                      
+* urange::                      
+* variables::                   
+* version::                     
+* view::                        
+* vrange::                      
+* x2data::                      
+* x2dtics::                     
+* x2label::                     
+* x2mtics::                     
+* x2range::                     
+* x2tics::                      
+* x2zeroaxis::                  
+* xdata::                       
+* xdtics::                      
+* xlabel::                      
+* xmtics::                      
+* xrange::                      
+* xtics::                       
+* xzeroaxis::                   
+* y2data::                      
+* y2dtics::                     
+* y2label::                     
+* y2mtics::                     
+* y2range::                     
+* y2tics::                      
+* y2zeroaxis::                  
+* ydata::                       
+* ydtics::                      
+* ylabel::                      
+* ymtics::                      
+* yrange::                      
+* ytics::                       
+* yzeroaxis::                   
+* zdata::                       
+* zdtics::                      
+* zero::                        
+* zeroaxis::                    
+* zlabel::                      
+* zmtics::                      
+* zrange::                      
+* ztics::                       
+@end menu
+
+@node angles, arrow, set-show, set-show
+@subsection angles
+
+@c ?commands set angles
+@c ?commands show angles
+@c ?set angles
+@c ?show angles
+@cindex angles
+@opindex angles
+
+
+@c ?commands set angles degrees
+@c ?set angles degrees
+@c ?angles degrees
+@cindex degrees
+
+By default, `gnuplot` assumes the independent variable in polar graphs is in
+units of radians.  If `set angles degrees` is specified before `set polar`,
+then the default range is [0:360] and the independent variable has units of
+degrees.  This is particularly useful for plots of data files.  The angle
+setting also applies to 3-d mapping as set via the @ref{mapping} command.
+
+Syntax:
+@example
+      set angles @{degrees | radians@}
+      show angles
+
+@end example
+
+The angle specified in `set grid polar` is also read and displayed in the
+units specified by @ref{angles}.
+
+@ref{angles} also affects the arguments of the machine-defined functions
+sin(x), cos(x) and tan(x), and the outputs of asin(x), acos(x), atan(x),
+atan2(x), and arg(x).  It has no effect on the arguments of hyperbolic
+functions or Bessel functions.  However, the output arguments of inverse
+hyperbolic functions of complex arguments are affected; if these functions
+are used, `set angles radians` must be in effect to maintain consistency
+between input and output arguments.
+
+@example
+      x=@{1.0,0.1@}
+      set angles radians
+      y=sinh(x)
+      print y         #prints @{1.16933, 0.154051@}
+      print asinh(y)  #prints @{1.0, 0.1@}
+@end example
+
+but
+@example
+      set angles degrees
+      y=sinh(x)
+      print y         #prints @{1.16933, 0.154051@}
+      print asinh(y)  #prints @{57.29578, 5.729578@}
+@end example
+
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/poldat.html,Polar plot using @ref{angles}. }
+
+@node arrow, autoscale, angles, set-show
+@subsection arrow
+
+@c ?commands set arrow
+@c ?commands set noarrow
+@c ?commands show arrow
+@c ?set arrow
+@c ?set noarrow
+@c ?show arrow
+@cindex arrow
+@opindex arrow
+
+
+@cindex noarrow
+
+Arbitrary arrows can be placed on a plot using the @ref{arrow} command.
+
+Syntax:
+@example
+      set arrow @{<tag>@} @{from <position>@} @{to <position>@} @{@{no@}head@}
+                @{ @{linestyle | ls <line_style>@}
+                  | @{linetype | lt <line_type>@}
+                    @{linewidth | lw <line_width@} @}
+      set noarrow @{<tag>@}
+      show arrow
+
+@end example
+
+<tag> is an integer that identifies the arrow.  If no tag is given, the
+lowest unused tag value is assigned automatically.  The tag can be used to
+delete or change a specific arrow.  To change any attribute of an existing
+arrow, use the @ref{arrow} command with the appropriate tag and specify the
+parts of the arrow to be changed.
+
+The <position>s are specified by either x,y or x,y,z, and may be preceded by
+`first`, `second`, `graph`, or `screen` to select the coordinate system.
+Unspecified coordinates default to 0.  The endpoints can be specified in
+one of four coordinate systems---`first` or `second` axes, `graph` or
+`screen`.  See `coordinates` for details.  A coordinate system specifier
+does not carry over from the "from" position to the "to" position.  Arrows
+outside the screen boundaries are permitted but may cause device errors.
+
+Specifying `nohead` produces an arrow drawn without a head---a line segment.
+This gives you yet another way to draw a line segment on the plot.  By
+default, arrows have heads.
+
+The line style may be selected from a user-defined list of line styles (see
+@ref{linestyle}) or may be defined here by providing values for <line_type>
+(an index from the default list of styles) and/or <line_width> (which is a
+multiplier for the default width).
+
+Note, however, that if a user-defined line style has been selected, its
+properties (type and width) cannot be altered merely by issuing another
+@ref{arrow} command with the appropriate index and `lt` or `lw`.
+
+Examples:
+
+To set an arrow pointing from the origin to (1,2) with user-defined style 5,
+use:
+@example
+      set arrow to 1,2 ls 5
+
+@end example
+
+To set an arrow from bottom left of plotting area to (-5,5,3), and tag the
+arrow number 3, use:
+@example
+      set arrow 3 from graph 0,0 to -5,5,3
+
+@end example
+
+To change the preceding arrow to end at 1,1,1, without an arrow head and
+double its width, use:
+@example
+      set arrow 3 to 1,1,1 nohead lw 2
+
+@end example
+
+To draw a vertical line from the bottom to the top of the graph at x=3, use:
+@example
+      set arrow from 3, graph 0 to 3, graph 1 nohead
+
+@end example
+
+To delete arrow number 2, use:
+@example
+      set noarrow 2
+
+@end example
+
+To delete all arrows, use:
+@example
+      set noarrow
+
+@end example
+
+To show all arrows (in tag order), use:
+@example
+      show arrow
+@end example
+
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/arrows/arrows.html,Arrows Demos. }
+
+@node autoscale, bar, arrow, set-show
+@subsection autoscale
+
+@c ?commands set autoscale
+@c ?commands set noautoscale
+@c ?commands show autoscale
+@c ?set autoscale
+@c ?set noautoscale
+@c ?show autoscale
+@cindex autoscale
+@opindex autoscale
+
+
+@cindex noautoscale
+
+Autoscaling may be set individually on the x, y or z axis or globally on all
+axes. The default is to autoscale all axes.
+
+Syntax:
+@example
+      set autoscale @{<axes>@{min|max@}@}
+      set noautoscale @{<axes>@{min|max@}@}
+      show autoscale
+
+@end example
+
+where <axes> is either `x`, `y`, `z`, `x2`, `y2` or `xy`.  A keyword with
+`min` or `max` appended (this cannot be done with `xy`) tells `gnuplot` to
+autoscale just the minimum or maximum of that axis.  If no keyword is given,
+all axes are autoscaled.
+
+When autoscaling, the axis range is automatically computed and the dependent
+axis (y for a @ref{plot} and z for `splot`) is scaled to include the range of the
+function or data being plotted.
+
+If autoscaling of the dependent axis (y or z) is not set, the current y or z
+range is used.
+
+Autoscaling the independent variables (x for @ref{plot} and x,y for `splot`) is a
+request to set the domain to match any data file being plotted.  If there are
+no data files, autoscaling an independent variable has no effect.  In other
+words, in the absence of a data file, functions alone do not affect the x
+range (or the y range if plotting z = f(x,y)).
+
+Please see @ref{xrange} for additional information about ranges.
+
+The behavior of autoscaling remains consistent in parametric mode, (see `set
+parametric`).  However, there are more dependent variables and hence more
+control over x, y, and z axis scales.  In parametric mode, the independent or
+dummy variable is t for @ref{plot}s and u,v for `splot`s.  @ref{autoscale} in
+parametric mode, then, controls all ranges (t, u, v, x, y, and z) and allows
+x, y, and z to be fully autoscaled.
+
+Autoscaling works the same way for polar mode as it does for parametric mode
+for @ref{plot}, with the extension that in polar mode @ref{dummy} can be used to
+change the independent variable from t (see @ref{dummy}).
+
+When tics are displayed on second axes but no plot has been specified for
+those axes, x2range and y2range are inherited from xrange and yrange.  This
+is done _before_ xrange and yrange are autoextended to a whole number of
+tics, which can cause unexpected results.
+
+Examples:
+
+This sets autoscaling of the y axis (other axes are not affected):
+@example
+      set autoscale y
+
+@end example
+
+This sets autoscaling only for the minimum of the y axis (the maximum of the
+y axis and the other axes are not affected):
+@example
+      set autoscale ymin
+
+@end example
+
+This sets autoscaling of the x and y axes:
+@example
+      set autoscale xy
+
+@end example
+
+This sets autoscaling of the x, y, z, x2 and y2 axes:
+@example
+      set autoscale
+
+@end example
+
+This disables autoscaling of the x, y, z, x2 and y2 axes:
+@example
+      set noautoscale
+
+@end example
+
+This disables autoscaling of the z axis only:
+@example
+      set noautoscale z
+
+@end example
+
+@menu
+* parametric_mode::             
+* polar_mode::                  
+@end menu
+
+@node parametric_mode, polar_mode, autoscale, autoscale
+@subsubsection parametric mode
+
+@c ?commands set autoscale parametric
+@c ?set autoscale parametric
+@c ?set autoscale t
+When in parametric mode (`set parametric`), the xrange is as fully scalable
+as the y range.  In other words, in parametric mode the x axis can be
+automatically scaled to fit the range of the parametric function that is
+being plotted.  Of course, the y axis can also be automatically scaled just
+as in the non-parametric case.  If autoscaling on the x axis is not set, the
+current x range is used.
+
+Data files are plotted the same in parametric and non-parametric mode.
+However, there is a difference in mixed function and data plots: in
+non-parametric mode with autoscaled x, the x range of the datafile controls
+the x range of the functions; in parametric mode it has no influence.
+
+For completeness a last command `set autoscale t` is accepted.  However, the
+effect of this "scaling" is very minor.  When `gnuplot` determines that the
+t range would be empty, it makes a small adjustment if autoscaling is true.
+Otherwise, `gnuplot` gives an error.  Such behavior may, in fact, not be very
+useful and the command `set autoscale t` is certainly questionable.
+
+`splot` extends the above ideas as you would expect.  If autoscaling is set,
+then x, y, and z ranges are computed and each axis scaled to fit the
+resulting data.
+
+@node polar_mode,  , parametric_mode, autoscale
+@subsubsection polar mode
+
+@c ?commands set autoscale polar
+@c ?set autoscale polar
+@c ?set autoscale t
+When in polar mode (`set polar`), the xrange and the yrange are both found
+from the polar coordinates, and thus they can both be automatically scaled.
+In other words, in polar mode both the x and y axes can be automatically
+scaled to fit the ranges of the polar function that is being plotted.
+
+When plotting functions in polar mode, the rrange may be autoscaled.  When
+plotting data files in polar mode, the trange may also be autoscaled.  Note
+that if the trange is contained within one quadrant, autoscaling will produce
+a polar plot of only that single quadrant.
+
+Explicitly setting one or two ranges but not others may lead to unexpected
+results.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/poldat.html,See polar demos }
+
+@node bar, bmargin, autoscale, set-show
+@subsection bar
+
+@c ?commands set bar
+@c ?commands show bar
+@c ?set bar
+@c ?show bar
+The @ref{bar} command controls the tics at the ends of errorbars.
+
+Syntax:
+@example
+      set bar @{small | large | <size>@}
+      show bar
+
+@end example
+
+`small` is a synonym for 0.0, and `large` for 1.0.
+The default is 1.0 if no size is given.
+
+@node bmargin, border, bar, set-show
+@subsection bmargin
+
+@c ?commands set bmargin
+@c ?set bmargin
+@cindex bmargin
+@opindex bmargin
+
+
+The command @ref{bmargin} sets the size of the bottom margin.  Please see
+@ref{margin} for details.
+
+@node border, boxwidth, bmargin, set-show
+@subsection border
+
+@c ?commands set border
+@c ?commands set noborder
+@c ?commands show border
+@c ?set border
+@c ?set noborder
+@c ?show border
+@cindex border
+@opindex border
+
+
+@cindex noborder
+
+The @ref{border} and `set noborder` commands control the display of the graph
+borders for the @ref{plot} and `splot` commands.
+
+Syntax:
+@example
+      set border @{<integer> @{ @{linestyle | ls <line_style>@}
+                              | @{linetype | lt <line_type> @}
+                                @{linewidth | lw <line_width>@} @} @}
+      set noborder
+      show border
+
+@end example
+
+The borders are encoded in a 12-bit integer: the bottom four bits control the
+border for @ref{plot} and the sides of the base for `splot`; The next four bits
+control the verticals in `splot`; the top four bits control the edges on top
+of the `splot`.  In detail, the `<integer>` should be the sum of the
+appropriate entries from the following table:
+
+
+@example
+                        plot border     splot         splot
+          Side          splot base    verticals        top
+      bottom (south)         1            16           256
+      left   (west)          2            32           512
+      top    (north)         4            64          1024
+      right  (east)          8           128          2048
+
+@end example
+
+
+The default is 31, which is all four sides for @ref{plot}, and base and z axis
+for `splot`.
+
+Using the optional <line_style>, <line_type> and <line_width>
+specifiers, the way the border lines are drawn can be influenced
+(limited by what the current terminal driver supports).  By default,
+the border is drawn with twice the usual linewidth.  The <line_width>
+specifier scales this default value; for example, `set border 15 lw 2`
+will produce a border with four times the usual linewidth.
+
+Various axes or combinations of axes may be added together in the command.
+
+To have tics on edges other than bottom and left, disable the usual tics and
+enable the second axes.
+
+Examples:
+
+Draw all borders:
+@example
+      set border
+
+@end example
+
+Draw only the SOUTHWEST borders:
+@example
+      set border 3
+
+@end example
+
+Draw a complete box around a `splot`:
+@example
+      set border 4095
+
+@end example
+
+Draw a partial box, omitting the front vertical:
+@example
+      set border 127+256+512
+
+@end example
+
+Draw only the NORTHEAST borders:
+@example
+      set noxtics; set noytics; set x2tics; set y2tics; set border 12
+
+@end example
+
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/borders/borders.html,Borders Demo. }
+
+@node boxwidth, clabel, border, set-show
+@subsection boxwidth
+
+@c ?commands set boxwidth
+@c ?commands show boxwidth
+@c ?set boxwidth
+@c ?show boxwidth
+@cindex boxwidth
+@opindex boxwidth
+
+
+The @ref{boxwidth} command is used to set the default width of boxes in the
+@ref{boxes} and @ref{boxerrorbars} styles.
+
+Syntax:
+@example
+      set boxwidth @{<width>@}
+      show boxwidth
+
+@end example
+
+If a data file is plotted without the width being specified in the third,
+fourth, or fifth column (or @ref{using} entry), or if a function is plotted, the
+width of each box is set by the @ref{boxwidth} command.  (If a width is given
+both in the file and by the @ref{boxwidth} command, the one in the file is
+used.)  If the width is not specified in one of these ways, the width of each
+box will be calculated automatically so that it touches the adjacent boxes.
+In a four-column data set, the fourth column will be interpreted as the box
+width unless the width is set to -2.0, in which case the width will be
+calculated automatically.  See @ref{boxerrorbars} for more details.
+
+To set the box width to automatic use the command
+@example
+      set boxwidth
+@end example
+
+or, for four-column data,
+@example
+      set boxwidth -2
+
+@end example
+
+The same effect can be achieved with the @ref{using} keyword in @ref{plot}:
+@example
+      plot 'file' using 1:2:3:4:(-2)
+
+@end example
+
+@node clabel, clip, boxwidth, set-show
+@subsection clabel
+
+@c ?commands set clabel
+@c ?commands set noclabel
+@c ?commands show clabel
+@c ?set clabel
+@c ?set noclabel
+@c ?show clabel
+@cindex clabel
+@opindex clabel
+
+
+@cindex noclabel
+
+`gnuplot` will vary the linetype used for each contour level when clabel is
+set.  When this option on (the default), a legend labels each linestyle with
+the z level it represents.  It is not possible at present to separate the
+contour labels from the surface key.
+
+Syntax:
+@example
+      set clabel @{'<format>'@}
+      set noclabel
+      show clabel
+
+@end example
+
+The default for the format string is %8.3g, which gives three decimal places.
+This may produce poor label alignment if the key is altered from its default
+configuration.
+
+The first contour linetype, or only contour linetype when clabel is off, is
+the surface linetype +1; contour points are the same style as surface points.
+
+See also @ref{contour}.
+
+@node clip, cntrparam, clabel, set-show
+@subsection clip
+
+@c ?commands set clip
+@c ?commands set noclip
+@c ?commands show clip
+@c ?set clip
+@c ?set noclip
+@c ?show clip
+@cindex clip
+@opindex clip
+
+
+@cindex noclip
+
+`gnuplot` can clip data points and lines that are near the boundaries of a
+graph.
+
+Syntax:
+@example
+      set clip <clip-type>
+      set noclip <clip-type>
+      show clip
+
+@end example
+
+Three clip types are supported by `gnuplot`: `points`, `one`, and `two`.
+One, two, or all three clip types may be active for a single graph.
+
+The `points` clip type forces `gnuplot` to clip (actually, not plot at all)
+data points that fall within but too close to the boundaries.  This is done
+so that large symbols used for points will not extend outside the boundary
+lines.  Without clipping points near the boundaries, the plot may look bad.
+Adjusting the x and y ranges may give similar results.
+
+Setting the `one` clip type causes `gnuplot` to draw a line segment which has
+only one of its two endpoints within the graph.  Only the in-range portion of
+the line is drawn.  The alternative is to not draw any portion of the line
+segment.
+
+Some lines may have both endpoints out of range, but pass through the graph.
+Setting the `two` clip-type allows the visible portion of these lines to be
+drawn.
+
+In no case is a line drawn outside the graph.
+
+The defaults are `noclip points`, `clip one`, and `noclip two`.
+
+To check the state of all forms of clipping, use
+@example
+      show clip
+
+@end example
+
+For backward compatibility with older versions, the following forms are also
+permitted:
+@example
+      set clip
+      set noclip
+
+@end example
+
+@ref{clip} is synonymous with `set clip points`; `set noclip` turns off all
+three types of clipping.
+
+@node cntrparam, contour, clip, set-show
+@subsection cntrparam
+
+@c ?commands set cntrparam
+@c ?commands show cntrparam
+@c ?set cntrparam
+@c ?show cntrparam
+@cindex cntrparam
+@opindex cntrparam
+
+
+@ref{cntrparam} controls the generation of contours and their smoothness for
+a contour plot. @ref{contour} displays current settings of @ref{cntrparam} as
+well as @ref{contour}.
+
+Syntax:
+@example
+      set cntrparam @{  @{linear | cubicspline | bspline@}
+                      @{ points <n>@} @{ order <n> @}
+                      @{ levels   auto @{<n>@} | <n>
+                               | discrete <z1> @{,<z2>@{,<z3>...@}@}
+                               | incremental <start>, <incr> @{,<end>@}
+                       @}
+                     @}
+      show contour
+
+@end example
+
+This command has two functions.  First, it sets the values of z for which
+contour points are to be determined (by linear interpolation between data
+points or function isosamples.)  Second, it controls the way contours are
+drawn between the points determined to be of equal z.  <n> should be an
+integral constant expression and <z1>, <z2> ... any constant expressions.
+The parameters are:
+
+`linear`, `cubicspline`, `bspline`---Controls type of approximation or
+interpolation.  If `linear`, then straight line segments connect points of
+equal z magnitude.  If `cubicspline`, then piecewise-linear contours are
+interpolated between the same equal z points to form somewhat smoother
+contours, but which may undulate.  If `bspline`, a guaranteed-smoother curve
+is drawn, which only approximates the position of the points of equal-z.
+
+`points`---Eventually all drawings are done with piecewise-linear strokes.
+This number controls the number of line segments used to approximate the
+`bspline` or `cubicspline` curve.  Number of cubicspline or bspline
+segments (strokes) = `points` * number of linear segments.
+
+`order`---Order of the bspline approximation to be used.  The bigger this
+order is, the smoother the resulting contour.  (Of course, higher order
+bspline curves will move further away from the original piecewise linear
+data.)  This option is relevant for `bspline` mode only.  Allowed values are
+integers in the range from 2 (linear) to 10.
+
+`levels`--- Selection of contour levels,  controlled by `auto` (default),
+`discrete`, `incremental`, and <n>, number of contour levels, limited to
+@example
+ MAX_DISCRETE_LEVELS as defined in plot.h (30 is standard.)
+
+@end example
+
+For `auto`, <n> specifies a nominal number of levels; the actual number will
+be adjusted to give simple labels. If the surface is bounded by zmin and zmax,
+contours will be generated at integer multiples of dz between zmin and zmax,
+where dz is 1, 2, or 5 times some power of ten (like the step between two
+tic marks).
+
+For `levels discrete`, contours will be generated at z = <z1>, <z2> ... as
+specified; the number of discrete levels sets the number of contour levels.
+In `discrete` mode, any `set cntrparms levels <n>` are ignored.
+
+For `incremental`, contours are generated at values of z beginning at <start>
+and increasing by <increment>, until the number of contours is reached. <end>
+is used to determine the number of contour levels, which will be changed by
+any subsequent `set cntrparam levels <n>`.
+
+If the command @ref{cntrparam} is given without any arguments specified,  the
+defaults are used: linear, 5 points, order 4, 5 auto levels.
+
+Examples:
+@example
+      set cntrparam bspline
+      set cntrparam points 7
+      set cntrparam order 10
+
+@end example
+
+To select levels automatically, 5 if the level increment criteria are met:
+@example
+      set cntrparam levels auto 5
+
+@end example
+
+To specify discrete levels at .1, .37, and .9:
+@example
+      set cntrparam levels discrete .1,1/exp(1),.9
+
+@end example
+
+To specify levels from 0 to 4 with increment 1:
+@example
+      set cntrparam levels incremental  0,1,4
+
+@end example
+
+To set the number of levels to 10 (changing an incremental end or possibly
+the number of auto levels):
+@example
+      set cntrparam levels 10
+
+@end example
+
+To set the start and increment while retaining the number of levels:
+@example
+      set cntrparam levels incremental 100,50
+
+@end example
+
+See also @ref{contour} for control of where the contours are drawn, and @ref{clabel} for control of the format of the contour labels and linetypes.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/contours.html,Contours Demo} and
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/discrete.html,contours with User Defined Levels.}
+
+@node contour, data_style, cntrparam, set-show
+@subsection contour
+
+@c ?commands set contour
+@c ?commands set nocontour
+@c ?commands show contour
+@c ?set contour
+@c ?set nocontour
+@c ?show contour
+@cindex contour
+@opindex contour
+
+
+@cindex nocontour
+
+@ref{contour} enables contour drawing for surfaces. This option is available
+for `splot` only.
+
+Syntax:
+@example
+      set contour @{base | surface | both@}
+      set nocontour
+      show contour
+
+@end example
+
+The three options specify where to draw the contours: `base` draws the
+contours on the grid base where the x/ytics are placed, @ref{surface} draws the
+contours on the surfaces themselves, and `both` draws the contours on both
+the base and the surface.  If no option is provided, the default is `base`.
+
+See also @ref{cntrparam} for the parameters that affect the drawing of
+contours, and @ref{clabel} for control of labelling of the contours.
+
+The surface can be switched off (see @ref{surface}), giving a contour-only
+graph.  Though it is possible to use @ref{size} to enlarge the plot to fill
+the screen, more control over the output format can be obtained by writing
+the contour information to a file, and rereading it as a 2-d datafile plot:
+
+@example
+      set nosurface
+      set contour
+      set cntrparam ...
+      set term table
+      set out 'filename'
+      splot ...
+      set out
+      # contour info now in filename
+      set term <whatever>
+      plot 'filename'
+
+@end example
+
+In order to draw contours, the data should be organized as "grid data".  In
+such a file all the points for a single y-isoline are listed, then all the
+points for the next y-isoline, and so on.  A single blank line (a line
+containing no characters other than blank spaces and a carriage return and/or
+a line feed) separates one y-isoline from the next.  See also `splot datafile`.
+
+If contours are desired from non-grid data, @ref{dgrid3d} can be used to
+create an appropriate grid.  See @ref{dgrid3d} for more information.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/contours.html,Contours Demo} and
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/discrete.html,contours with User Defined Levels.}
+
+@node data_style, dgrid3d, contour, set-show
+@subsection data style
+
+@c ?commands set data style
+@c ?commands show data style
+@c ?set data style
+@c ?show data style
+@c ?data style
+The @ref{style} command changes the default plotting style for data
+plots.
+
+Syntax:
+@example
+      set data style <style-choice>
+      show data style
+
+@end example
+
+See @ref{style} for the choices.  If no choice is given, the choices are
+listed.  @ref{style} shows the current default data plotting style.
+
+@node dgrid3d, dummy, data_style, set-show
+@subsection dgrid3d
+
+@c ?commands set dgrid3d
+@c ?commands set nodgrid3d
+@c ?commands show dgrid3d
+@c ?set dgrid3d
+@c ?set nodgrid3d
+@c ?show dgrid3d
+@cindex dgrid3d
+@opindex dgrid3d
+
+
+@cindex nodgrid3d
+
+The @ref{dgrid3d} command enables, and can set parameters for, non-grid
+to grid data mapping.
+
+Syntax:
+@example
+      set dgrid3d @{<row_size>@} @{,@{<col_size>@} @{,<norm>@}@}
+      set nodgrid3d
+      show dgrid3d
+
+@end example
+
+By default @ref{dgrid3d} is disabled.  When enabled, 3-d data read from a file
+are always treated as a scattered data set.  A grid with dimensions derived
+from a bounding box of the scattered data and size as specified by the
+row/col_size parameters is created for plotting and contouring.  The grid
+is equally spaced in x (rows) and in y (columns); the z values are computed
+as weighted averages of the scattered points' z values.
+
+The third parameter, norm, controls the weighting:  Each data point is
+weighted inversely by its distance from the grid point raised to the norm
+power.  (Actually, the weights are given by the inverse of dx^norm + dy^norm,
+where dx and dy are the components of the separation of the grid point from
+each data point.  For some norms that are powers of two, specifically 4, 8,
+and 16, the computation is optimized by using the Euclidean distance in the
+weight calculation, (dx^2+dx^2)^norm/2.  However, any non-negative integer
+can be used.)
+
+The closer the data point is to a grid point, the more effect it has on
+that grid point and the larger the value of norm the less effect more
+distant data points have on that grid point.
+
+The @ref{dgrid3d} option is a simple low pass filter that converts scattered
+data to a grid data set.  More sophisticated approaches to this problem
+exist and should be used to preprocess the data outside `gnuplot` if this
+simple solution is found inadequate.
+
+(The z values are found by weighting all data points, not by interpolating
+between nearby data points;  also edge effects may produce unexpected and/or
+undesired results.  In some cases, small norm values produce a grid point
+reflecting the average of distant data points rather than a local average,
+while large values of norm may produce "steps" with several grid points
+having the same value as the closest data point, rather than making a smooth
+transition between adjacent data points.  Some areas of a grid may be filled
+by extrapolation, to an arbitrary boundary condition.  The variables are
+not normalized; consequently the units used for x and y will affect the
+relative weights of points in the x and y directions.)
+
+Examples:
+@example
+      set dgrid3d 10,10,1     # defaults
+      set dgrid3d ,,4
+
+@end example
+
+The first specifies that a grid of size 10 by 10 is to be constructed using
+a norm value of 1 in the weight computation.  The second only modifies the
+norm, changing it to 4.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/scatter.html,Dgrid3d Demo.}
+
+
+@node dummy, encoding, dgrid3d, set-show
+@subsection dummy
+
+@c ?commands set dummy
+@c ?commands show dummy
+@c ?set dummy
+@c ?show dummy
+@cindex dummy
+@opindex dummy
+
+
+The @ref{dummy} command changes the default dummy variable names.
+
+Syntax:
+@example
+      set dummy @{<dummy-var>@} @{,<dummy-var>@}
+      show dummy
+
+@end example
+
+By default, `gnuplot` assumes that the independent, or "dummy", variable for
+the @ref{plot} command is "t" if in parametric or polar mode, or "x" otherwise.
+Similarly the independent variables for the `splot` command are "u" and "v"
+in parametric mode (`splot` cannot be used in polar mode), or "x" and "y"
+otherwise.
+
+It may be more convenient to call a dummy variable by a more physically
+meaningful or conventional name.  For example, when plotting time functions:
+
+@example
+      set dummy t
+      plot sin(t), cos(t)
+
+@end example
+
+At least one dummy variable must be set on the command; @ref{dummy} by itself
+will generate an error message.
+
+Examples:
+@example
+      set dummy u,v
+      set dummy ,s
+
+@end example
+
+The second example sets the second variable to s.
+
+@node encoding, format, dummy, set-show
+@subsection encoding
+
+@c ?commands set encoding
+@c ?commands show encoding
+@c ?set encoding
+@c ?show encoding
+@cindex encoding
+@opindex encoding
+
+
+The @ref{encoding} command selects a character encoding.  Valid values are
+`default`, which tells a terminal to use its default; `iso_8859_1` (known in
+the PostScript world as `ISO-Latin1`), which is used on many Unix workstations
+and with MS-Windows; `cp850`, for OS/2; and `cp437`, for MS-DOS.
+
+Syntax:
+@example
+      set encoding @{<value>@}
+      show encoding
+
+@end example
+
+Note that encoding is not supported by all terminal drivers and that
+the device must be able to produce the desired non-standard characters.
+
+@node format, function_style, encoding, set-show
+@subsection format
+
+@c ?commands set format
+@c ?commands show format
+@c ?set format
+@c ?show format
+@cindex format
+@opindex format
+
+
+The format of the tic-mark labels can be set with the `set format` command.
+
+Syntax:
+@example
+      set format @{<axes>@} @{"<format-string>"@}
+      set format @{<axes>@} @{'<format-string>'@}
+      show format
+
+@end example
+
+where <axes> is either `x`, `y`, `z`, `xy`, `x2`, `y2` or nothing (which is
+the same as `xy`).  The length of the string representing a tic mark (after
+formatting with 'printf') is restricted to 100 characters.  If the format
+string is omitted, the format will be returned to the default "%g".  For
+LaTeX users, the format "$%g$" is often desirable.  If the empty string "" is
+used, no label will be plotted with each tic, though the tic mark will still
+be plotted.  To eliminate all tic marks, use `set noxtics` or `set noytics`.
+
+Newline (\n) is accepted in the format string.  Use double-quotes rather than
+single-quotes to enable such interpretation.  See also `syntax`.
+
+The default format for both axes is "%g", but other formats such as "%.2f" or
+"%3.0em" are often desirable.  Anything accepted by 'printf' when given a
+double precision number, and accepted by the terminal, will work.  Some other
+options have been added.  If the format string looks like a floating point
+format, then `gnuplot` tries to construct a reasonable format.
+
+Characters not preceded by "%" are printed verbatim.  Thus you can include
+spaces and labels in your format string, such as "%g m", which will put " m"
+after each number.  If you want "%" itself, double it: "%g %%".
+
+See also @ref{xtics} for more information about tic labels.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/electron.html,See demo. }
+
+@menu
+* format_specifiers::           
+* time/date_specifiers::        
+@end menu
+
+@node format_specifiers, time/date_specifiers, format, format
+@subsubsection format specifiers
+
+@c ?commands set format specifiers
+@c ?set format specifiers
+@c ?format specifiers
+@cindex format_specifiers
+
+The acceptable formats (if not in time/date mode) are:
+
+
+@example
+      Format       Explanation
+      %f           floating point notation
+      %e or %E     exponential notation; an "e" or "E" before the power
+      %g or %G     the shorter of %e (or %E) and %f
+      %x or %X     hex
+      %o or %O     octal
+      %t           mantissa to base 10
+      %l           mantissa to base of current logscale
+      %s           mantissa to base of current logscale; scientific power
+      %T           power to base 10
+      %L           power to base of current logscale
+      %S           scientific power
+      %c           character replacement for scientific power
+      %P           multiple of pi
+
+@end example
+
+
+A 'scientific' power is one such that the exponent is a multiple of three.
+Character replacement of scientific powers (`"%c"`) has been implemented
+for powers in the range -18 to +18.  For numbers outside of this range the
+format reverts to exponential.
+
+Other acceptable modifiers (which come after the "%" but before the format
+specifier) are "-", which left-justifies the number; "+", which forces all
+numbers to be explicitly signed; "#", which places a decimal point after
+floats that have only zeroes following the decimal point; a positive integer,
+which defines the field width; "0" (the digit, not the letter) immediately
+preceding the field width, which indicates that leading zeroes are to be used
+instead of leading blanks; and a decimal point followed by a non-negative
+integer, which defines the precision (the minimum number of digits of an
+integer, or the number of digits following the decimal point of a float).
+
+Some releases of 'printf' may not support all of these modifiers but may also
+support others; in case of doubt, check the appropriate documentation and
+then experiment.
+
+Examples:
+@example
+      set format y "%t"; set ytics (5,10)          # "5.0" and "1.0"
+      set format y "%s"; set ytics (500,1000)      # "500" and "1.0"
+      set format y "+-12.3f"; set ytics(12345)     # "+12345.000  "
+      set format y "%.2t*10^%+03T"; set ytic(12345)# "1.23*10^+04"
+      set format y "%s*10^@{%S@}"; set ytic(12345)   # "12.345*10^@{3@}"
+      set format y "%s %cg"; set ytic(12345)       # "12.345 kg"
+      set format y "%.0P pi"; set ytic(6.283185)   # "2 pi"
+      set format y "%.0P%%"; set ytic(50)          # "50%"
+
+@end example
+
+@example
+      set log y 2; set format y '%l'; set ytics (1,2,3)
+      #displays "1.0", "1.0" and "1.5" (since 3 is 1.5 * 2^1)
+
+@end example
+
+There are some problem cases that arise when numbers like 9.999 are printed
+with a format that requires both rounding and a power.
+
+If the data type for the axis is time/date, the format string must contain
+valid codes for the 'strftime' function (outside of `gnuplot`, type "man
+strftime").  See @ref{timefmt} for a list of the allowed input format codes.
+
+@node time/date_specifiers,  , format_specifiers, format
+@subsubsection time/date specifiers
+
+@c ?commands set format time/date_specifiers
+@c ?set format time/date_specifiers
+@c ?set time/date_specifiers
+@cindex time/date_specifiers
+
+In time/date mode, the acceptable formats are:
+
+
+@example
+      Format       Explanation
+      %a           abbreviated name of day of the week
+      %A           full name of day of the week
+      %b or %h     abbreviated name of the month
+      %B           full name of the month
+      %d           day of the month, 1--31
+      %D           shorthand for "%m/%d/%y"
+      %H or %k     hour, 0--24
+      %I or %l     hour, 0--12
+      %j           day of the year, 1--366
+      %m           month, 1--12
+      %M           minute, 0--60
+      %p           "am" or "pm"
+      %r           shorthand for "%I:%M:%S %p"
+      %R           shorthand for %H:%M"
+      %S           second, 0--60
+      %T           shorthand for "%H:%M:%S"
+      %U           week of the year (week starts on Sunday)
+      %w           day of the week, 0--6 (Sunday = 0)
+      %W           week of the year (week starts on Monday)
+      %y           year, 0-99
+      %Y           year, 4-digit
+
+@end example
+
+
+Except for the non-numerical formats, these may be preceded by a "0" ("zero",
+not "oh") to pad the field length with leading zeroes, and a positive digit,
+to define the minimum field width (which will be overridden if the specified
+width is not large enough to contain the number).  There is a 24-character
+limit to the length of the printed text; longer strings will be truncated.
+
+Examples:
+
+Suppose the text is "76/12/25 23:11:11".  Then
+@example
+      set format x                 # defaults to "12/25/76" \n "23:11"
+      set format x "%A, %d %b %Y"  # "Saturday, 25 Dec 1976"
+      set format x "%r %d"         # "11:11:11 pm 12/25/76"
+
+@end example
+
+Suppose the text is "98/07/06 05:04:03".  Then
+@example
+      set format x "%1y/%2m/%3d %01H:%02M:%03S"  # "98/ 7/  6 5:04:003"
+
+@end example
+
+@node function_style, functions, format, set-show
+@subsection function style
+
+@c ?commands set function style
+@c ?commands show function style
+@c ?set function style
+@c ?show function style
+@c ?function style
+The @ref{style} command changes the default plotting style for
+function plots.
+
+Syntax:
+@example
+      set function style <style-choice>
+      show function style
+
+@end example
+
+See @ref{style} for the choices.  If no choice is given, the choices are
+listed.  @ref{style} shows the current default function plotting
+style.
+
+@node functions, grid, function_style, set-show
+@subsection functions
+
+@c ?commands show functions
+@c ?show functions
+The @ref{functions} command lists all user-defined functions and their
+definitions.
+
+Syntax:
+@example
+      show functions
+
+@end example
+
+For information about the definition and usage of functions in `gnuplot`,
+please see `expressions`.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/spline.html,Splines as User Defined Functions.}
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/airfoil.html,Use of functions and complex variables for airfoils }
+
+@node grid, hidden3d, functions, set-show
+@subsection grid
+
+@c ?commands set grid
+@c ?commands set nogrid
+@c ?commands show grid
+@c ?set grid
+@c ?set nogrid
+@c ?show grid
+@cindex grid
+@opindex grid
+
+
+@cindex nogrid
+
+The `set grid` command allows grid lines to be drawn on the plot.
+
+Syntax:
+@example
+      set grid @{@{no@}@{m@}xtics@} @{@{no@}@{m@}ytics@} @{@{no@}@{m@}ztics@}
+               @{@{no@}@{m@}x2tics@} @{@{no@}@{m@}y2tics@}
+               @{polar @{<angle>@}@}
+               @{ @{linestyle <major_linestyle>@}
+                 | @{linetype | lt <major_linetype>@}
+                   @{linewidth | lw <major_linewidth>@}
+                 @{ , @{linestyle | ls <minor_linestyle>@}
+                     | @{linetype | lt <minor_linetype>@}
+                       @{linewidth | lw <minor_linewidth>@} @} @}
+      set nogrid
+      show grid
+
+@end example
+
+The grid can be enabled and disabled for the major and/or minor tic
+marks on any axis, and the linetype and linewidth can be specified
+for major and minor grid lines, also via a predefined linestyle, as
+far as the active terminal driver supports this.
+
+Additionally, a polar grid can be selected for 2-d plots---circles are drawn
+to intersect the selected tics, and radial lines are drawn at definable
+intervals.  (The interval is given in degrees or radians ,depending on the
+@ref{angles} setting.)  Note that a polar grid is no longer automatically
+generated in polar mode.
+
+The pertinent tics must be enabled before `set grid` can draw them; `gnuplot`
+will quietly ignore instructions to draw grid lines at non-existent tics, but
+they will appear if the tics are subsequently enabled.
+
+If no linetype is specified for the minor gridlines, the same linetype as the
+major gridlines is used.  The default polar angle is 30 degrees.
+
+By default, grid lines are drawn with half the usual linewidth. The major and
+minor linewidth specifiers scale this default value; for example, `set grid
+lw .5` will draw grid lines with one quarter the usual linewidth.
+
+Z grid lines are drawn on the back of the plot.  This looks better if a
+partial box is drawn around the plot---see @ref{border}.
+
+@node hidden3d, isosamples, grid, set-show
+@subsection hidden3d
+
+@c ?commands set hidden3d
+@c ?commands set nohidden3d
+@c ?commands show hidden3d
+@c ?set hidden3d
+@c ?set nohidden3d
+@c ?show hidden3d
+@cindex hidden3d
+@opindex hidden3d
+
+
+@cindex nohidden3d
+
+The @ref{hidden3d} command enables hidden line removal for surface plotting
+(see `splot`).  Some optional features of the underlying algorithm can also
+be controlled using this command.
+
+Syntax:
+@example
+      set hidden3d @{defaults@} |
+                   @{ @{@{offset <offset>@} | @{nooffset@}@}
+                     @{trianglepattern <bitpattern>@}
+                     @{@{undefined <level>@} | @{noundefined@}@}
+                     @{@{no@}altdiagonal@}
+                     @{@{no@}bentover@} @}
+      set nohidden3d
+      show hidden3d
+
+@end example
+
+In contrast to the usual display in gnuplot, hidden line removal actually
+treats the given function or data grids as real surfaces that can't be seen
+through, so parts behind the surface will be hidden by it.  For this to be
+possible, the surface needs to have 'grid structure' (see `splot datafile`
+about this), and it has to be drawn `with lines` or @ref{linespoints}.
+
+When @ref{hidden3d} is set, both the hidden portion of the surface and possibly
+its contours drawn on the base (see @ref{contour}) as well as the grid will
+be hidden.  Each surface has its hidden parts removed with respect to itself
+and to other surfaces, if more than one surface is plotted.  Contours drawn
+on the surface (@ref{surface}) don't work.  Labels and arrows are
+always visible and are unaffected.  The key is also never hidden by the
+surface.
+
+Functions are evaluated at isoline intersections.  The algorithm interpolates
+linearly between function points or data points when determining the visible
+line segments.  This means that the appearance of a function may be different
+when plotted with @ref{hidden3d} than when plotted with `nohidden3d` because in
+the latter case functions are evaluated at each sample.  Please see @ref{samples} and @ref{isosamples} for discussion of the difference.
+
+The algorithm used to remove the hidden parts of the surfaces has some
+additional features controllable by this command.  Specifying `defaults` will
+set them all to their default settings, as detailed below.  If `defaults` is
+not given, only explicitly specified options will be influenced: all others
+will keep their previous values, so you can turn on/off hidden line removal
+via `set @{no@}hidden3d`, without modifying the set of options you chose.
+
+The first option, `offset`, influences the linestyle used for lines on the
+'back' side.  Normally, they are drawn in a linestyle one index number higher
+than the one used for the front, to make the two sides of the surface
+distinguishable.  You can specify a different line style offset to add
+instead of the default 1, by `offset <offset>`.  Option `nooffset` stands for
+`offset 0`, making the two sides of the surface use the same linestyle.
+
+Next comes the option `trianglepattern <bitpattern>`.  <bitpattern> must be
+a number between 0 and 7, interpreted as a bit pattern.  Each bit determines
+the visibility of one edge of the triangles each surface is split up into.
+Bit 0 is for the 'horizontal' edges of the grid, Bit 1 for the 'vertical'
+ones, and Bit 2 for the diagonals that split each cell of the original grid
+into two triangles.  The default pattern is 3, making all horizontal and
+vertical lines visible, but not the diagonals.  You may want to choose 7 to
+see those diagonals as well.
+
+The `undefined <level>` option lets you decide what the algorithm is to do
+with data points that are undefined (missing data, or undefined function
+values), or exceed the given x-, y- or z-ranges.  Such points can either be
+plotted nevertheless, or taken out of the input data set.  All surface
+elements touching a point that is taken out will be taken out as well, thus
+creating a hole in the surface.  If <level> = 3, equivalent to option
+`noundefined`, no points will be thrown away at all.  This may produce all
+kinds of problems elsewhere, so you should avoid this.  <level> = 2 will
+throw away undefined points, but keep the out-of-range ones.  <level> = 1,
+the default, will get rid of out-of-range points as well.
+
+By specifying `noaltdiagonal`, you can override the default handling of a
+special case can occur if `undefined` is active (i.e. <level> is not 3).
+Each cell of the grid-structured input surface will be divided in two
+triangles along one of its diagonals.  Normally, all these diagonals have
+the same orientation relative to the grid.  If exactly one of the four cell
+corners is excluded by the `undefined` handler, and this is on the usual
+diagonal, both triangles will be excluded.  However if the default setting
+of `altdiagonal` is active, the other diagonal will be chosen for this cell
+instead, minimizing the size of the hole in the surface.
+
+The `bentover` option controls what happens to another special case, this
+time in conjunction with the `trianglepattern`.  For rather crumply surfaces,
+it can happen that the two triangles a surface cell is divided into are seen
+from opposite sides (i.e. the original quadrangle is 'bent over'), as
+illustrated in the following ASCII art:
+
+@example
+                                                              C----B
+    original quadrangle:  A--B      displayed quadrangle:     |\   |
+      ("set view 0,0")    | /|    ("set view 75,75" perhaps)  | \  |
+                          |/ |                                |  \ |
+                          C--D                                |   \|
+                                                              A    D
+
+@end example
+
+If the diagonal edges of the surface cells aren't generally made visible by
+bit 2 of the <bitpattern> there, the edge CB above wouldn't be drawn at all,
+normally, making the resulting display hard to understand.  Therefore, the
+default option of `bentover` will turn it visible in this case.  If you don't
+want that, you may choose `nobentover` instead.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/hidden.html,Hidden Line Removal Demo} and
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/singulr.html,Complex Hidden Line Demo. }
+
+@node isosamples, key, hidden3d, set-show
+@subsection isosamples
+
+@c ?commands set isosamples
+@c ?commands show isosamples
+@c ?set isosamples
+@c ?show isosamples
+@cindex isosamples
+@opindex isosamples
+
+
+The isoline density (grid) for plotting functions as surfaces may be changed
+by the @ref{isosamples} command.
+
+Syntax:
+@example
+      set isosamples <iso_1> @{,<iso_2>@}
+      show isosamples
+
+@end example
+
+Each function surface plot will have <iso_1> iso-u lines and <iso_2> iso-v
+lines.  If you only specify <iso_1>, <iso_2> will be set to the same value
+as <iso_1>.  By default, sampling is set to 10 isolines per u or v axis.
+A higher sampling rate will produce more accurate plots, but will take longer.
+These parameters have no effect on data file plotting.
+
+An isoline is a curve parameterized by one of the surface parameters while
+the other surface parameter is fixed.  Isolines provide a simple means to
+display a surface.  By fixing the u parameter of surface s(u,v), the iso-u
+lines of the form c(v) = s(u0,v) are produced, and by fixing the v parameter,
+the iso-v lines of the form c(u) = s(u,v0) are produced.
+
+When a function surface plot is being done without the removal of hidden
+lines, @ref{samples}  controls the number of points sampled along each
+isoline;  see @ref{samples} and @ref{hidden3d}.  The contour algorithm
+assumes that a function sample occurs at each isoline intersection, so
+change in @ref{samples} as well as @ref{isosamples} may be desired when changing
+the resolution of a function surface/contour.
+
+@node key, label, isosamples, set-show
+@subsection key
+
+@c ?commands set key
+@c ?commands set nokey
+@c ?commands show key
+@c ?set key
+@c ?set nokey
+@c ?show key
+@cindex key
+@opindex key
+
+
+@cindex nokey
+
+@cindex legend
+
+The @ref{key} enables a key (or legend) describing plots on a plot.
+
+The contents of the key, i.e., the names given to each plotted data set and
+function and samples of the lines and/or symbols used to represent them, are
+determined by the `title` and @ref{with} options of the @{`s`@}@ref{plot} command.
+Please see `plot title` and @ref{with} for more information.
+
+Syntax:
+@example
+      set key @{  left | right | top | bottom | outside | below
+               | <position>@}
+              @{Left | Right@} @{@{no@}reverse@}
+              @{samplen <sample_length>@} @{spacing <vertical_spacing>@}
+              @{width <width_increment>@}
+              @{title "<text>"@}
+              @{@{no@}box @{ @{linestyle | ls <line_style>@}
+                         | @{linetype | lt <line_type>@}
+                           @{linewidth | lw <line_width>@}@}@}
+      set nokey
+      show key
+
+@end example
+
+By default the key is placed in the upper right corner of the graph.  The
+keywords `left`, `right`, `top`, `bottom`, `outside` and `below` may be used
+to place the key in the other corners inside the graph or to the right
+(outside) or below the graph.  They may be given alone or combined.
+
+Justification of the labels within the key is controlled by `Left` or `Right`
+(default is `Right`).  The text and sample can be reversed (`reverse`) and a
+box can be drawn around the key (`box @{...@}`) in a specified `linetype`
+and `linewidth`, or a user-defined @ref{linestyle}. Note that not all
+terminal drivers support linewidth selection, though.
+
+The length of the sample line can be controlled by `samplen`.  The sample
+length is computed as the sum of the tic length and <sample_length> times the
+character width.  `samplen` also affects the positions of point samples in
+the key since these are drawn at the midpoint of the sample line, even if it
+is not drawn.  <sample_length> must be an integer.
+
+The vertical spacing between lines is controlled by `spacing`.  The spacing
+is set equal to the product of the pointsize, the vertical tic size, and
+<vertical_spacing>.  The program will guarantee that the vertical spacing is
+no smaller than the character height.
+
+The <width_increment> is a number of character widths to be added to or
+subtracted from the length of the string.  This is useful only when you are
+putting a box around the key and you are using control characters in the text.
+`gnuplot` simply counts the number of characters in the string when computing
+the box width; this allows you to correct it.
+
+A title can be put on the key (`title "<text>"`)---see also `syntax` for the
+distinction between text in single- or double-quotes.  The key title uses the
+same justification as do the plot titles.
+
+The defaults for @ref{key} are `right`, `top`, `Right`, `noreverse`, `samplen
+4`, `spacing 1.25`, `title ""`, and `nobox`.  The default <linetype> is the
+same as that used for the plot borders.  Entering @ref{key} with no options
+returns the key to its default configuration.
+
+The <position> can be a simple x,y,z as in previous versions, but these can
+be preceded by one of four keywords (`first`, `second`, `graph`, `screen`)
+which selects the coordinate system in which the position is specified.  See
+`coordinates` for more details.
+
+The key is drawn as a sequence of lines, with one plot described on each
+line.  On the right-hand side (or the left-hand side, if `reverse` is
+selected) of each line is a representation that attempts to mimic the way the
+curve is plotted.  On the other side of each line is the text description
+(the line title), obtained from the @ref{plot} command.  The lines are vertically
+arranged so that an imaginary straight line divides the left- and right-hand
+sides of the key.  It is the coordinates of the top of this line that are
+specified with the @ref{key} command.  In a @ref{plot}, only the x and y
+coordinates are used to specify the line position.  For a `splot`, x, y and
+z are all used as a 3-d location mapped using the same mapping as the graph
+itself to form the required 2-d screen position of the imaginary line.
+
+Some or all of the key may be outside of the graph boundary, although this
+may interfere with other labels and may cause an error on some devices.  If
+you use the keywords `outside` or `below`, `gnuplot` makes space for the keys
+and the graph becomes smaller.  Putting keys outside to the right, they
+occupy as few columns as possible, and putting them below, as many columns as
+possible (depending of the length of the labels), thus stealing as little
+space from the graph as possible.
+
+When using the TeX or PostScript drivers, or similar drivers where formatting
+information is embedded in the string, `gnuplot` is unable to calculate
+correctly the width of the string for key positioning.  If the key is to be
+positioned at the left, it may be convenient to use the combination  `set key
+left Left reverse`.  The box and gap in the grid will be the width of the
+literal string.
+
+If `splot` is being used to draw contours, the contour labels will be listed
+in the key.  If the alignment of these labels is poor or a different number
+of decimal places is desired, the label format can be specified.  See @ref{clabel} for details.
+
+Examples:
+
+This places the key at the default location:
+@example
+      set key
+
+@end example
+
+This disables the key:
+@example
+      set nokey
+
+@end example
+
+This places a key at coordinates 2,3.5,2 in the default (first) coordinate
+system:
+@example
+      set key 2,3.5,2
+
+@end example
+
+This places the key below the graph:
+@example
+      set key below
+
+@end example
+
+This places the key in the bottom left corner, left-justifies the text,
+gives it a title, and draws a box around it in linetype 3:
+@example
+      set key left bottom Left title 'Legend' box 3
+
+@end example
+
+@node label, linestyle, key, set-show
+@subsection label
+
+@c ?commands set label
+@c ?commands set nolabel
+@c ?commands show label
+@c ?set label
+@c ?set nolabel
+@c ?show label
+@cindex label
+@opindex label
+
+
+@cindex nolabel
+
+Arbitrary labels can be placed on the plot using the @ref{label} command.
+
+Syntax:
+@example
+      set label @{<tag>@} @{"<label_text>"@} @{at <position>@}
+                @{<justification>@} @{@{no@}rotate@} @{font "<name><,size>"@}
+      set nolabel @{<tag>@}
+      show label
+
+@end example
+
+The <position> is specified by either x,y or x,y,z, and may be preceded by
+`first`, `second`, `graph`, or `screen` to select the coordinate system.
+See `coordinates` for details.
+
+The tag is an integer that is used to identify the label. If no <tag> is
+given, the lowest unused tag value is assigned automatically.  The tag can be
+used to delete or modify a specific label.  To change any attribute of an
+existing label, use the @ref{label} command with the appropriate tag, and
+specify the parts of the label to be changed.
+
+By default, the text is placed flush left against the point x,y,z.  To adjust
+the way the label is positioned with respect to the point x,y,z, add the
+parameter <justification>, which may be `left`, `right` or `center`,
+indicating that the point is to be at the left, right or center of the text.
+Labels outside the plotted boundaries are permitted but may interfere with
+axis labels or other text.
+
+If `rotate` is given, the label is written vertically (if the terminal can do
+so, of course).
+
+If one (or more) axis is timeseries, the appropriate coordinate should be
+given as a quoted time string according to the @ref{timefmt} format string.  See
+@ref{xdata} and @ref{timefmt}.
+
+The EEPIC, Imagen, LaTeX, and TPIC drivers allow \\ in a string to specify
+a newline.
+
+Examples:
+
+To set a label at (1,2) to "y=x", use:
+@example
+      set label "y=x" at 1,2
+
+@end example
+
+To set a Sigma of size 24, from the Symbol font set, at the center of
+the graph, use:
+@example
+      set label "S" at graph 0.5,0.5 center font "Symbol,24"
+
+@end example
+
+To set a label "y=x^2" with the right of the text at (2,3,4), and tag the
+label as number 3, use:
+@example
+      set label 3 "y=x^2" at 2,3,4 right
+
+@end example
+
+To change the preceding label to center justification, use:
+@example
+      set label 3 center
+
+@end example
+
+To delete label number 2, use:
+@example
+      set nolabel 2
+
+@end example
+
+To delete all labels, use:
+@example
+      set nolabel
+
+@end example
+
+To show all labels (in tag order), use:
+@example
+      show label
+
+@end example
+
+To set a label on a graph with a timeseries on the x axis, use, for example:
+@example
+      set timefmt "%d/%m/%y,%H:%M"
+      set label "Harvest" at "25/8/93",1
+
+@end example
+
+@node linestyle, lmargin, label, set-show
+@subsection linestyle
+
+@c ?commands set linestyle
+@c ?commands set nolinestyle
+@c ?commands show linestyle
+@c ?set linestyle
+@c ?set nolinestyle
+@c ?show linestyle
+@cindex linestyle
+@opindex linestyle
+
+
+Each terminal has a default set of line and point types, which can be seen
+by using the command @ref{test}.  @ref{linestyle} defines a set of line types
+and widths and point types and sizes so that you can refer to them later by
+an index instead of repeating all the information at each invocation.
+
+Syntax:
+@example
+      set linestyle <index> @{linetype | lt <line_type>@}
+                            @{linewidth | lw <line_width>@}
+                            @{pointtype | pt <point_type>@}
+                            @{pointsize | ps <point_size>@}
+      set nolinestyle
+      show linestyle
+
+@end example
+
+The line and point types are taken from the default types for the terminal
+currently in use.  The line width and point size are multipliers for the
+default width and size (but note that <point_size> here is unaffected by
+the multiplier given on 'set pointsize').
+
+The defaults for the line and point types is the index.  The defaults for
+the width and size are both unity.
+
+Linestyles created by this mechanism do not replace the default styles;
+both may be used.
+
+Not all terminals support the `linewidth` and @ref{pointsize} features; if
+not supported, the option will be ignored.
+
+Note that this feature is not completely implemented; linestyles defined by
+this mechanism may be used with 'plot', 'splot', 'replot', and 'set arrow',
+but not by other commands that allow the default index to be used, such as
+'set grid'.
+
+Example:
+Suppose that the default lines for indices 1, 2, and 3 are red, green, and
+blue, respectively, and the default point shapes for the same indices are a
+square, a cross, and a triangle, respectively.  Then
+
+@example
+      set linestyle 1 lt 2 lw 2 pt 3 ps 0.5
+
+@end example
+
+defines a new linestyle that is green and twice the default width and a new
+pointstyle that is a half-sized triangle.  The commands
+
+@example
+      set function style lines
+      plot f(x) lt 3, g(x) ls 1
+
+@end example
+
+will create a plot of f(x) using the default blue line and a plot of g(x)
+using the user-defined wide green line.  Similarly the commands
+
+@example
+      set function style linespoints
+      plot p(x) lt 1 pt 3, q(x) ls 1
+
+@end example
+
+will create a plot of f(x) using the default triangles connected by a red
+line and q(x) using small triangles connected by a green line.
+
+@node lmargin, locale, linestyle, set-show
+@subsection lmargin
+
+@c ?commands set lmargin
+@c ?set lmargin
+@cindex lmargin
+@opindex lmargin
+
+
+The command @ref{lmargin} sets the size of the left margin.  Please see
+@ref{margin} for details.
+
+@node locale, logscale, lmargin, set-show
+@subsection locale
+
+@c ?commands set locale
+@c ?commands show logscale
+@c ?set locale
+@c ?show logscale
+@cindex locale
+@opindex locale
+
+
+The @ref{locale} setting determines the language with which `@{x,y,z@}@{d,m@}tics`
+will write the days and months.
+
+Syntax:
+@example
+      set locale @{"<locale>"@}
+
+@end example
+
+<locale> may be any language designation acceptable to your installation.
+See your system documentation for the available options.  The default value
+is determined from the LANG environment variable.
+
+@node logscale, mapping, locale, set-show
+@subsection logscale
+
+@c ?commands set logscale
+@c ?commands set nologscale
+@c ?commands show logscale
+@c ?set logscale
+@c ?set nologscale
+@c ?show logscale
+@cindex logscale
+@opindex logscale
+
+
+@cindex nologscale
+
+Log scaling may be set on the x, y, z, x2 and/or y2 axes.
+
+Syntax:
+@example
+      set logscale <axes> <base>
+      set nologscale <axes>
+      show logscale
+
+@end example
+
+where <axes> may be any combinations of `x`, `y`, and `z`, in any order, or
+`x2` or `y2` and where <base> is the base of the log scaling.  If <base> is
+not given, then 10 is assumed.  If <axes> is not given, then all axes are
+assumed.  `set nologscale` turns off log scaling for the specified axes.
+
+Examples:
+
+To enable log scaling in both x and z axes:
+@example
+      set logscale xz
+
+@end example
+
+To enable scaling log base 2 of the y axis:
+@example
+      set logscale y 2
+
+@end example
+
+To disable z axis log scaling:
+@example
+      set nologscale z
+
+@end example
+
+@node mapping, margin, logscale, set-show
+@subsection mapping
+
+@c ?commands set mapping
+@c ?commands show mapping
+@c ?set mapping
+@c ?show mapping
+@cindex mapping
+@opindex mapping
+
+
+If data are provided to `splot` in spherical or cylindrical coordinates,
+the @ref{mapping} command should be used to instruct `gnuplot` how to
+interpret them.
+
+Syntax:
+@example
+      set mapping @{cartesian | spherical | cylindrical@}
+
+@end example
+
+A cartesian coordinate system is used by default.
+
+For a spherical coordinate system, the data occupy two or three columns (or
+@ref{using} entries).  The first two are interpreted as the polar and azimuthal
+angles theta and phi (in the units specified by @ref{angles}).  The radius r
+is taken from the third column if there is one, or is set to unity if there
+is no third column.  The mapping is:
+
+@example
+      x = r * cos(theta) * cos(phi)
+      y = r * sin(theta) * cos(phi)
+      z = r * sin(phi)
+
+@end example
+
+Note that this is a "geographic" spherical system, rather than a "polar" one.
+
+For a cylindrical coordinate system, the data again occupy two or three
+columns.  The first two are interpreted as theta (in the units specified by
+@ref{angles}) and z.  The radius is either taken from the third column or set
+to unity, as in the spherical case.  The mapping is:
+
+@example
+      x = r * cos(theta)
+      y = r * sin(theta)
+      z = z
+
+@end example
+
+The effects of @ref{mapping} can be duplicated with the @ref{using} filter on the
+`splot` command, but @ref{mapping} may be more convenient if many data files are
+to be processed.  However even if @ref{mapping} is used, @ref{using} may still be
+necessary if the data in the file are not in the required order.
+
+@ref{mapping} has no effect on @ref{plot}.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/world.html,Mapping Demos.}
+
+@node margin, missing, mapping, set-show
+@subsection margin
+
+@c ?commands set margin
+@c ?commands show margin
+@c ?set margin
+@c ?show margin
+@cindex margin
+@opindex margin
+
+
+The computed margins can be overridden by the @ref{margin} commands.  @ref{margin} shows the current settings.
+
+Syntax:
+@example
+      set bmargin @{<margin>@}
+      set lmargin @{<margin>@}
+      set rmargin @{<margin>@}
+      set tmargin @{<margin>@}
+      show margin
+
+@end example
+
+The units of <margin> are character heights or widths, as appropriate.  A
+positive value defines the absolute size of the margin.  A negative value
+(or none) causes `gnuplot` to revert to the computed value.
+
+Normally the margins of a plot are automatically calculated based on tics,
+tic labels, axis labels, the plot title, the timestamp and the size of the
+key if it is outside the borders.  If, however, tics are attached to the
+axes (`set xtics axis`, for example), neither the tics themselves nor their
+labels will be included in either the margin calculation or the calculation
+of the positions of other text to be written in the margin.  This can lead
+to tic labels overwriting other text if the axis is very close to the border.
+
+@node missing, multiplot, margin, set-show
+@subsection missing
+
+@c ?commands set missing
+@c ?set missing
+@cindex missing
+@opindex missing
+
+
+The @ref{missing} command allows you to tell `gnuplot` what character is
+used in a data file to denote missing data.
+
+Syntax:
+@example
+      set missing @{"<character>"@}
+      show missing
+
+@end example
+
+Example:
+@example
+      set missing "?"
+
+@end example
+
+would mean that, when plotting a file containing
+
+@example
+         1 1
+         2 ?
+         3 2
+
+@end example
+
+the middle line would be ignored.
+
+There is no default character for @ref{missing}.
+
+@node multiplot, mx2tics, missing, set-show
+@subsection multiplot
+
+@c ?commands set multiplot
+@c ?commands set nomultiplot
+@c ?set multiplot
+@c ?set nomultiplot
+@cindex multiplot
+@opindex multiplot
+
+
+@cindex nomultiplot
+
+The command @ref{multiplot} places `gnuplot` in the multiplot mode, in which
+several plots are placed on the same page, window, or screen.
+
+Syntax:
+@example
+      set multiplot
+      set nomultiplot
+
+@end example
+
+For some terminals, no plot is displayed until the command `set nomultiplot`
+is given, which causes the entire page to be drawn and then returns `gnuplot`
+to its normal single-plot mode.  For other terminals, each separate @ref{plot}
+command produces a plot, but the screen may not be cleared between plots.
+
+Any labels or arrows that have been defined will be drawn for each plot
+according to the current size and origin (unless their coordinates are
+defined in the `screen` system).  Just about everything else that can be
+`set` is applied to each plot, too.  If you want something to appear only
+once on the page, for instance a single time stamp, you'll need to put a `set
+time`/`set notime` pair around one of the @ref{plot}, `splot` or @ref{replot}
+commands within the @ref{multiplot}/`set nomultiplot` block.
+
+The commands @ref{origin} and @ref{size} must be used to correctly position
+each plot; see @ref{origin} and @ref{size} for details of their usage.
+
+Example:
+@example
+      set size 0.7,0.7
+      set origin 0.1,0.1
+      set multiplot
+      set size 0.4,0.4
+      set origin 0.1,0.1
+      plot sin(x)
+      set size 0.2,0.2
+      set origin 0.5,0.5
+      plot cos(x)
+      set nomultiplot
+
+@end example
+
+displays a plot of cos(x) stacked above a plot of sin(x).  Note the initial
+@ref{size} and @ref{origin}.  While these are not always required, their
+inclusion is recommended.  Some terminal drivers require that bounding box
+information be available before any plots can be made, and the form given
+above guarantees that the bounding box will include the entire plot array
+rather than just the bounding box of the first plot.
+
+@ref{size} and @ref{origin} refer to the entire plotting area used for each
+plot.  If you want to have the axes themselves line up, you can guarantee
+that the margins are the same size with the @ref{margin} commands.  See
+@ref{margin} for their use.  Note that the margin settings are absolute,
+in character units, so the appearance of the graph in the remaining space
+will depend on the screen size of the display device, e.g., perhaps quite
+different on a video display and a printer.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/multiplt.html,See demo. }
+
+@node mx2tics, mxtics, multiplot, set-show
+@subsection mx2tics
+
+@c ?commands set mx2tics
+@c ?commands set nomx2tics
+@c ?commands show mx2tics
+@c ?set mx2tics
+@c ?set nomx2tics
+@c ?show mx2tics
+@cindex mx2tics
+@opindex mx2tics
+
+
+@cindex nomx2tics
+
+Minor tic marks along the x2 (top) axis are controlled by @ref{mx2tics}.
+Please see @ref{mxtics}.
+
+@node mxtics, my2tics, mx2tics, set-show
+@subsection mxtics
+
+@c ?commands set mxtics
+@c ?commands set nomxtics
+@c ?commands show mxtics
+@c ?set mxtics
+@c ?set nomxtics
+@c ?show mxtics
+@cindex mxtics
+@opindex mxtics
+
+
+@cindex nomxtics
+
+Minor tic marks along the x axis are controlled by @ref{mxtics}.  They can be
+turned off with `set nomxtics`.  Similar commands control minor tics along
+the other axes.
+
+Syntax:
+@example
+      set mxtics @{<freq> | default@}
+      set nomxtics
+      show mxtics
+
+@end example
+
+The same syntax applies to @ref{mytics}, @ref{mztics}, @ref{mx2tics} and @ref{my2tics}.
+
+<freq> is the number of sub-intervals (NOT the number of minor tics) between
+major tics (ten is the default for a linear axis, so there are nine minor
+tics between major tics). Selecting `default` will return the number of minor
+ticks to its default value.
+
+If the axis is logarithmic, the number of sub-intervals will be set to a
+reasonable number by default (based upon the length of a decade).  This will
+be overridden if <freq> is given.  However the usual minor tics (2, 3, ...,
+8, 9 between 1 and 10, for example) are obtained by setting <freq> to 10,
+even though there are but nine sub-intervals.
+
+Minor tics can be used only with uniformly spaced major tics.  Since major
+tics can be placed arbitrarily by `set @{x|x2|y|y2|z@}tics`, minor tics cannot
+be used if major tics are explicitly `set`.
+
+By default, minor tics are off for linear axes and on for logarithmic axes.
+They inherit the settings for `axis|border` and `@{no@}mirror` specified for
+the major tics.  Please see @ref{xtics} for information about these.
+
+@node my2tics, mytics, mxtics, set-show
+@subsection my2tics
+
+@c ?commands set my2tics
+@c ?commands set nomy2tics
+@c ?commands show my2tics
+@c ?set my2tics
+@c ?set nomy2tics
+@c ?show my2tics
+@cindex my2tics
+@opindex my2tics
+
+
+@cindex nomy2tics
+
+Minor tic marks along the y2 (right-hand) axis are controlled by @ref{my2tics}.  Please see @ref{mxtics}.
+
+@node mytics, mztics, my2tics, set-show
+@subsection mytics
+
+@c ?commands set mytics
+@c ?commands set nomytics
+@c ?commands show mytics
+@c ?set mytics
+@c ?set nomytics
+@c ?show mytics
+@cindex mytics
+@opindex mytics
+
+
+@cindex nomytics
+
+Minor tic marks along the y axis are controlled by @ref{mytics}.  Please
+see @ref{mxtics}.
+
+@node mztics, offsets, mytics, set-show
+@subsection mztics
+
+@c ?commands set mztics
+@c ?commands set nomztics
+@c ?commands show mztics
+@c ?set mztics
+@c ?set nomztics
+@c ?show mztics
+@cindex mztics
+@opindex mztics
+
+
+@cindex nomztics
+
+Minor tic marks along the z axis are controlled by @ref{mztics}.  Please
+see @ref{mxtics}.
+
+@node offsets, origin, mztics, set-show
+@subsection offsets
+
+@c ?commands set offsets
+@c ?commands set nooffsets
+@c ?commands show offsets
+@c ?set offsets
+@c ?set nooffsets
+@c ?show offsets
+@cindex offsets
+@opindex offsets
+
+
+@cindex nooffsets
+
+Offsets provide a mechanism to put a boundary around the data inside of an
+autoscaled graph.
+
+Syntax:
+@example
+      set offsets <left>, <right>, <top>, <bottom>
+      set nooffsets
+      show offsets
+
+@end example
+
+Each offset may be a constant or an expression.  Each defaults to 0.  Left
+and right offsets are given in units of the x axis, top and bottom offsets in
+units of the y axis.  A positive offset expands the graph in the specified
+direction, e.g., a positive bottom offset makes ymin more negative.  Negative
+offsets, while permitted, can have unexpected interactions with autoscaling
+and clipping.
+
+Offsets are ignored in `splot`s.
+
+Example:
+@example
+      set offsets 0, 0, 2, 2
+      plot sin(x)
+
+@end example
+
+This graph of sin(x) will have a y range [-3:3] because the function
+will be autoscaled to [-1:1] and the vertical offsets are each two.
+
+@node origin, output, offsets, set-show
+@subsection origin
+
+@c ?commands set origin
+@c ?commands show origin
+@c ?set origin
+@c ?show origin
+@cindex origin
+@opindex origin
+
+
+The @ref{origin} command is used to specify the origin of a plotting surface
+(i.e., the graph and its margins) on the screen.  The coordinates are given
+in the `screen` coordinate system (see `coordinates` for information about
+this system).
+
+Syntax:
+@example
+      set origin <x-origin>,<y-origin>
+
+@end example
+
+@node output, parametric_, origin, set-show
+@subsection output
+
+@c ?commands set output
+@c ?commands show output
+@c ?set output
+@c ?show output
+@cindex output
+@opindex output
+
+
+By default, screens are displayed to the standard output. The @ref{output}
+command redirects the display to the specified file or device.
+
+Syntax:
+@example
+      set output @{"<filename>"@}
+      show output
+
+@end example
+
+The filename must be enclosed in quotes.  If the filename is omitted, any
+output file opened by a previous invocation of @ref{output} will be closed
+and new output will be sent to STDOUT.  (If you give the command `set output
+"STDOUT"`, your output may be sent to a file named "STDOUT"!  ["May be", not
+"will be", because some terminals, like `x11`, ignore @ref{output}.])
+
+MSDOS users should note that the \ character has special significance in
+double-quoted strings, so single-quotes should be used for filenames in
+different directories.
+
+When both @ref{terminal} and @ref{output} are used together, it is safest to
+give @ref{terminal} first, because some terminals set a flag which is needed
+in some operating systems.  This would be the case, for example, if the
+operating system needs to know whether or not a file is to be formatted in
+order to open it properly.
+
+On machines with popen functions (Unix), output can be piped through a shell
+command if the first non-whitespace character of the filename is '|'.
+For instance,
+
+@example
+      set output "|lpr -Plaser filename"
+      set output "|lp -dlaser filename"
+
+@end example
+
+On MSDOS machines, `set output "PRN"` will direct the output to the default
+printer.  On VMS, output can be sent directly to any spooled device.  It is
+also possible to send the output to DECnet transparent tasks, which allows
+some flexibility.
+
+@node parametric_, pointsize, output, set-show
+@subsection parametric
+
+@c ?commands set parametric
+@c ?commands set noparametric
+@c ?commands show parametric
+@c ?set parametric
+@c ?set noparametric
+@c ?show parametric
+@cindex parametric
+@opindex parametric
+
+
+@cindex noparametric
+
+The `set parametric` command changes the meaning of @ref{plot} (`splot`) from
+normal functions to parametric functions.  The command `set noparametric`
+restores the plotting style to normal, single-valued expression plotting.
+
+Syntax:
+@example
+      set parametric
+      set noparametric
+      show parametric
+
+@end example
+
+For 2-d plotting, a parametric function is determined by a pair of parametric
+functions operating on a parameter.  An example of a 2-d parametric function
+would be `plot sin(t),cos(t)`, which draws a circle (if the aspect ratio is
+set correctly---see @ref{size}).  `gnuplot` will display an error message if
+both functions are not provided for a parametric @ref{plot}.
+
+For 3-d plotting, the surface is described as x=f(u,v), y=g(u,v), z=h(u,v).
+Therefore a triplet of functions is required.  An example of a 3-d parametric
+function would be `cos(u)*cos(v),cos(u)*sin(v),sin(u)`, which draws a sphere.
+`gnuplot` will display an error message if all three functions are not
+provided for a parametric `splot`.
+
+The total set of possible plots is a superset of the simple f(x) style plots,
+since the two functions can describe the x and y values to be computed
+separately.  In fact, plots of the type t,f(t) are equivalent to those
+produced with f(x) because the x values are computed using the identity
+function.  Similarly, 3-d plots of the type u,v,f(u,v) are equivalent to
+f(x,y).
+
+Note that the order the parametric functions are specified is xfunction,
+yfunction (and zfunction) and that each operates over the common parametric
+domain.
+
+Also, the `set parametric` function implies a new range of values.  Whereas
+the normal f(x) and f(x,y) style plotting assume an xrange and yrange (and
+zrange), the parametric mode additionally specifies a trange, urange, and
+vrange.  These ranges may be set directly with @ref{trange}, @ref{urange},
+and @ref{vrange}, or by specifying the range on the @ref{plot} or `splot`
+commands.  Currently the default range for these parametric variables is
+[-5:5].  Setting the ranges to something more meaningful is expected.
+
+@node pointsize, polar, parametric_, set-show
+@subsection pointsize
+
+@c ?commands set pointsize
+@c ?commands show pointsize
+@c ?set pointsize
+@c ?show pointsize
+@cindex pointsize
+@opindex pointsize
+
+
+The @ref{pointsize} command scales the size of the points used in plots.
+
+Syntax:
+@example
+      set pointsize <multiplier>
+      show pointsize
+
+@end example
+
+The default is a multiplier of 1.0.  Larger pointsizes may be useful to
+make points more visible in bitmapped graphics.
+
+The pointsize of a single plot may be changed on the @ref{plot} command.  See
+@ref{with} for details.
+
+Please note that the pointsize setting is not supported by all terminal
+types.
+
+@node polar, rmargin, pointsize, set-show
+@subsection polar
+
+@c ?commands set polar
+@c ?commands set nopolar
+@c ?commands show polar
+@c ?set polar
+@c ?set nopolar
+@c ?show polar
+@cindex polar
+@opindex polar
+
+
+@cindex nopolar
+
+The `set polar` command changes the meaning of the plot from rectangular
+coordinates to polar coordinates.
+
+Syntax:
+@example
+      set polar
+      set nopolar
+      show polar
+
+@end example
+
+There have been changes made to polar mode in version 3.7, so that scripts
+for `gnuplot` versions 3.5 and earlier will require modification.  The main
+change is that the dummy variable t is used for the angle so that the x and
+y ranges can be controlled independently.  Other changes are:
+1) tics are no longer put along the zero axes automatically
+---use `set xtics axis nomirror`; `set ytics axis nomirror`;
+2) the grid, if selected, is not automatically polar
+---use `set grid polar`;
+3) the grid is not labelled with angles
+---use @ref{label} as necessary.
+
+In polar coordinates, the dummy variable (t) is an angle.  The default range
+of t is [0:2*pi], or, if degree units have been selected, to [0:360] (see
+@ref{angles}).
+
+The command `set nopolar` changes the meaning of the plot back to the default
+rectangular coordinate system.
+
+The `set polar` command is not supported for `splot`s.  See the @ref{mapping}
+command for similar functionality for `splot`s.
+
+While in polar coordinates the meaning of an expression in t is really
+r = f(t), where t is an angle of rotation.  The trange controls the domain
+(the angle) of the function, and the x and y ranges control the range of the
+graph in the x and y directions.  Each of these ranges, as well as the
+rrange, may be autoscaled or set explicitly.  See @ref{xrange} for details
+of all the `set range` commands.
+
+Example:
+@example
+      set polar
+      plot t*sin(t)
+      plot [-2*pi:2*pi] [-3:3] [-3:3] t*sin(t)
+
+@end example
+
+The first @ref{plot} uses the default polar angular domain of 0 to 2*pi.  The
+radius and the size of the graph are scaled automatically.  The second @ref{plot}
+expands the domain, and restricts the size of the graph to [-3:3] in both
+directions.
+
+You may want to `set size square` to have `gnuplot` try to make the aspect
+ratio equal to unity, so that circles look circular.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/polar.html,Polar demos }
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/poldat.html,Polar Data Plot. }
+
+@node rmargin, rrange, polar, set-show
+@subsection rmargin
+
+@c ?commands set rmargin
+@c ?set rmargin
+@cindex rmargin
+@opindex rmargin
+
+
+The command @ref{rmargin} sets the size of the right margin.  Please see
+@ref{margin} for details.
+
+@node rrange, samples, rmargin, set-show
+@subsection rrange
+
+@c ?commands set rrange
+@c ?commands show rrange
+@c ?set rrange
+@c ?show rrange
+@cindex rrange
+@opindex rrange
+
+
+The @ref{rrange} command sets the range of the radial coordinate for a
+graph in polar mode.  Please see @ref{xrange} for details.
+
+@node samples, size, rrange, set-show
+@subsection samples
+
+@c ?commands set samples
+@c ?commands show samples
+@c ?set samples
+@c ?show samples
+@cindex samples
+@opindex samples
+
+
+The sampling rate of functions, or for interpolating data, may be changed
+by the @ref{samples} command.
+
+Syntax:
+@example
+      set samples <samples_1> @{,<samples_2>@}
+      show samples
+
+@end example
+
+By default, sampling is set to 100 points.  A higher sampling rate will
+produce more accurate plots, but will take longer.  This parameter has no
+effect on data file plotting unless one of the interpolation/approximation
+options is used.  See @ref{smooth} re 2-d data and @ref{cntrparam} and
+@ref{dgrid3d} re 3-d data.
+
+When a 2-d graph is being done, only the value of <samples_1> is relevant.
+
+When a surface plot is being done without the removal of hidden lines, the
+value of samples specifies the number of samples that are to be evaluated for
+the isolines.  Each iso-v line will have <sample_1> samples and each iso-u
+line will have <sample_2> samples.  If you only specify <samples_1>,
+<samples_2> will be set to the same value as <samples_1>.  See also @ref{isosamples}.
+
+@node size, style, samples, set-show
+@subsection size
+
+@c ?commands set size
+@c ?commands show size
+@c ?set size
+@c ?show size
+@cindex size
+@opindex size
+
+
+The @ref{size} command scales the displayed size of the plot.
+
+Syntax:
+@example
+      set size @{@{no@}square | ratio <r> | noratio@} @{<xscale>,<yscale>@}
+      show size
+
+@end example
+
+The <xscale> and <yscale> values are the scaling factors for the size of the
+plot, which includes the graph and the margins.
+
+`ratio` causes `gnuplot` to try to create a graph with an aspect ratio of <r>
+(the ratio of the y-axis length to the x-axis length) within the portion of
+the plot specified by <xscale> and <yscale>.
+
+The meaning of a negative value for <r> is different.  If <r>=-1, gnuplot
+tries to set the scales so that the unit has the same length on both the x
+and y axes (suitable for geographical data, for instance).  If <r>=-2, the
+unit on y has twice the length of the unit on x, and so on.
+
+The success of `gnuplot` in producing the requested aspect ratio depends on
+the terminal selected.  The graph area will be the largest rectangle of
+aspect ratio <r> that will fit into the specified portion of the output
+(leaving adequate margins, of course).
+
+`square` is a synonym for `ratio 1`.
+
+Both `noratio` and `nosquare` return the graph to the default aspect ratio
+of the terminal, but do not return <xscale> or <yscale> to their default
+values (1.0).
+
+`ratio` and `square` have no effect on 3-d plots.
+
+@ref{size} is relative to the default size, which differs from terminal to
+terminal.  Since `gnuplot` fills as much of the available plotting area as
+possible by default, it is safer to use @ref{size} to decrease the size of
+a plot than to increase it.  See @ref{terminal} for the default sizes.
+
+On some terminals, changing the size of the plot will result in text being
+misplaced.
+
+Examples:
+
+To set the size to normal size use:
+@example
+      set size 1,1
+
+@end example
+
+To make the graph half size and square use:
+@example
+      set size square 0.5,0.5
+
+@end example
+
+To make the graph twice as high as wide use:
+@example
+      set size ratio 2
+
+@end example
+
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/airfoil.html,See demo. }
+
+@node style, surface, size, set-show
+@subsection style
+
+@c ?commands set function style
+@c ?commands show function style
+@c ?commands set data style
+@c ?commands show data style
+@c ?set function style
+@c ?show function style
+@c ?set data style
+@c ?show data style
+@c ?set style
+@c ?show style
+Default styles are chosen with the @ref{style} and @ref{style}
+commands.  See @ref{with} for information about how to override the default
+plotting style for individual functions and data sets.
+
+Syntax:
+@example
+      set function style <style>
+      set data style <style>
+      show function style
+      show data style
+
+@end example
+
+The types used for all line and point styles (i.e., solid, dash-dot, color,
+etc. for lines; circles, squares, crosses, etc. for points) will be either
+those specified on the @ref{plot} or `splot` command or will be chosen
+sequentially from the types available to the terminal in use.  Use the
+command @ref{test} to see what is available.
+
+None of the styles requiring more than two columns of information (e.g.,
+@ref{errorbars}) can be used with `splot`s or function @ref{plot}s.  Neither @ref{boxes}
+nor any of the @ref{steps} styles can be used with `splot`s.  If an inappropriate
+style is specified, it will be changed to `points`.
+
+For 2-d data with more than two columns, `gnuplot` is picky about the allowed
+`errorbar` styles.  The @ref{using} option on the @ref{plot} command can be used to
+set up the correct columns for the style you want.  (In this discussion,
+"column" will be used to refer both to a column in the data file and an entry
+in the @ref{using} list.)
+
+For three columns, only @ref{xerrorbars}, @ref{yerrorbars} (or @ref{errorbars}), @ref{boxes},
+and @ref{boxerrorbars} are allowed.  If another plot style is used, the style
+will be changed to @ref{yerrorbars}.  The @ref{boxerrorbars} style will calculate the
+boxwidth automatically.
+
+For four columns, only @ref{xerrorbars}, @ref{yerrorbars} (or @ref{errorbars}),
+@ref{xyerrorbars}, @ref{boxxyerrorbars}, and @ref{boxerrorbars} are allowed.  An illegal
+style will be changed to @ref{yerrorbars}.
+
+Five-column data allow only the @ref{boxerrorbars}, @ref{financebars}, and
+@ref{candlesticks} styles.  (The last two of these are primarily used for plots
+of financial prices.)  An illegal style will be changed to @ref{boxerrorbars}
+before plotting.
+
+Six- and seven-column data only allow the @ref{xyerrorbars} and @ref{boxxyerrorbars}
+styles.  Illegal styles will be changed to @ref{xyerrorbars} before plotting.
+
+For more information about error bars, please see @ref{errorbars}.
+
+@menu
+* boxerrorbars::                
+* boxes::                       
+* boxxyerrorbars::              
+* candlesticks::                
+* dots::                        
+* financebars::                 
+* fsteps::                      
+* histeps::                     
+* impulses::                    
+* lines::                       
+* linespoints::                 
+* points::                      
+* steps::                       
+* vector::                      
+* xerrorbars::                  
+* xyerrorbars::                 
+* yerrorbars::                  
+@end menu
+
+@node boxerrorbars, boxes, style, style
+@subsubsection boxerrorbars
+
+@c ?commands set style boxerrorbars
+@c ?set style boxerrorbars
+@c ?style boxerrorbars
+@cindex boxerrorbars
+
+The @ref{boxerrorbars} style is only relevant to 2-d data plotting.  It is a
+combination of the @ref{boxes} and @ref{yerrorbars} styles.  The boxwidth will come
+from the fourth column if the y errors are in the form of "ydelta" and the
+boxwidth was not previously set equal to -2.0 (`set boxwidth -2.0`) or from
+the fifth column if the y errors are in the form of "ylow yhigh".  The
+special case  `boxwidth = -2.0` is for four-column data with y errors in the
+form "ylow yhigh".  In this case the boxwidth will be calculated so that each
+box touches the adjacent boxes.  The width will also be calculated in cases
+where three-column data are used.
+
+The box height is determined from the y error in the same way as it is for
+the @ref{yerrorbars} style---either from y-ydelta to y+ydelta or from ylow to
+yhigh, depending on how many data columns are provided.
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/errorbar/errorbar.html,See Demo. }
+
+@node boxes, boxxyerrorbars, boxerrorbars, style
+@subsubsection boxes
+
+@c ?commands set style boxes
+@c ?commands set style bargraph
+@c ?set style boxes
+@c ?set style bargraph
+@c ?style boxes
+@c ?style bargraph
+@cindex boxes
+
+@cindex bargraph
+
+The @ref{boxes} style is only relevant to 2-d plotting.  It draws a box centered
+about the given x coordinate from the x axis (not the graph border) to the
+given y coordinate.  The width of the box is obtained in one of three ways.
+If it is a data plot and the data file has a third column, this will be used
+to set the width of the box.  If not, if a width has been set using the @ref{boxwidth} command, this will be used.  If neither of these is available, the
+width of each box will be calculated automatically so that it touches the
+adjacent boxes.
+
+@node boxxyerrorbars, candlesticks, boxes, style
+@subsubsection boxxyerrorbars
+
+@c ?commands set style boxxyerrorbars
+@c ?set style boxxyerrorbars
+@c ?style boxxyerrorbars
+@cindex boxxyerrorbars
+
+The @ref{boxxyerrorbars} style is only relevant to 2-d data plotting.  It is a
+combination of the @ref{boxes} and @ref{xyerrorbars} styles.
+
+The box width and height are determined from the x and y errors in the same
+way as they are for the @ref{xyerrorbars} style---either from xlow to xhigh and
+from ylow to yhigh, or from x-xdelta to x+xdelta and from y-ydelta to
+y+ydelta , depending on how many data columns are provided.
+
+@node candlesticks, dots, boxxyerrorbars, style
+@subsubsection candlesticks
+
+@c ?commands set style candlesticks
+@c ?set style candlesticks
+@c ?style candlesticks
+@cindex candlesticks
+
+The @ref{candlesticks} style is only relevant for 2-d data plotting of financial
+data.  Five columns of data are required; in order, these should be the x
+coordinate (most likely a date) and the opening, low, high, and closing
+prices.  The symbol is an open rectangle, centered horizontally at the x
+coordinate and limited vertically by the opening and closing prices.  A
+vertical line segment at the x coordinate extends up from the top of the
+rectangle to the high price and another down to the low.  The width of the
+rectangle may be changed by @ref{bar}.  The symbol will be unchanged if the
+low and high prices are interchanged or if the opening and closing prices
+are interchanged.  See @ref{bar} and @ref{financebars}.
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/finance/finance.html,See demos.}
+
+@node dots, financebars, candlesticks, style
+@subsubsection dots
+
+@c ?commands set style dots
+@c ?set style dots
+@c ?style dots
+@cindex dots
+
+The @ref{dots} style plots a tiny dot at each point; this is useful for scatter
+plots with many points.
+
+@node financebars, fsteps, dots, style
+@subsubsection financebars
+
+@c ?commands set style financebars
+@c ?set style financebars
+@c ?style financebars
+@cindex financebars
+
+The @ref{financebars} style is only relevant for 2-d data plotting of financial
+data.  Five columns of data are required; in order, these should be the x
+coordinate (most likely a date) and the opening, low, high, and closing
+prices.  The symbol is a vertical line segment, located horizontally at the x
+coordinate and limited vertically by the high and low prices.  A horizontal
+tic on the left marks the opening price and one on the right marks the
+closing price.  The length of these tics may be changed by @ref{bar}.  The
+symbol will be unchanged if the high and low prices are interchanged.  See
+@ref{bar} and @ref{candlesticks}.
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/finance/finance.html,See demos.}
+
+@node fsteps, histeps, financebars, style
+@subsubsection fsteps
+
+@c ?commands set style fsteps
+@c ?set style fsteps
+@c ?style fsteps
+@cindex fsteps
+
+The @ref{fsteps} style is only relevant to 2-d plotting.  It connects consecutive
+points with two line segments: the first from (x1,y1) to (x1,y2) and the
+second from (x1,y2) to (x2,y2).
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/steps.html,See demo. }
+
+@node histeps, impulses, fsteps, style
+@subsubsection histeps
+
+@c ?commands set style histeps
+@c ?set style histeps
+@c ?style histeps
+@cindex histeps
+
+The @ref{histeps} style is only relevant to 2-d plotting.  It is intended for
+plotting histograms.  Y-values are assumed to be centered at the x-values;
+the point at x1 is represented as a horizontal line from ((x0+x1)/2,y1) to
+((x1+x2)/2,y1).  The lines representing the end points are extended so that
+the step is centered on at x.  Adjacent points are connected by a vertical
+line at their average x, that is, from ((x1+x2)/2,y1) to ((x1+x2)/2,y2).
+
+If @ref{autoscale} is in effect, it selects the xrange from the data rather than
+the steps, so the end points will appear only half as wide as the others.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/steps.html,See demo. }
+
+@ref{histeps} is only a plotting style; `gnuplot` does not have the ability to
+create bins and determine their population from some data set.
+
+@node impulses, lines, histeps, style
+@subsubsection impulses
+
+@c ?commands set style impulses
+@c ?set style impulses
+@c ?style impulses
+@cindex impulses
+
+The @ref{impulses} style displays a vertical line from the x axis (not the graph
+border), or from the grid base for `splot`, to each point.
+
+@node lines, linespoints, impulses, style
+@subsubsection lines
+
+@c ?commands set style lines
+@c ?set style lines
+@c ?style lines
+@cindex lines
+
+The `lines` style connects adjacent points with straight line segments.
+
+@node linespoints, points, lines, style
+@subsubsection linespoints
+
+@c ?commands set style linespoints
+@c ?commands set style lp
+@c ?set style linespoints
+@c ?set style lp
+@c ?style linespoints
+@c ?style lp
+@cindex linespoints
+
+@cindex lp
+
+The @ref{linespoints} style does both `lines` and `points`, that is, it draws a
+small symbol at each point and then connects adjacent points with straight
+line segments.  The command @ref{pointsize} may be used to change the size of
+the points.  See @ref{pointsize} for its usage.
+
+@ref{linespoints} may be abbreviated `lp`.
+
+@node points, steps, linespoints, style
+@subsubsection points
+
+@c ?commands set style points
+@c ?set style points
+@c ?style points
+@cindex points
+
+The `points` style displays a small symbol at each point.  The command @ref{pointsize} may be used to change the size of the points.  See @ref{pointsize}
+for its usage.
+
+@node steps, vector, points, style
+@subsubsection steps
+
+@c ?commands set style steps
+@c ?set style steps
+@c ?style steps
+@cindex steps
+
+The @ref{steps} style is only relevant to 2-d plotting.  It connects consecutive
+points with two line segments: the first from (x1,y1) to (x2,y1) and the
+second from (x2,y1) to (x2,y2).
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/steps.html,See demo. }
+
+@node vector, xerrorbars, steps, style
+@subsubsection vector
+
+@c ?commands set style vector
+@c ?set style vector
+@c ?style vector
+@cindex vector
+
+The @ref{vector} style draws a vector from (x,y) to (x+xdelta,y+ydelta).  Thus
+it requires four columns of data.  It also draws a small arrowhead at the
+end of the vector.
+
+The @ref{vector} style is still experimental: it doesn't get clipped properly
+and other things may also be wrong with it.  Use it at your own risk.
+
+@node xerrorbars, xyerrorbars, vector, style
+@subsubsection xerrorbars
+
+@c ?commands set style xerrorbars
+@c ?set style xerrorbars
+@c ?style xerrorbars
+@cindex xerrorbars
+
+The @ref{xerrorbars} style is only relevant to 2-d data plots.  @ref{xerrorbars} is
+like @ref{dots}, except that a horizontal error bar is also drawn.  At each point
+(x,y), a line is drawn from (xlow,y) to (xhigh,y) or from (x-xdelta,y) to
+(x+xdelta,y), depending on how many data columns are provided.  A tic mark
+is placed at the ends of the error bar (unless @ref{bar} is used---see @ref{bar} for details).
+
+@node xyerrorbars, yerrorbars, xerrorbars, style
+@subsubsection xyerrorbars
+
+@c ?commands set style xyerrorbars
+@c ?set style xyerrorbars
+@c ?style xyerrorbars
+@cindex xyerrorbars
+
+The @ref{xyerrorbars} style is only relevant to 2-d data plots.  @ref{xyerrorbars} is
+like @ref{dots}, except that horizontal and vertical error bars are also drawn.
+At each point (x,y), lines are drawn from (x,y-ydelta) to (x,y+ydelta) and
+from (x-xdelta,y) to (x+xdelta,y) or from (x,ylow) to (x,yhigh) and from
+(xlow,y) to (xhigh,y), depending upon the number of data columns provided.  A
+tic mark is placed at the ends of the error bar (unless @ref{bar} is
+used---see @ref{bar} for details).
+
+If data are provided in an unsupported mixed form, the @ref{using} filter on the
+@ref{plot} command should be used to set up the appropriate form.  For example,
+if the data are of the form (x,y,xdelta,ylow,yhigh), then you can use
+
+@example
+      plot 'data' using 1:2:($1-$3),($1+$3),4,5 with xyerrorbars
+
+@end example
+
+@node yerrorbars,  , xyerrorbars, style
+@subsubsection yerrorbars
+
+@c ?commands set style yerrorbars
+@c ?commands set style errorbars
+@c ?set style yerrorbars
+@c ?set style errorbars
+@c ?style yerrorbars
+@c ?style errorbars
+@cindex yerrorbars
+
+@cindex errorbars
+
+The @ref{yerrorbars} (or @ref{errorbars}) style is only relevant to 2-d data plots.
+@ref{yerrorbars} is like @ref{dots}, except that a vertical error bar is also drawn.
+At each point (x,y), a line is drawn from (x,y-ydelta) to (x,y+ydelta) or
+from (x,ylow) to (x,yhigh), depending on how many data columns are provided.
+A tic mark is placed at the ends of the error bar (unless @ref{bar} is
+used---see @ref{bar} for details).
+@uref{http://www.nas.nasa.gov/~woo/gnuplot/errorbar/errorbar.html,See demo. }
+
+@node surface, terminal, style, set-show
+@subsection surface
+
+@c ?commands set surface
+@c ?commands set nosurface
+@c ?commands show surface
+@c ?set surface
+@c ?set nosurface
+@c ?show surface
+@cindex surface
+@opindex surface
+
+
+@cindex nosurface
+
+The command @ref{surface} controls the display of surfaces by `splot`.
+
+Syntax:
+@example
+      set surface
+      set nosurface
+      show surface
+
+@end example
+
+The surface is drawn with the style specifed by @ref{with}, or else the
+appropriate style, data or function.
+
+Whenever `set nosurface` is issued, `splot` will not draw points or lines
+corresponding to the function or data file points.  Contours may be still be
+drawn on the surface, depending on the @ref{contour} option. `set nosurface;
+set contour base` is useful for displaying contours on the grid base.  See
+also @ref{contour}.
+@c ^ <h2> Terminal Types </h2>
+
+@node terminal, tics, surface, set-show
+@subsection terminal
+
+@c ?commands set terminal
+@c ?commands show terminal
+@c ?set terminal
+@c ?set term
+@c ?show terminal
+@cindex terminal
+@opindex terminal
+
+
+@cindex term
+
+`gnuplot` supports many different graphics devices.  Use @ref{terminal} to
+tell `gnuplot` what kind of output to generate. Use @ref{output} to redirect
+that output to a file or device.
+
+Syntax:
+@example
+      set terminal @{<terminal-type>@}
+      show terminal
+
+@end example
+
+If <terminal-type> is omitted, `gnuplot` will list the available terminal
+types.  <terminal-type> may be abbreviated.
+
+If both @ref{terminal} and @ref{output} are used together, it is safest to
+give @ref{terminal} first, because some terminals set a flag which is needed
+in some operating systems.
+
+Several terminals have additional options.  For example, see `dumb`,
+`iris4d`, `hpljii` or `postscript`.
+
+This document may describe drivers that are not available to you because they
+were not installed, or it may not describe all the drivers that are available
+to you, depending on its output format.
+@@c <4 -- all terminal stuff is pulled from the .trm files
+
+@menu
+* aifm::                        
+* cgm::                         
+* corel::                       
+* dumb::                        
+* dxf::                         
+* eepic::                       
+* epson-180dpi::                
+* fig::                         
+* gif::                         
+* gpic::                        
+* hp2623a::                     
+* hp2648::                      
+* hp500c::                      
+* hpgl::                        
+* hpljii::                      
+* hppj::                        
+* imagen::                      
+* latex::                       
+* mf::                          
+* mif::                         
+* pbm::                         
+* png::                         
+* postscript::                  
+* pslatex_and_pstex::           
+* pstricks::                    
+* qms::                         
+* regis::                       
+* sun::                         
+* tek410x::                     
+* table::                       
+* tek40::                       
+* texdraw::                     
+* tgif::                        
+* tkcanvas::                    
+* tpic::                        
+* x11::                         
+* xlib::                        
+@end menu
+
+@node aifm, cgm, terminal, terminal
+@subsubsection aifm
+
+@c ?commands set terminal aifm
+@c ?set terminal aifm
+@c ?set term aifm
+@c ?terminal aifm
+@c ?term aifm
+@cindex aifm
+@tmindex aifm
+
+
+Several options may be set in `aifm`---the Adobe Illustrator 3.0+ driver.
+
+Syntax:
+@example
+      set terminal aifm @{<color>@} @{"<fontname>"@} @{<fontsize>@}
+
+@end example
+
+<color> is either `color` or `monochrome`; "<fontname>" is the name of a
+valid PostScript font; <fontsize> is the size of the font in PostScript
+points, before scaling by the @ref{size} command.  Selecting `default` sets
+all options to their default values: `monochrome`, "Helvetica", and 14pt.
+
+Since AI does not really support multiple pages, multiple graphs will be
+drawn directly on top of one another.  However, each graph will be grouped
+individually, making it easy to separate them inside AI (just pick them up
+and move them).
+
+Examples:
+@example
+      set term aifm
+      set term aifm 22
+      set size 0.7,1.4; set term aifm color "Times-Roman" 14"
+
+@end example
+
+@node cgm, corel, aifm, terminal
+@subsubsection cgm
+
+@c ?commands set terminal cgm
+@c ?set terminal cgm
+@c ?set term cgm
+@c ?terminal cgm
+@c ?term cgm
+@cindex cgm
+@tmindex cgm
+
+
+The `cgm` terminal generates a Computer Graphics Metafile.  This file format
+is a subset of the ANSI X3.122-1986 standard entitled "Computer Graphics -
+Metafile for the Storage and Transfer of Picture Description Information".
+Several options may be set in `cgm`.
+
+Syntax:
+@example
+      set terminal cgm @{<mode>@} @{<color>@} @{<rotation>@} @{solid | dashed@}
+                       @{width <plot_width>@} @{linewidth <line_width>@}
+                       @{"<font>"@} @{<fontsize>@}
+
+@end example
+
+where <mode> is `landscape`, `portrait`, or `default`;
+<color> is either `color` or `monochrome`; 
+<rotation> is either `rotate` or `norotate`;
+`solid` draws all curves with solid lines, overriding any dashed patterns;
+<plot_width> is the width of the page in points; 
+<line_width> is the line width in points; 
+<font> is the name of a font; and 
+`<fontsize>` is the size of the font in points.
+
+By default, `cgm` uses rotated text for the Y axis label.
+
+The first six options can be in any order.  Selecting `default` sets all
+options to their default values.
+
+Examples:
+@example
+      set terminal cgm landscape color rotate dashed width 432 \\
+                     linewidth 1  'Arial Bold' 12       # defaults
+      set terminal cgm 14 linewidth 2  14  # wider lines & larger font
+      set terminal cgm portrait 'Times Roman Italic' 12
+      set terminal cgm color solid    # no pesky dashes!
+
+@end example
+
+
+@noindent --- FONT ---
+
+@c ?commands set terminal cgm font
+@c ?set terminal cgm font
+@c ?set term cgm font
+@c ?cgm font
+The first part of a Computer Graphics Metafile, the metafile description,
+includes a font table.  In the picture body, a font is designated by an
+index into this table.  By default, this terminal generates a table with
+the following fonts:
+
+@example
+      Arial
+      Arial Italic
+      Arial Bold
+      Arial Bold Italic
+      Times Roman
+      Times Roman Italic
+      Times Roman Bold
+      Times Roman Bold Italic
+      Helvetica
+      Roman
+
+@end example
+
+Case is not distinct, but the modifiers must appear in the above order (that
+is, not 'Arial Italic Bold').  'Arial Bold' is the default font.
+
+You may also specify a font name which does not appear in the default font
+table.  In that case, a new font table is constructed with the specified
+font as its only entry.  You must ensure that the spelling, capitalization,
+and spacing of the name are appropriate for the application that will read
+the CGM file.
+
+
+@noindent --- FONTSIZE ---
+
+@c ?commands set terminal cgm fontsize
+@c ?set terminal cgm fontsize
+@c ?set term cgm fontsize
+@c ?cgm fontsize
+Fonts are scaled assuming the page is 6 inches wide.  If the @ref{size} command
+is used to change the aspect ratio of the page or the CGM file is converted
+to a different width (e.g. it is imported into a document in which the
+margins are not 6 inches apart), the resulting font sizes will be different.
+To change the assumed width, use the `width` option.
+
+
+@noindent --- LINEWIDTH ---
+
+@c ?commands set terminal cgm linewidth
+@c ?set terminal cgm linewidth
+@c ?set term cgm linewidth
+@c ?cgm linewidth
+The `linewidth` option sets the width of lines in pt.  The default width is
+1 pt.  Scaling is affected by the actual width of the page, as discussed
+under the `fontsize` and `width` options
+
+
+@noindent --- ROTATE ---
+
+@c ?commands set terminal cgm rotate
+@c ?set terminal cgm rotate
+@c ?set term cgm rotate
+@c ?cgm rotate
+The `norotate` option may be used to disable text rotation.  For example,
+the CGM input filter for Word for Windows 6.0c can accept rotated text, but
+the DRAW editor within Word cannot.  If you edit a graph (for example, to
+label a curve), all rotated text is restored to horizontal.  The Y axis
+label will then extend beyond the clip boundary.  With `norotate`, the Y
+axis label starts in a less attractive location, but the page can be edited
+without damage.  The `rotate` option confirms the default behavior.
+
+
+@noindent --- SOLID ---
+
+@c ?set terminal cgm solid
+@c ?set term cgm solid
+@c ?cgm solid
+The `solid` option may be used to disable dashed line styles in the
+plots.  This is useful when color is enabled and the dashing of the lines
+detracts from the appearance of the plot. The `dashed` option confirms the
+default behavior, which gives a different dash pattern to each curve.
+
+
+@noindent --- SIZE ---
+
+@c ?commands set terminal cgm size
+@c ?set terminal cgm size
+@c ?set term cgm size
+@c ?scgm size
+Default size of a CGM page is 32599 units wide and 23457 units high for
+landscape, or 23457 units wide by 32599 units high for portrait.
+
+
+@noindent --- WIDTH ---
+
+@c ?commands set terminal cgm width
+@c ?set terminal cgm width
+@c ?set term cgm width
+@c ?cgm width
+All distances in the CGM file are in abstract units.  The application that
+reads the file determines the size of the final page.  By default, the width
+of the final page is assumed to be 6 inches (15.24 cm).  This distance is
+used to calculate the correct font size, and may be changed with the `width`
+option.  The keyword should be followed by the width in points.  (Here, a
+point is 1/72 inch, as in PostScript.  This unit is known as a "big point"
+in TeX.)  `gnuplot` arithmetic can be used to convert from other units, as
+follows:
+@example
+      set terminal cgm width 432            # default
+      set terminal cgm width 6*72           # same as above
+      set terminal cgm width 10/2.54*72     # 10 cm wide
+
+@end example
+
+
+@noindent --- WINWORD6 ---
+
+@c ?commands set terminal cgm winword6
+@c ?set terminal cgm winword6
+@c ?set term cgm winword6
+@c ?cgm winword6
+The default font table was chosen to match, where possible, the default font
+assignments made by the Computer Graphics Metafile input filter for
+Microsoft Word 6.0c, although the filter makes available only 'Arial' and
+'Times Roman' fonts and their bold and/or italic variants.  Other fonts such
+as 'Helvetica' and 'Roman' are not available.  If the CGM file includes a
+font table, the filter mostly ignores it.  However, it changes certain font
+assignments so that they disagree with the table.  As a workaround, the
+`winword6` option deletes the font table from the CGM file.  In this case,
+the filter makes predictable font assignments.  'Arial Bold' is correctly
+assigned even with the font table present, which is one reason it was chosen
+as the default.
+
+`winword6` disables the color tables for a similar reason---with the color
+table included, Microsoft Word displays black for color 7.
+
+Linewidths and pointsizes may be changed with @ref{linestyle}."
+
+@node corel, dumb, cgm, terminal
+@subsubsection corel
+
+@c ?commands set terminal corel
+@c ?set terminal corel
+@c ?set term corel
+@c ?terminal corel
+@c ?term corel
+@cindex corel
+@tmindex corel
+
+
+The `corel` terminal driver supports CorelDraw.
+
+Syntax:
+@example
+      set terminal corel @{  default
+                          | @{monochrome | color
+                               @{<fontname> @{"<fontsize>" 
+                                  @{<xsize> <ysize> @{<linewidth> @}@}@}@}@}
+
+@end example
+
+where the fontsize and linewidth are specified in points and the sizes in
+inches.  The defaults are monochrome, "SwitzerlandLight", 22, 8.2, 10 and 1.2."
+
+@node dumb, dxf, corel, terminal
+@subsubsection dumb
+
+@c ?commands set terminal dumb
+@c ?set terminal dumb
+@c ?set term dumb
+@c ?terminal dumb
+@c ?term dumb
+@cindex dumb
+@tmindex dumb
+
+
+The `dumb` terminal driver has an optional size specification and trailing
+linefeed control.
+
+Syntax:
+@example
+      set terminal dumb @{[no]feed@} @{<xsize> <ysize>@}
+
+@end example
+
+where <xsize> and <ysize> set the size of the dumb terminals. Default is
+79 by 24. The last newline is printed only if `feed` is enabled.
+
+Examples:
+@example
+      set term dumb nofeed
+      set term dumb 79 49 # VGA screen---why would anyone do that?"
+
+@end example
+
+@node dxf, eepic, dumb, terminal
+@subsubsection dxf
+
+@c ?commands set terminal dxf
+@c ?set terminal dxf
+@c ?set term dxf
+@c ?terminal dxf
+@c ?term dxf
+@cindex dxf
+@tmindex dxf
+
+
+The `dxf` terminal driver creates pictures that can be imported into AutoCad
+(Release 10.x).  It has no options of its own, but some features of its plots
+may be modified by other means.  The default size is 120x80 AutoCad units,
+which can be changed by @ref{size}.  `dxf` uses seven colors (white, red,
+yellow, green, cyan, blue and magenta), which can be changed only by
+modifying the source file.  If a black-and-white plotting device is used, the
+colors are mapped to differing line thicknesses.  See the description of the
+AutoCad print/plot command."
+
+@node eepic, epson-180dpi, dxf, terminal
+@subsubsection eepic
+
+@c ?commands set terminal eepic
+@c ?set terminal eepic
+@c ?set term eepic
+@c ?terminal eepic
+@c ?term eepic
+@cindex eepic
+@tmindex eepic
+
+
+The `eepic` terminal driver supports the extended LaTeX picture environment.
+It is an alternative to the `latex` driver.
+
+The output of this terminal is intended for use with the "eepic.sty" macro
+package for LaTeX.  To use it, you need "eepic.sty", "epic.sty" and a
+printer driver that supports the "tpic" \\specials.  If your printer driver
+doesn't support those \\specials, "eepicemu.sty" will enable you to use some
+of them.
+
+Although dotted and dashed lines are possible with `eepic` and are tempting,
+they do not work well for high-sample-rate curves, fusing the dashes all
+together into a solid line.  For now, the `eepic` driver creates only solid
+lines.  There is another gnuplot driver (`tpic`) that supports dashed lines,
+but it cannot be used if your DVI driver doesn't support "tpic" \\specials.
+
+All drivers for LaTeX offer a special way of controlling text positioning:
+If any text string begins with '@{', you also need to include a '@}' at the
+end of the text, and the whole text will be centered both horizontally
+and vertically by LaTeX. --- If the text string begins with '[', you need
+to continue it with: a position specification (up to two out of t,b,l,r),
+']@{', the text itself, and finally, '@}'. The text itself may be anything
+LaTeX can typeset as an LR-box. \\rule@{@}@{@}'s may help for best positioning.
+
+The `eepic` terminal has no options.
+
+Examples:
+About label positioning:
+Use gnuplot defaults (mostly sensible, but sometimes not really best):
+@example
+       set title '\\LaTeX\\ -- $ \\gamma $'
+@end example
+
+Force centering both horizontally and vertically:
+@example
+       set label '@{\\LaTeX\\ -- $ \\gamma $@}' at 0,0
+@end example
+
+Specify own positioning (top here):
+@example
+       set xlabel '[t]@{\\LaTeX\\ -- $ \\gamma $@}'
+@end example
+
+The other label -- account for long ticlabels:
+@example
+       set ylabel '[r]@{\\LaTeX\\ -- $ \\gamma $\\rule@{7mm@}@{0pt@}'"
+
+@end example
+
+@node epson-180dpi, fig, eepic, terminal
+@subsubsection epson-180dpi
+
+@c ?commands set terminal epson-180dpi
+@c ?set terminal epson-180dpi
+@c ?set term epson-180dpi
+@c ?terminal epson-180dpi
+@c ?term epson-180dpi
+@cindex epson-180dpi
+@tmindex epson-180dpi
+
+
+@c ?commands set terminal epson-60dpi
+@c ?set terminal epson-60dpi
+@c ?set term epson-60dpi
+@c ?terminal epson-60dpi
+@c ?term epson-60dpi
+@cindex epson-60dpi
+@tmindex epson-60dpi
+
+
+@c ?commands set terminal epson-lx800
+@c ?set terminal epson-lx800
+@c ?set term epson-lx800
+@c ?terminal epson-lx800
+@c ?term epson-lx800
+@cindex epson-lx800
+@tmindex epson-lx800
+
+
+@c ?commands set terminal nec-cp6
+@c ?set terminal nec-cp6
+@c ?set term nec-cp6
+@c ?terminal nec-cp6
+@c ?term nec-cp6
+@cindex nec-cp6
+@tmindex nec-cp6
+
+
+@c ?commands set terminal okidata
+@c ?set terminal okidata
+@c ?set term okidata
+@c ?terminal okidata
+@c ?term okidata
+@cindex okidata
+@tmindex okidata
+
+
+@c ?commands set terminal starc
+@c ?set terminal starc
+@c ?set term starc
+@c ?terminal starc
+@c ?term starc
+@cindex starc
+@tmindex starc
+
+
+@c ?commands set terminal tandy-60dpi
+@c ?set terminal tandy-60dpi
+@c ?set term tandy-60dpi
+@c ?terminal tandy-60dpi
+@c ?term tandy-60dpi
+@cindex tandy-60dpi
+@tmindex tandy-60dpi
+
+
+This driver supports a family of Epson printers and derivatives.
+
+`epson-180dpi` and `epson-60dpi` are drivers for Epson LQ-style 24-pin
+printers with resolutions of 180 and 60 dots per inch, respectively.
+
+`epson-lx800` is a generic 9-pin driver appropriate for printers like the
+Epson LX-800, the Star NL-10 and NX-1000, the PROPRINTER, and so forth.
+
+`nec-cp6` is generix 24-pin driver that can be used for printers like the
+NEC CP6 and the Epson LQ-800.
+
+The `okidata` driver supports the 9-pin OKIDATA 320/321 Standard printers.
+
+The `starc` driver is for the Star Color Printer.
+
+The `tandy-60dpi` driver is for the Tandy DMP-130 series of 9-pin, 60-dpi
+printers.
+
+Only `nec-cp6` has any options.
+
+Syntax:
+@example
+      set terminal nec-cp6 @{monochrome | colour | draft@}
+
+@end example
+
+which defaults to monochrome.
+
+With each of these drivers, a binary copy is required on a PC to print.  Do
+not use @ref{print}---use instead `copy file /b lpt1:`."
+
+@node fig, gif, epson-180dpi, terminal
+@subsubsection fig
+
+@c ?commands set terminal fig
+@c ?set terminal fig
+@c ?set term fig
+@c ?terminal fig
+@c ?term fig
+@cindex fig
+@tmindex fig
+
+
+The `fig` terminal device generates output in the Fig graphics language.
+
+Syntax:
+@example
+      set terminal fig @{monochrome | color@} @{small | big@}
+                       @{pointsmax <max_points>@}
+                       @{landscape | portrait@}
+                       @{metric | inches@}
+                       @{fontsize <fsize>@}
+                       @{size <xsize> <ysize>@}
+                       @{thickness <units>@}
+                       @{depth <layer>@}
+
+@end example
+
+`monochrome` and `color` determine whether the picture is black-and-white or
+`color`.  `small` and `big` produce a 5x3 or 8x5 inch graph in the default
+`landscape` mode and 3x5 or 5x8 inches in `portrait` mode.  <max_points>
+sets the maximum number of points per polyline.  Default units for editing
+with "xfig" may be `metric` or `inches`.  `fontsize` sets the size of the
+text font to <fsize> points.  @ref{size} sets (overrides) the size of the drawing
+area to <xsize>*<ysize> in units of inches or centimeters depending on the
+`inches` or `metric` setting in effect.  `depth` sets the default depth layer
+for all lines and text.  The default depth is 10 to leave room for adding
+material with "xfig" on top of the plot.
+
+`thickness` sets the default line thickness, which is 1 if not specified.
+Overriding the thickness can be achieved by adding a multiple of 100 to the
+to the `linetype` value for a @ref{plot} command.  In a similar way the `depth`
+of plot elements (with respect to the default depth) can be controlled by
+adding a multiple of 1000 to <linetype>.  The depth is then <layer> +
+<linetype>/1000 and the thickness is (<linetype>%1000)/100 or, if that is
+zero, the default line thickness.
+
+Additional point-plot symbols are also available with the `fig` driver. The
+symbols can be used through `pointtype` values % 100 above 50, with different
+fill intensities controlled by <pointtype> % 5 and outlines in black (for
+<pointtype> % 10 < 5) or in the current color.  Available symbols are
+@example
+        50 - 59:  circles
+        60 - 69:  squares
+        70 - 79:  diamonds
+        80 - 89:  upwards triangles
+        90 - 99:  downwards triangles
+@end example
+
+The size of these symbols is linked to the font size.  The depth of symbols
+is by default one less than the depth for lines to achieve nice error bars.
+If <pointtype> is above 1000, the depth is <layer> + <pointtype>/1000-1.  If
+<pointtype>%1000 is above 100, the fill color is (<pointtype>%1000)/100-1.
+
+Available fill colors are (from 1 to 9): black, blue, green, cyan, red,
+magenta, yellow, white and dark blue (in monochrome mode: black for 1 to 6
+and white for 7 to 9).
+
+See @ref{with} for details of <linetype> and <pointtype>.
+
+The `big` option is a substitute for the `bfig` terminal in earlier versions,
+which is no longer supported.
+
+Examples:
+@example
+      set terminal fig monochrome small pointsmax 1000  # defaults
+
+@end example
+
+@example
+      plot 'file.dat' with points linetype 102 pointtype 759
+@end example
+
+would produce circles with a blue outline of width 1 and yellow fill color.
+
+@example
+      plot 'file.dat' using 1:2:3 with err linetype 1 pointtype 554
+@end example
+
+would produce errorbars with black lines and circles filled red.  These
+circles are one layer above the lines (at depth 9 by default).
+
+To plot the error bars on top of the circles use
+@example
+      plot 'file.dat' using 1:2:3 with err linetype 1 pointtype 2554"
+
+@end example
+
+@node gif, gpic, fig, terminal
+@subsubsection gif
+
+@c ?commands set terminal gif
+@c ?set terminal gif
+@c ?set term gif
+@c ?terminal gif
+@c ?term gif
+@cindex gif
+@tmindex gif
+
+
+The `gif` terminal driver generates output in GIF format.  It uses Thomas
+Boutell's gd library, which is available from http://www.boutell.com/gd/
+
+By default, the `gif` terminal driver uses a shared Web-friendy palette."
+
+Syntax:
+@example
+      set terminal gif @{transparent@} @{interlace@}
+                       @{tiny | small | medium | large | giant@}
+                       @{size <x>,<y>@}
+                       @{<color0> <color1> <color2> ...@}
+
+@end example
+
+`transparent` instructs the driver to generate transparent GIFs.  The first
+color will be the transparent one.
+
+`interlace` instructs the driver to generate interlaced GIFs.
+
+The choice of fonts is `tiny` (5x8 pixels), `small` (6x12 pixels), `medium`
+(7x13 Bold), `large` (8x16) or `giant` (9x15 pixels)
+
+The size <x,y> is given in pixels---it defaults to 640x480.  The number of
+pixels can be also modified by scaling with the @ref{size} command.
+
+Each color must be of the form 'xrrggbb', where x is the literal character
+'x' and 'rrggbb' are the red, green and blue components in hex.  For example,
+'x00ff00' is green.  The background color is set first, then the border
+colors, then the X & Y axis colors, then the plotting colors.  The maximum
+number of colors that can be set is 256.
+
+Examples:
+@example
+      set terminal gif small size 640,480 \\
+                       xffffff x000000 x404040 \\
+                       xff0000 xffa500 x66cdaa xcdb5cd \\
+                       xadd8e6 x0000ff xdda0dd x9500d3    # defaults
+
+@end example
+
+which uses white for the non-transparent background, black for borders, gray
+for the axes, and red, orange, medium aquamarine, thistle 3, light blue, blue,
+plum and dark violet for eight plotting colors.
+
+@example
+      set terminal gif transparent xffffff \\
+                       x000000 x202020 x404040 x606060 \\
+                       x808080 xA0A0A0 xC0C0C0 xE0E0E0 \\
+@end example
+
+which uses white for the transparent background, black for borders, dark
+gray for axes, and a gray-scale for the six plotting colors.
+
+The page size is 640x480 pixels.  The `gif` driver can create either color
+or monochromatic output, but you have no control over which is produced.
+
+The current version of the `gif` driver does not support animated GIFs."
+
+@node gpic, hp2623a, gif, terminal
+@subsubsection gpic
+
+@c ?commands set terminal gpic
+@c ?set terminal gpic
+@c ?set term gpic
+@c ?terminal gpic
+@c ?term gpic
+@cindex gpic
+@tmindex gpic
+
+
+The `gpic` terminal driver generates GPIC graphs in the Free Software
+Foundations's "groff" package.  The default size is 5 x 3 inches.  The only
+option is the origin, which defaults to (0,0).
+
+Syntax:
+@example
+      set terminal gpic @{<x> <y>@}
+
+@end example
+
+where `x` and `y` are in inches.
+
+A simple graph can be formatted using
+
+@example
+      groff -p -mpic -Tps file.pic > file.ps.
+
+@end example
+
+The output from pic can be pipe-lined into eqn, so it is possible to put
+complex functions in a graph with the @ref{label} and `set @{x/y@}label`
+commands.  For instance,
+
+@example
+      set ylab '@@space 0 int from 0 to x alpha ( t ) roman d t@@'
+
+@end example
+
+will label the y axis with a nice integral if formatted with the command:
+
+@example
+      gpic filename.pic | geqn -d@@@@ -Tps | groff -m[macro-package] -Tps
+          > filename.ps
+
+@end example
+
+Figures made this way can be scaled to fit into a document.  The pic language
+is easy to understand, so the graphs can be edited by hand if need be.  All
+co-ordinates in the pic-file produced by `gnuplot` are given as x+gnuplotx
+and y+gnuploty.  By default x and y are given the value 0.  If this line is
+removed with an editor in a number of files, one can put several graphs in
+one figure like this (default size is 5.0x3.0 inches):
+
+@example
+      .PS 8.0
+      x=0;y=3
+      copy "figa.pic"
+      x=5;y=3
+      copy "figb.pic"
+      x=0;y=0
+      copy "figc.pic"
+      x=5;y=0
+      copy "figd.pic"
+      .PE
+
+@end example
+
+This will produce an 8-inch-wide figure with four graphs in two rows on top
+of each other.
+
+One can also achieve the same thing by the command
+
+@example
+      set terminal gpic x y
+
+@end example
+
+for example, using
+
+@example
+      .PS 6.0
+      copy "trig.pic"
+      .PE"
+
+@end example
+
+@node hp2623a, hp2648, gpic, terminal
+@subsubsection hp2623a
+
+@c ?commands set terminal hp2623a
+@c ?set terminal hp2623a
+@c ?set term hp2623a
+@c ?terminal hp2623a
+@c ?term hp2623a
+@cindex hp2623a
+@tmindex hp2623a
+
+
+The `hp2623a` terminal driver supports the Hewlett Packard HP2623A.  It has
+no options."
+
+@node hp2648, hp500c, hp2623a, terminal
+@subsubsection hp2648
+
+@c ?commands set terminal hp2648
+@c ?set terminal hp2648
+@c ?set term hp2648
+@c ?terminal hp2648
+@c ?term hp2648
+@cindex hp2648
+@tmindex hp2648
+
+
+The `hp2648` terminal driver supports the Hewlett Packard HP2647 and HP2648.
+It has no options."
+
+@node hp500c, hpgl, hp2648, terminal
+@subsubsection hp500c
+
+@c ?commands set terminal hp500c
+@c ?set terminal hp500c
+@c ?set term hp500c
+@c ?terminal hp500c
+@c ?term hp500c
+@cindex hp500c
+@tmindex hp500c
+
+
+The `hp500c` terminal driver supports the Hewlett Packard HP DeskJet 500c.
+It has options for resolution and compression.
+
+Syntax:
+@example
+      set terminal hp500c @{<res>@} @{<comp>@}
+
+@end example
+
+where `res` can be 75, 100, 150 or 300 dots per inch and `comp` can be "rle",
+or "tiff".  Any other inputs are replaced by the defaults, which are 75 dpi
+and no compression.  Rasterization at the higher resolutions may require a
+large amount of memory."
+
+@node hpgl, hpljii, hp500c, terminal
+@subsubsection hpgl
+
+@c ?commands set terminal hpgl
+@c ?set terminal hpgl
+@c ?set term hpgl
+@c ?terminal hpgl
+@c ?term hpgl
+@cindex hpgl
+@tmindex hpgl
+
+
+@c ?commands set terminal pcl5
+@c ?set terminal pcl5
+@c ?set term pcl5
+@c ?terminal pcl5
+@c ?term pcl5
+@cindex pcl5
+@tmindex pcl5
+
+
+The `hpgl` driver produces HPGL output for devices like the HP7475A plotter.
+There are two options which can be set---the number of pens and "eject", which
+tells the plotter to eject a page when done.  The default is to use 6 pens
+and not to eject the page when done.
+
+The international character sets ISO-8859-1 and CP850 are recognized via
+`set encoding iso_8859_1` or `set encoding cp850` (see @ref{encoding} for
+details).
+
+Syntax:
+@example
+      set terminal hpgl @{<number_of_pens>@} @{eject@}
+
+@end example
+
+The selection
+
+@example
+      set terminal hpgl 8 eject
+
+@end example
+
+is equivalent to the previous `hp7550` terminal, and the selection
+
+@example
+      set terminal hpgl 4
+
+@end example
+
+is equivalent to the previous `hp7580b` terminal.
+
+The `pcl5` driver supports the Hewlett-Packard Laserjet III.  It actually uses
+HPGL-2, but there is a name conflict among the terminal devices.  It has
+several options
+
+Syntax:
+@example
+      set terminal pcl5 @{<mode>@} @{<font>@} @{<fontsize>@}
+
+@end example
+
+where <mode> is `landscape`, or `portrait`, <font> is `stick`, `univers`, or
+`cg_times`, and <fontsize> is the size in points.
+
+With `pcl5` international characters are handled by the printer; you just put
+the appropriate 8-bit character codes into the text strings.  You don't need
+to bother with @ref{encoding}.
+
+HPGL graphics can be imported by many software packages."
+
+@node hpljii, hppj, hpgl, terminal
+@subsubsection hpljii
+
+@c ?commands set terminal hpljii
+@c ?set terminal hpljii
+@c ?set term hpljii
+@c ?terminal hpljii
+@c ?term hpljii
+@cindex hpljii
+@tmindex hpljii
+
+
+@c ?commands set terminal hpdj
+@c ?set terminal hpdj
+@c ?set term hpdj
+@c ?terminal hpdj
+@c ?term hpdj
+@cindex hpdj
+@tmindex hpdj
+
+
+The `hpljii` terminal driver supports the HP Laserjet Series II printer.  The
+`hpdj` driver supports the HP DeskJet 500 printer.  These drivers allow a
+choice of resolutions.
+
+Syntax:
+@example
+      set terminal hpljii | hpdj @{<res>@}
+
+@end example
+
+where `res` may be 75, 100, 150 or 300 dots per inch; the default is 75.
+Rasterization at the higher resolutions may require a large amount of memory.
+
+The `hp500c` terminal is similar to `hpdj`; `hp500c` additionally supports
+color and compression."
+
+@node hppj, imagen, hpljii, terminal
+@subsubsection hppj
+
+@c ?commands set terminal hppj
+@c ?set terminal hppj
+@c ?set term hppj
+@c ?terminal hppj
+@c ?term hppj
+@cindex hppj
+@tmindex hppj
+
+
+The `hppj` terminal driver supports the HP PaintJet and HP3630 printers.  The
+only option is the choice of font.
+
+Syntax:
+@example
+      set terminal hppj @{FNT5X9 | FNT9X17 | FNT13X25@}
+
+@end example
+
+with the middle-sized font (FNT9X17) being the default."
+
+@node imagen, latex, hppj, terminal
+@subsubsection imagen
+
+@c ?commands set terminal imagen
+@c ?set terminal imagen
+@c ?set term imagen
+@c ?terminal imagen
+@c ?term imagen
+@cindex imagen
+@tmindex imagen
+
+
+The `imagen` terminal driver supports Imagen laser printers.  It is capable
+of placing multiple graphs on a single page.
+
+Syntax:
+@example
+      set terminal imagen @{<fontsize>@} @{portrait | landscape@}
+                          @{[<horiz>,<vert>]@}
+
+@end example
+
+where `fontsize` defaults to 12 points and the layout defaults to `landscape`.
+`<horiz>` and `<vert>` are the number of graphs in the horizontal and
+vertical directions; these default to unity.
+
+Example:
+@example
+      set terminal imagen portrait [2,3]
+
+@end example
+
+puts six graphs on the page in three rows of two in portrait orientation."
+
+@node latex, mf, imagen, terminal
+@subsubsection latex
+
+@c ?commands set terminal emtex
+@c ?set terminal emtex
+@c ?set term emtex
+@c ?terminal emtex
+@c ?term emtex
+@cindex latex
+@tmindex latex
+
+
+@c ?commands set terminal latex
+@c ?set terminal latex
+@c ?set term latex
+@c ?terminal latex
+@c ?term latex
+@cindex emtex
+@tmindex emtex
+
+
+The `latex` and `emtex` drivers allow two options.
+
+Syntax:
+@example
+      set terminal latex | emtex @{courier | roman | default@} @{<fontsize>@}
+
+@end example
+
+`fontsize` may be any size you specify.  The default is for the plot to
+inherit its font setting from the embedding document.
+
+Unless your driver is capable of building fonts at any size (e.g. dvips),
+stick to the standard 10, 11 and 12 point sizes.
+
+METAFONT users beware: METAFONT does not like odd sizes.
+
+All drivers for LaTeX offer a special way of controlling text positioning:
+If any text string begins with '@{', you also need to include a '@}' at the
+end of the text, and the whole text will be centered both horizontally and
+vertically.  If the text string begins with '[', you need to follow this with
+a position specification (up to two out of t,b,l,r), ']@{', the text itself,
+and finally '@}'.  The text itself may be anything LaTeX can typeset as an
+LR-box.  '\\rule@{@}@{@}'s may help for best positioning.
+
+Points, among other things, are drawn using the LaTeX commands "\\Diamond" and
+"\\Box".  These commands no longer belong to the LaTeX2e core; they are included
+in the latexsym package, which is part of the base distribution and thus part
+of any LaTeX implementation.  Please do not forget to use this package.
+
+Points are drawn with the LaTex commands \\Diamond and \\Box.  These
+commands do no longer belong to the LaTeX2e core, but are included in the
+latexsym-package in the base distribution, and are hence part of all LaTeX
+implementations. Please do not forget to use this package.
+
+Examples:
+About label positioning:
+Use gnuplot defaults (mostly sensible, but sometimes not really best):
+@example
+       set title '\\LaTeX\\ -- $ \\gamma $'
+@end example
+
+Force centering both horizontally and vertically:
+@example
+       set label '@{\\LaTeX\\ -- $ \\gamma $@}' at 0,0
+@end example
+
+Specify own positioning (top here):
+@example
+       set xlabel '[t]@{\\LaTeX\\ -- $ \\gamma $@}'
+@end example
+
+The other label -- account for long ticlabels:
+@example
+       set ylabel '[r]@{\\LaTeX\\ -- $ \\gamma $\\rule@{7mm@}@{0pt@}'"
+
+@end example
+
+@node mf, mif, latex, terminal
+@subsubsection mf
+
+@c ?commands set terminal mf
+@c ?set terminal mf
+@c ?set term mf
+@c ?terminal mf
+@c ?term mf
+@cindex mf
+
+@cindex metafont
+
+The `mf` terminal driver creates a input file to the METAFONT program.  Thus a
+figure may be used in the TeX document in the same way as is a character.
+
+To use a picture in a document, the METAFONT program must be run with the
+output file from `gnuplot` as input.  Thus, the user needs a basic knowledge
+of the font creating process and the procedure for including a new font in a
+document.  However, if the METAFONT program is set up properly at the local
+site, an unexperienced user could perform the operation without much trouble.
+
+The text support is based on a METAFONT character set.  Currently the
+Computer Modern Roman font set is input, but the user is in principal free to
+chose whatever fonts he or she needs.  The METAFONT source files for the
+chosen font must be available.  Each character is stored in a separate
+picture variable in METAFONT.  These variables may be manipulated (rotated,
+scaled etc.) when characters are needed.  The drawback is the interpretation
+time in the METAFONT program.  On some machines (i.e. PC) the limited amount
+of memory available may also cause problems if too many pictures are stored.
+
+The `mf` terminal has no options.
+
+
+@noindent --- METAFONT INSTRUCTIONS ---
+
+@c ?commands set terminal mf detailed
+@c ?set terminal mf detailed
+@c ?set term mf detailed
+@c ?mf detailed
+@c ?metafont detailed
+
+- Set your terminal to METAFONT:
+@example
+  set terminal mf
+@end example
+
+- Select an output-file, e.g.:
+@example
+  set output "myfigures.mf"
+@end example
+
+- Create your pictures. Each picture will generate a separate character. Its
+default size will be 5*3 inches. You can change the size by saying `set size
+0.5,0.5` or whatever fraction of the default size you want to have.
+
+- Quit `gnuplot`.
+
+- Generate a TFM and GF file by running METAFONT on the output of `gnuplot`.
+Since the picture is quite large (5*3 in), you will have to use a version of
+METAFONT that has a value of at least 150000 for memmax.  On Unix systems
+these are conventionally installed under the name bigmf.  For the following
+assume that the command virmf stands for a big version of METAFONT.  For
+example:
+
+- Invoke METAFONT:
+@example
+    virmf '&plain'
+@end example
+
+- Select the output device: At the METAFONT prompt ('*') type:
+@example
+    \\mode:=CanonCX;     % or whatever printer you use
+@end example
+
+- Optionally select a magnification:
+@example
+    mag:=1;             % or whatever you wish
+@end example
+
+- Input the `gnuplot`-file:
+@example
+    input myfigures.mf
+@end example
+
+On a typical Unix machine there will usually be a script called "mf" that
+executes virmf '&plain', so you probably can substitute mf for virmf &plain.
+This will generate two files: mfput.tfm and mfput.$$$gf (where $$$ indicates
+the resolution of your device).  The above can be conveniently achieved by
+typing everything on the command line, e.g.:
+virmf '&plain' '\\mode:=CanonCX; mag:=1; input myfigures.mf'
+In this case the output files will be named myfigures.tfm and
+myfigures.300gf.
+
+- Generate a PK file from the GF file using gftopk:
+@example
+  gftopk myfigures.300gf myfigures.300pk
+@end example
+
+The name of the output file for gftopk depends on the DVI driver you use.
+Ask your local TeX administrator about the naming conventions.  Next, either
+install the TFM and PK files in the appropriate directories, or set your
+environment variables properly.  Usually this involves setting TEXFONTS to
+include the current directory and doing the same thing for the environment
+variable that your DVI driver uses (no standard name here...).  This step is
+necessary so that TeX will find the font metric file and your DVI driver will
+find the PK file.
+
+- To include your pictures in your document you have to tell TeX the font:
+@example
+  \\font\\gnufigs=myfigures
+@end example
+
+Each picture you made is stored in a single character.  The first picture is
+character 0, the second is character 1, and so on...  After doing the above
+step, you can use the pictures just like any other characters.  Therefore, to
+place pictures 1 and 2 centered in your document, all you have to do is:
+@example
+  \\centerline@{\\gnufigs\\char0@}
+  \\centerline@{\\gnufigs\\char1@}
+@end example
+
+in plain TeX.  For LaTeX you can, of course, use the picture environment and
+place the picture wherever you wish by using the \\makebox and \\put macros.
+
+This conversion saves you a lot of time once you have generated the font;
+TeX handles the pictures as characters and uses minimal time to place them,
+and the documents you make change more often than the pictures do.  It also
+saves a lot of TeX memory.  One last advantage of using the METAFONT driver
+is that the DVI file really remains device independent, because no \\special
+commands are used as in the eepic and tpic drivers."
+
+@node mif, pbm, mf, terminal
+@subsubsection mif
+
+@c ?commands set terminal mif
+@c ?set terminal mif
+@c ?set term mif
+@c ?terminal mif
+@c ?term mif
+@cindex mif
+@tmindex mif
+
+
+The `mif` terminal driver produces Frame Maker MIF format version 3.00.  It
+plots in MIF Frames with the size 15*10 cm, and plot primitives with the same
+pen will be grouped in the same MIF group.  Plot primitives in a `gnuplot`
+page will be plotted in a MIF Frame, and several MIF Frames are collected in
+one large MIF Frame.  The MIF font used for text is "Times".
+
+Several options may be set in the MIF 3.00 driver.
+
+Syntax:
+@example
+      set terminal mif @{colour | monochrome@} @{polyline | vectors@}
+                       @{help | ?@}
+
+@end example
+
+`colour` plots lines with line types >= 0 in colour (MIF sep. 2--7) and
+`monochrome` plots all line types in black (MIF sep. 0).
+`polyline` plots curves as continuous curves and `vectors` plots curves as
+collections of vectors.
+@ref{help} and `?` print online help on standard error output---both print a
+short description of the usage; @ref{help} also lists the options;
+
+Examples:
+@example
+      set term mif colour polylines    # defaults
+      set term mif                     # defaults
+      set term mif vectors
+      set term mif help"
+
+@end example
+
+@node pbm, png, mif, terminal
+@subsubsection pbm
+
+@c ?commands set terminal pbm
+@c ?set terminal pbm
+@c ?set term pbm
+@c ?terminal pbm
+@c ?term pbm
+@cindex pbm
+@tmindex pbm
+
+
+Several options may be set in the `pbm` terminal---the driver for PBMplus.
+
+Syntax:
+@example
+      set terminal pbm @{<fontsize>@} @{<mode>@}
+
+@end example
+
+where <fontsize> is `small`, `medium`, or `large` and <mode> is `monochrome`,
+`gray` or `color`.  The default plot size is 640 pixels wide and 480 pixels
+high; this may be changed by @ref{size}.
+
+The output of the `pbm` driver depends upon <mode>: `monochrome` produces a
+portable bitmap (one bit per pixel), `gray` a portable graymap (three bits
+per pixel) and `color` a portable pixmap (color, four bits per pixel).
+
+The output of this driver can be used with Jef Poskanzer's excellent PBMPLUS
+package, which provides programs to convert the above PBMPLUS formats to GIF,
+TIFF, MacPaint, Macintosh PICT, PCX, X11 bitmap and many others.  PBMPLUS may
+be obtained from ftp.x.org.  The relevant files have names that begin with
+"netpbm-1mar1994.p1"; they reside in /contrib/utilities.  The package can
+probably also be obtained from one of the many sites that mirrors ftp.x.org.
+
+Examples:
+@example
+      set terminal pbm small monochrome             # defaults
+      set size 2,2; set terminal pbm color medium"
+
+@end example
+
+@node png, postscript, pbm, terminal
+@subsubsection png
+
+@c ?commands set terminal png
+@c ?set terminal png
+@c ?set term png
+@c ?terminal png
+@c ?term png
+@cindex png
+@tmindex png
+
+
+The `png` terminal driver supports Portable Network Graphics.  To compile it,
+you will need  the third-party libraries "libpng" and "zlib"; both are
+available at ftp://ftp.uu.net/graphics/png.  `png` has two options.
+
+Syntax:
+@example
+      set terminal png @{small | medium | large@}
+                       @{monochrome | gray | color@}
+
+@end example
+
+The defaults are small (fontsize) and monochrome.  Default size of the output
+is 640*480 pixel."
+
+@node postscript, pslatex_and_pstex, png, terminal
+@subsubsection postscript
+
+@c ?commands set terminal postscript
+@c ?set terminal postscript
+@c ?set term postscript
+@c ?terminal postscript
+@c ?term postscript
+@cindex postscript
+@tmindex postscript
+
+
+Several options may be set in the `postscript` driver.
+
+Syntax:
+@example
+      set terminal postscript @{<mode>@} @{enhanced | noenhanced@}
+                              @{color | monochrome@} @{solid | dashed@}
+                              @{<duplexing>@}
+                              @{"<fontname>"@} @{<fontsize>@}
+
+@end example
+
+where <mode> is `landscape`, `portrait`, `eps` or `default`;
+`solid` draws all plots with solid lines, overriding any dashed patterns;
+<duplexing> is `defaultplex`, `simplex` or `duplex` ("duplexing" in
+PostScript is the ability of the printer to print on both sides of the same
+page---don't set this if your printer can't do it);
+`enhanced` activates the "enhanced PostScript" features (subscripts,
+superscripts and mixed fonts);
+`"<fontname>"` is the name of a valid PostScript font; and `<fontsize>` is
+the size of the font in PostScript points.
+
+`default` mode sets all options to their defaults: `landscape`, `monochrome`,
+`dashed`, `defaultplex`, `noenhanced`, "Helvetica" and 14pt.
+@example
+ Default size of a PostScript plot is 10 inches wide and 7 inches high.
+
+@end example
+
+`eps` mode generates EPS (Encapsulated PostScript) output, which is just
+regular PostScript with some additional lines that allow the file to be
+imported into a variety of other applications.  (The added lines are
+PostScript comment lines, so the file may still be printed by itself.)  To
+get EPS output, use the `eps` mode and make only one plot per file.  In `eps`
+mode the whole plot, including the fonts, is reduced to half of the default
+size.
+
+Examples:
+@example
+      set terminal postscript default       # old postscript
+      set terminal postscript enhanced      # old enhpost
+      set terminal postscript landscape 22  # old psbig
+      set terminal postscript eps 14        # old epsf1
+      set terminal postscript eps 22        # old epsf2
+      set size 0.7,1.4; set term post portrait color "Times-Roman" 14
+
+@end example
+
+Linewidths and pointsizes may be changed with @ref{linestyle}.
+
+The `postscript` driver supports about 70 distinct pointtypes, selectable
+through the `pointtype` option on @ref{plot} and @ref{linestyle}.
+
+Several possibly useful files about `gnuplot`'s PostScript are included
+in the /docs/ps subdirectory of the `gnuplot` distribution and at the
+distribution sites.  These are "ps_symbols.gpi" (a `gnuplot` command file
+that, when executed, creates the file "ps_symbols.ps" which shows all the
+symbols available through the `postscript` terminal), "ps_guide.ps" (a
+PostScript file that contains a summary of the enhanced syntax and a page
+showing what the octal codes produce with text and symbol fonts) and
+"ps_file.doc" (a text file that contains a discussion of the organization
+of a PostScript file written by `gnuplot`).
+
+A PostScript file is editable, so once `gnuplot` has created one, you are
+free to modify it to your heart's desire.  See the "editing postscript"
+section for some hints.
+
+
+@noindent --- ENHANCED POSTSCRIPT ---
+
+@c ?commands set terminal postscript enhanced
+@c ?set terminal postscript enhanced
+@c ?set term postscript enhanced
+@c ?terminal postscript enhanced
+@c ?term postscript enhanced
+@cindex enhanced_postscript
+
+
+@example
+ Control      Examples        Explanation
+  ^           a^x             superscript
+  _           a_x             subscript
+  @@           @@x or a@@^b_c    phantom box (occupies no width)
+  &           &@{space@}        inserts space of specified length
+
+@end example
+
+
+Braces can be used to place multiple-character text where a single character
+is expected (e.g., 2^@{10@}).  To change the font and/or size, use the full
+form:  @{/[fontname][=fontsize | *fontscale] text@}.  Thus @{/Symbol=20 G@} is a
+20-point GAMMA) and @{/*0.75 K@} is a K at three-quarters of whatever fontsize
+is currently in effect.  (The '/' character MUST be the first character after
+the '@{'.)
+
+If the encoding vector has been changed by @ref{encoding}, the default
+encoding vector can be used instead by following the slash with a dash.  This
+is unnecessary if you use the Symbol font, however---since /Symbol uses its
+own encoding vector, `gnuplot` will not apply any other encoding vector to
+it.
+
+The phantom box is useful for a@@^b_c to align superscripts and subscripts
+but does not work well for overwriting an accent on a letter.  (To do the
+latter, it is much better to use `set encoding iso_8859_1` to change to the
+ISO Latin-1 encoding vector, which contains a large variety of letters with
+accents or other diacritical marks.)  Since the box is non-spacing, it is
+sensible to put the shorter of the subscript or superscript in the box (that
+is, after the @@).
+
+Space equal in length to a string can be inserted using the '&' character.
+Thus
+@example
+        'abc&@{def@}ghi'
+@end example
+
+would produce
+@example
+        'abc   ghi'.
+
+@end example
+
+You can access special symbols numerically by specifying \\character-code (in
+octal), e.g., @{/Symbol \\245@} is the symbol for infinity.
+
+You can escape control characters using \\, e.g.,  \\\\, \\@{, and so on.
+
+But be aware that strings in double-quotes are parsed differently than those
+enclosed in single-quotes.  The major difference is that backslashes may need
+to be doubled when in double-quoted strings.
+
+Examples (these are hard to describe in words---try them!):
+@example
+      set xlabel 'Time (10^6 @{/Symbol m@}s)'
+      set title '@{/Symbol=18 \\362@@_@{/=9.6 0@}^@{/=12 x@}@} \\
+                 @{/Helvetica e^@{-@{/Symbol m@}^2/2@} d@}@{/Symbol m@}'
+
+@end example
+
+The file "ps_guide.ps" in the /docs/ps subdirectory of the `gnuplot` source
+distribution contains more examples of the enhanced syntax.
+
+
+@noindent --- EDITING POSTSCRIPT ---
+
+@c ?commands set terminal postscript editing
+@c ?set terminal postscript editing
+@c ?set term postscript editing
+@c ?terminal postscript editing
+@c ?term postscript editing
+@cindex editing_postscript
+
+The PostScript language is a very complex language---far too complex to
+describe in any detail in this document.  Nevertheless there are some things
+in a PostScript file written by `gnuplot` that can be changed without risk of
+introducing fatal errors into the file.
+
+For example, the PostScript statement "/Color true def" (written into the
+file in response to the command `set terminal postscript color`), may be
+altered in an obvious way to generate a black-and-white version of a plot.
+Similarly line colors, text colors, line weights and symbol sizes can also be
+altered in straight-forward ways.  Text (titles and labels) can be edited to
+correct misspellings or to change fonts.  Anything can be repositioned, and
+of course anything can be added or deleted, but modifications such as these
+may require deeper knowledge of the PostScript language.
+
+The organization of a PostScript file written by `gnuplot` is discussed in
+the text file "ps_file.doc" in the /docs/ps subdirectory."
+
+@node pslatex_and_pstex, pstricks, postscript, terminal
+@subsubsection pslatex and pstex
+
+@c ?commands set terminal pslatex
+@c ?set terminal pslatex
+@c ?set term pslatex
+@c ?terminal pslatex
+@c ?term pslatex
+@cindex pslatex
+@tmindex pslatex
+
+
+@c ?commands set terminal pstex
+@c ?set terminal pstex
+@c ?set term pstex
+@c ?terminal pstex
+@c ?term pstex
+@cindex pstex
+@tmindex pstex
+
+
+The `pslatex` and `pstex` drivers generate output for further processing by
+LaTeX and TeX, respectively.  Figures generated by `pstex` can be included
+in any plain-based format (including LaTeX).
+
+Syntax:
+@example
+      set terminal pslatex | |pstex @{<color>@} @{<dashed>@} @{<rotate>@}
+                                    @{auxfile@} @{<font_size>@}
+
+@end example
+
+<color> is either `color` or `monochrome`.  <rotate> is either `rotate` or
+`norotate` and determines if the y-axis label is rotated.  <font_size> is
+used to scale the font from its usual size.
+
+If `auxfile` is specified, it directs the driver to put the PostScript
+commands into an auxiliary file instead of directly into the LaTeX file.
+This is useful if your pictures are large enough that dvips cannot handle
+them.  The name of the auxiliary PostScript file is derived from the name of
+the TeX file given on the @ref{output} command; it is determined by replacing
+the trailing `.tex` (actually just the final extent in the file name) with
+`.ps` in the output file name, or, if the TeX file has no extension, `.ps`
+is appended.  Remember to close the file before leaving `gnuplot`.
+
+All drivers for LaTeX offer a special way of controlling text positioning:
+If any text string begins with '@{', you also need to include a '@}' at the
+end of the text, and the whole text will be centered both horizontally
+and vertically by LaTeX. --- If the text string begins with '[', you need
+to continue it with: a position specification (up to two out of t,b,l,r),
+']@{', the text itself, and finally, '@}'. The text itself may be anything
+LaTeX can typeset as an LR-box. \\rule@{@}@{@}'s may help for best positioning.
+
+Examples:
+@example
+      set term pslatex monochrome dashed rotate       # set to defaults
+@end example
+
+To write the PostScript commands into the file "foo.ps":
+@example
+      set term pslatex auxfile
+      set output "foo.tex"; plot ...: set output
+@end example
+
+About label positioning:
+Use gnuplot defaults (mostly sensible, but sometimes not really best):
+@example
+       set title '\\LaTeX\\ -- $ \\gamma $'
+@end example
+
+Force centering both horizontally and vertically:
+@example
+       set label '@{\\LaTeX\\ -- $ \\gamma $@}' at 0,0
+@end example
+
+Specify own positioning (top here):
+@example
+       set xlabel '[t]@{\\LaTeX\\ -- $ \\gamma $@}'
+@end example
+
+The other label -- account for long ticlabels:
+@example
+       set ylabel '[r]@{\\LaTeX\\ -- $ \\gamma $\\rule@{7mm@}@{0pt@}'
+
+@end example
+
+Linewidths and pointsizes may be changed with @ref{linestyle}."
+
+@node pstricks, qms, pslatex_and_pstex, terminal
+@subsubsection pstricks
+
+@c ?commands set terminal pstricks
+@c ?set terminal pstricks
+@c ?set term pstricks
+@c ?terminal pstricks
+@c ?term pstricks
+@cindex pstricks
+@tmindex pstricks
+
+
+The `pstricks` driver is intended for use with the "pstricks.sty" macro
+package for LaTeX.  It is an alternative to the `eepic` and `latex` drivers.
+You need "pstricks.sty", and, of course, a printer that understands
+PostScript, or a converter such as Ghostscript.
+
+PSTricks is available via anonymous ftp from the /pub directory at
+Princeton.EDU.  This driver definitely does not come close to using the full
+capability of the PSTricks package.
+
+Syntax:
+@example
+      set terminal pstricks @{hacktext | nohacktext@} @{unit | nounit@}
+
+@end example
+
+The first option invokes an ugly hack that gives nicer numbers; the second
+has to do with plot scaling.  The defaults are `hacktext` and `nounit`."
+
+@node qms, regis, pstricks, terminal
+@subsubsection qms
+
+@c ?commands set terminal qms
+@c ?set terminal qms
+@c ?set term qms
+@c ?terminal qms
+@c ?term qms
+@cindex qms
+@tmindex qms
+
+
+The `qms` terminal driver supports the QMS/QUIC Laser printer, the Talaris
+1200 and others.  It has no options."
+
+@node regis, sun, qms, terminal
+@subsubsection regis
+
+@c ?commands set terminal regis
+@c ?set terminal regis
+@c ?set term regis
+@c ?terminal regis
+@c ?term regis
+@cindex regis
+@tmindex regis
+
+
+The `regis` terminal device generates output in the REGIS graphics language.
+It has the option of using 4 (the default) or 16 colors.
+
+Syntax:
+@example
+      set terminal regis @{4 | 16@}"
+
+@end example
+
+@node sun, tek410x, regis, terminal
+@subsubsection sun
+
+@c ?commands set terminal sun
+@c ?set terminal sun
+@c ?set term sun
+@c ?terminal sun
+@c ?term sun
+@cindex sun
+@tmindex sun
+
+
+The `sun` terminal driver supports the SunView window system.  It has no
+options."
+
+@node tek410x, table, sun, terminal
+@subsubsection tek410x
+
+@c ?commands set terminal tek410x
+@c ?set terminal tek410x
+@c ?set term tek410x
+@c ?terminal tek410x
+@c ?term tek410x
+@cindex tek410x
+@tmindex tek410x
+
+
+The `tek410x` terminal driver supports the 410x and 420x family of Tektronix
+terminals.  It has no options."
+
+@node table, tek40, tek410x, terminal
+@subsubsection table
+
+@c ?commands set terminal table
+@c ?set terminal table
+@c ?set term table
+@c ?terminal table
+@c ?term table
+@cindex table
+@tmindex table
+
+
+Instead of producing a graph, the `table` terminal prints out the points on
+which a graph would be based, i.e., the results of processing the @ref{plot} or
+`splot` command, in a multicolumn ASCII table of X Y @{Z@} R values.  The
+character R takes on one of three values: "i" if the point is in the active
+range, "o" if it is out-of-range, or "u" if it is undefined.  The data
+format is determined by the format of the axis labels (see `set format`).
+
+For those times when you want the numbers, you can display them on the
+screen or save them to a file.  This can be useful if you want to generate
+contours and then save them for further use, perhaps for plotting with
+@ref{plot};  see @ref{contour} for an example.  The same method can be used to
+save interpolated data (see @ref{samples} and @ref{dgrid3d})."
+
+@node tek40, texdraw, table, terminal
+@subsubsection tek40
+
+@c ?commands set terminal tek40xx
+@c ?set terminal tek40xx
+@c ?set term tek40xx
+@c ?terminal tek40xx
+@c ?terminal tek40xx
+@cindex tek40
+@tmindex tek40
+
+
+@c ?commands set terminal vttek
+@c ?set terminal vttek
+@c ?set term vttek
+@c ?terminal vttek
+@c ?term vttek
+@cindex vttek
+@tmindex vttek
+
+
+@c ?commands set terminal kc-tek40xx
+@c ?set terminal kc-tek40xx
+@c ?set term kc-tek40xx
+@c ?terminal kc-tek40xx
+@c ?term kc-tek40xx
+@cindex kc-tek40xx
+@tmindex kc-tek40xx
+
+
+@c ?commands set terminal km-tek40xx
+@c ?set terminal km-tek40xx
+@c ?set term km-tek40xx
+@c ?terminal km-tek40xx
+@c ?term km-tek40xx
+@cindex km-tek40xx
+@tmindex km-tek40xx
+
+
+@c ?commands set terminal selanar
+@c ?set terminal selanar
+@c ?set term selanar
+@c ?terminal selanar
+@c ?term selanar
+@cindex selanar
+@tmindex selanar
+
+
+@c ?commands set terminal bitgraph
+@c ?set terminal bitgraph
+@c ?set term bitgraph
+@c ?terminal bitgraph
+@c ?term bitgraph
+@cindex bitgraph
+@tmindex bitgraph
+
+
+This family of terminal drivers supports a variety of VT-like terminals.
+`tek40xx` supports Tektronix 4010 and others as well as most TEK emulators;
+`vttek` supports VT-like tek40xx terminal emulators; `kc-tek40xx` supports
+MS-DOS Kermit Tek4010 terminal emulators in color: `km-tek40xx` supports them
+in monochrome; `selanar` supports Selanar graphics; and `bitgraph` supports
+BBN Bitgraph terminals.  None have any options."
+
+@node texdraw, tgif, tek40, terminal
+@subsubsection texdraw
+
+@c ?commands set terminal texdraw
+@c ?set terminal texdraw
+@c ?set term texdraw
+@c ?terminal texdraw
+@c ?term texdraw
+@cindex texdraw
+@tmindex texdraw
+
+
+The `texdraw` terminal driver supports the LaTeX texdraw environment.  It is
+intended for use with "texdraw.sty" and "texdraw.tex" in the texdraw package.
+
+It has no options."
+
+@node tgif, tkcanvas, texdraw, terminal
+@subsubsection tgif
+
+@c ?commands set terminal tgif
+@c ?set terminal tgif
+@c ?set term tgif
+@c ?terminal tgif
+@c ?term tgif
+@cindex tgif
+@tmindex tgif
+
+
+Tgif is an X11-based drawing tool---it has nothing to do with GIF.
+
+The `tgif` driver supports different pointsizes (with @ref{pointsize}),
+different label fonts and font sizes (e.g. `set label "Hallo" at x,y font
+"Helvetica,34"`) and multiple graphs on the page.  The proportions of the
+axes are not changed.
+
+Syntax:
+@example
+      set terminal tgif @{portrait | landscape@} @{<[x,y]>@}
+                        @{solid | dashed@}
+                        @{"<fontname>"@} @{<fontsize>@}
+
+@end example
+
+where <[x,y]> specifies the number of graphs in the x and y directions on the
+page, "<fontname>" is the name of a valid PostScript font, and <fontsize>
+specifies the size of the PostScript font.  Defaults are `portrait`, `[1,1]`,
+`dashed`, `"Helvetica"`, and `18`.
+
+The `solid` option is usually prefered if lines are colored, as they often
+are in the editor.  Hardcopy will be black-and-white, so `dashed` should be
+chosen for that.
+
+Multiplot is implemented in two different ways.
+
+The first multiplot implementation is the standard gnuplot multiplot feature:
+
+@example
+      set terminal tgif
+      set output "file.obj"
+      set multiplot
+      set origin x01,y01
+      set size  xs,ys
+      plot ...
+           ...
+      set origin x02,y02
+      plot ...
+      set nomultiplot
+
+@end example
+
+See @ref{multiplot} for further information.
+
+The second version is the [x,y] option for the driver itself.  The advantage
+of this implementation is that everything is scaled and placed automatically
+without the need for setting origins and sizes; the graphs keep their natural
+x/y proportions of 3/2 (or whatever is fixed by @ref{size}).
+
+If both multiplot methods are selected, the standard method is chosen and a
+warning message is given.
+
+Examples of single plots (or standard multiplot):
+@example
+      set terminal tgif                  # defaults
+      set terminal tgif "Times-Roman" 24
+      set terminal tgif landscape
+      set terminal tgif landscape solid
+
+@end example
+
+Examples using the built-in multiplot mechanism:
+@example
+      set terminal tgif portrait [2,4]  # portrait; 2 plots in the x-
+                                        # and 4 in the y-direction
+      set terminal tgif [1,2]           # portrait; 1 plot in the x-
+                                        # and 2 in the y-direction
+      set terminal tgif landscape [3,3] # landscape; 3 plots in both
+                                        # directions"
+
+@end example
+
+@node tkcanvas, tpic, tgif, terminal
+@subsubsection tkcanvas
+
+@c ?commands set terminal tkcanvas
+@c ?set terminal tkcanvas
+@c ?set term tkcanvas
+@c ?terminal tkcanvas
+@c ?term tkcanvas
+@cindex tkcanvas
+@tmindex tkcanvas
+
+
+This terminal driver generates Tk canvas widget commands based on Tcl/Tk
+(default) or Perl.  To use it, rebuild `gnuplot` (after uncommenting or
+inserting the appropriate line in "term.h"), then
+
+@example
+ gnuplot> set term tkcanvas @{perltk@} @{interactive@}
+ gnuplot> set output 'plot.file'
+
+@end example
+
+After invoking "wish", execute the following sequence of Tcl/Tk commands:
+
+@example
+ % source plot.file
+ % canvas .c
+ % pack .c
+ % gnuplot .c
+
+@end example
+
+Or, for Perl/Tk use a program like this:
+
+@example
+ use Tk;
+ my $top = MainWindow->new;
+ my $c = $top->Canvas;
+ $c->pack();
+ do "plot.pl";
+ gnuplot->($c);
+ MainLoop;
+
+@end example
+
+The code generated by `gnuplot` creates a procedure called "gnuplot"
+that takes the name of a canvas as its argument.  When the procedure is
+called, it clears the canvas, finds the size of the canvas and draws the plot
+in it, scaled to fit.
+
+For 2-dimensional plotting (@ref{plot}) two additional procedures are defined:
+"gnuplot_plotarea" will return a list containing the borders of the plotting
+area "xleft, xright, ytop, ybot" in canvas screen coordinates, while the ranges
+of the two axes "x1min, x1max, y1min, y1max, x2min, x2max, y2min, y2max" in plot
+coordinates can be obtained calling "gnuplot_axisranges".
+If the "interactive" option is specified, mouse clicking on a line segment
+will print the coordinates of its midpoint to stdout. Advanced actions
+can happen instead if the user supplies a procedure named
+"user_gnuplot_coordinates", which takes the following arguments:
+"win id x1s y1s x2s y2s x1e y1e x2e y2e x1m y1m x2m y2m",
+the name of the canvas and the id of the line segment followed by the
+coordinates of its start and end point in the two possible axis ranges; the
+coordinates of the midpoint are only filled for logarithmic axes.
+
+The current version of `tkcanvas` supports neither @ref{multiplot} nor @ref{replot}."
+
+@node tpic, x11, tkcanvas, terminal
+@subsubsection tpic
+
+@c ?commands set terminal tpic
+@c ?set terminal tpic
+@c ?set term tpic
+@c ?terminal tpic
+@c ?term tpic
+@cindex tpic
+@tmindex tpic
+
+
+The `tpic` terminal driver supports the LaTeX picture environment with tpic
+\\specials.  It is an alternative to the `latex` and `eepic` terminal drivers.
+Options are the point size, line width, and dot-dash interval.
+
+Syntax:
+@example
+      set terminal tpic <pointsize> <linewidth> <interval>
+
+@end example
+
+where @ref{pointsize} and `linewidth` are integers in milli-inches and `interval`
+is a float in inches.  If a non-positive value is specified, the default is
+chosen: pointsize = 40, linewidth = 6, interval = 0.1.
+
+All drivers for LaTeX offer a special way of controlling text positioning:
+If any text string begins with '@{', you also need to include a '@}' at the
+end of the text, and the whole text will be centered both horizontally
+and vertically by LaTeX. --- If the text string begins with '[', you need
+to continue it with: a position specification (up to two out of t,b,l,r),
+']@{', the text itself, and finally, '@}'. The text itself may be anything
+LaTeX can typeset as an LR-box. \\rule@{@}@{@}'s may help for best positioning.
+
+Examples:
+About label positioning:
+Use gnuplot defaults (mostly sensible, but sometimes not really best):
+@example
+       set title '\\LaTeX\\ -- $ \\gamma $'
+@end example
+
+Force centering both horizontally and vertically:
+@example
+       set label '@{\\LaTeX\\ -- $ \\gamma $@}' at 0,0
+@end example
+
+Specify own positioning (top here):
+@example
+       set xlabel '[t]@{\\LaTeX\\ -- $ \\gamma $@}'
+@end example
+
+The other label -- account for long ticlabels:
+@example
+       set ylabel '[r]@{\\LaTeX\\ -- $ \\gamma $\\rule@{7mm@}@{0pt@}'"
+
+@end example
+
+@node x11, xlib, tpic, terminal
+@subsubsection x11
+
+@c ?commands set terminal x11
+@c ?set terminal x11
+@c ?set term x11
+@c ?terminal x11
+@c ?term x11
+@cindex x11
+
+@cindex X11
+
+`gnuplot` provides the `x11` terminal type for use with X servers.  This
+terminal type is set automatically at startup if the `DISPLAY` environment
+variable is set, if the `TERM` environment variable is set to `xterm`, or
+if the `-display` command line option is used.
+
+Syntax:
+@example
+      set terminal x11 @{reset@} @{<n>@}
+
+@end example
+
+Multiple plot windows are supported: `set terminal x11 <n>` directs the
+output to plot window number n.  If n>0, the terminal number will be
+appended to the window title and the icon will be labeled `gplt <n>`.
+The active window may distinguished by a change in cursor (from default
+to crosshair.)
+
+Plot windows remain open even when the `gnuplot` driver is changed to a
+different device.  A plot window can be closed by pressing the letter q
+while that window has input focus, or by choosing `close` from a window
+manager menu.  All plot windows can be closed by specifying @ref{reset}, which
+actually terminates the subprocess which maintains the windows (unless
+`-persist` was specified).
+
+Plot windows will automatically be closed at the end of the session
+unless the `-persist` option was given.
+
+The size or aspect ratio of a plot may be changed by resizing the `gnuplot`
+window.
+
+Linewidths and pointsizes may be changed from within `gnuplot` with
+@ref{linestyle}.
+
+For terminal type `x11`, `gnuplot` accepts (when initialized) the standard
+X Toolkit options and resources such as geometry, font, and name from the
+command line arguments or a configuration file.  See the X(1) man page
+(or its equivalent) for a description of such options.
+
+A number of other `gnuplot` options are available for the `x11` terminal.
+These may be specified either as command-line options when `gnuplot` is
+invoked or as resources in the configuration file "/.Xdefaults".  They are
+set upon initialization and cannot be altered during a `gnuplot` session.
+
+
+@noindent --- COMMAND-LINE_OPTIONS ---
+
+@c ?commands set terminal x11 command-line-options
+@c ?set terminal x11 command-line-options
+@c ?set term x11 command-line-options
+@c ?x11 command-line-options
+@cindex command-line-options
+
+In addition to the X Toolkit options, the following options may be specified
+on the command line when starting `gnuplot` or as resources in your
+".Xdefaults" file:
+
+@example
+ `-clear`   requests that the window be cleared momentarily before a
+            new plot is displayed.
+ `-gray`    requests grayscale rendering on grayscale or color displays.
+            (Grayscale displays receive monochrome rendering by default.)
+ `-mono`    forces monochrome rendering on color displays.
+ `-persist` plot windows survive after main gnuplot program exits
+ `-raise`   raise plot window after each plot
+ `-noraise` do not raise plot window after each plot
+ `-tvtwm`   requests that geometry specifications for position of the
+            window be made relative to the currently displayed portion
+            of the virtual root.
+
+@end example
+
+The options are shown above in their command-line syntax.  When entered as
+resources in ".Xdefaults", they require a different syntax.
+
+Example:
+@example
+      gnuplot*gray: on
+
+@end example
+
+`gnuplot` also provides a command line option (`-pointsize <v>`) and a
+resource, `gnuplot*pointsize: <v>`, to control the size of points plotted
+with the `points` plotting style.  The value `v` is a real number (greater
+than 0 and less than or equal to ten) used as a scaling factor for point
+sizes.  For example, `-pointsize 2` uses points twice the default size, and
+`-pointsize 0.5` uses points half the normal size.
+
+
+@noindent --- MONOCHOME_OPTIONS ---
+
+@c ?commands set terminal x11 monochrome_options
+@c ?set terminal x11 monochrome_options
+@c ?set term x11 monochrome_options
+@c ?x11 monochrome_options
+@cindex monochrome_options
+
+For monochrome displays, `gnuplot` does not honor foreground or background
+colors.  The default is black-on-white.  `-rv` or `gnuplot*reverseVideo: on`
+requests white-on-black.
+
+
+
+@noindent --- COLOR_RESOURCES ---
+
+@c ?commands set terminal x11 color_resources
+@c ?set terminal x11 color_resources
+@c ?set term x11 color_resources
+@c ?x11 color_resources
+@cindex color_resources
+
+For color displays, `gnuplot` honors the following resources (shown here
+with their default values) or the greyscale resources.  The values may be
+color names as listed in the X11 rgb.txt file on your system, hexadecimal
+RGB color specifications (see X11 documentation), or a color name followed
+by a comma and an `intensity` value from 0 to 1.  For example, `blue, 0.5`
+means a half intensity blue.
+
+@example
+ gnuplot*background:  white
+ gnuplot*textColor:   black
+ gnuplot*borderColor: black
+ gnuplot*axisColor:   black
+ gnuplot*line1Color:  red
+ gnuplot*line2Color:  green
+ gnuplot*line3Color:  blue
+ gnuplot*line4Color:  magenta
+ gnuplot*line5Color:  cyan
+ gnuplot*line6Color:  sienna
+ gnuplot*line7Color:  orange
+ gnuplot*line8Color:  coral
+
+@end example
+
+
+The command-line syntax for these is, for example,
+
+Example:
+@example
+      gnuplot -background coral
+
+@end example
+
+
+
+@noindent --- GRAYSCALE_RESOURCES ---
+
+@c ?commands set terminal x11 grayscale_resources
+@c ?set terminal x11 grayscale_resources
+@c ?set term x11 grayscale_resources
+@c ?x11 grayscale_resources
+@cindex grayscale_resources
+
+When `-gray` is selected, `gnuplot` honors the following resources for
+grayscale or color displays (shown here with their default values).  Note
+that the default background is black.
+
+@example
+ gnuplot*background: black
+ gnuplot*textGray:   white
+ gnuplot*borderGray: gray50
+ gnuplot*axisGray:   gray50
+ gnuplot*line1Gray:  gray100
+ gnuplot*line2Gray:  gray60
+ gnuplot*line3Gray:  gray80
+ gnuplot*line4Gray:  gray40
+ gnuplot*line5Gray:  gray90
+ gnuplot*line6Gray:  gray50
+ gnuplot*line7Gray:  gray70
+ gnuplot*line8Gray:  gray30
+
+@end example
+
+
+
+
+@noindent --- LINE_RESOURCES ---
+
+@c ?commands set terminal x11 line_resources
+@c ?set terminal x11 line_resources
+@c ?set term x11 line_resources
+@c ?x11 line_resources
+@cindex line_resources
+
+`gnuplot` honors the following resources for setting the width (in pixels) of
+plot lines (shown here with their default values.)  0 or 1 means a minimal
+width line of 1 pixel width.  A value of 2 or 3 may improve the appearance of
+some plots.
+
+@example
+ gnuplot*borderWidth: 2
+ gnuplot*axisWidth:   0
+ gnuplot*line1Width:  0
+ gnuplot*line2Width:  0
+ gnuplot*line3Width:  0
+ gnuplot*line4Width:  0
+ gnuplot*line5Width:  0
+ gnuplot*line6Width:  0
+ gnuplot*line7Width:  0
+ gnuplot*line8Width:  0
+
+@end example
+
+
+`gnuplot` honors the following resources for setting the dash style used for
+plotting lines.  0 means a solid line.  A two-digit number `jk` (`j` and `k`
+are >= 1  and <= 9) means a dashed line with a repeated pattern of `j` pixels
+on followed by `k` pixels off.  For example, '16' is a "dotted" line with one
+pixel on followed by six pixels off.  More elaborate on/off patterns can be
+specified with a four-digit value.  For example, '4441' is four on, four off,
+four on, one off.  The default values shown below are for monochrome displays
+or monochrome rendering on color or grayscale displays.  For color displays,
+the default for each is 0 (solid line) except for `axisDashes` which defaults
+to a '16' dotted line.
+
+@example
+ gnuplot*borderDashes:   0
+ gnuplot*axisDashes:    16
+ gnuplot*line1Dashes:    0
+ gnuplot*line2Dashes:   42
+ gnuplot*line3Dashes:   13
+ gnuplot*line4Dashes:   44
+ gnuplot*line5Dashes:   15
+ gnuplot*line6Dashes: 4441
+ gnuplot*line7Dashes:   42
+ gnuplot*line8Dashes:   13
+
+@end example
+
+
+@node xlib,  , x11, terminal
+@subsubsection xlib
+
+@c ?commands set terminal xlib
+@c ?set terminal xlib
+@c ?set term xlib
+@c ?terminal xlib
+@c ?term xlib
+@cindex xlib
+@tmindex xlib
+
+
+The `xlib` terminal driver supports the X11 Windows System.  It generates
+gnulib_x11 commands.  `set term x11` behaves similarly to `set terminal xlib;
+set output "|gnuplot_x11"`.  `xlib` has no options, but see `x11`."
+
+@node tics, ticslevel, terminal, set-show
+@subsection tics
+
+@c ?commands set tics
+@c ?commands show tics
+@c ?set tics
+@c ?show tics
+@cindex tics
+@opindex tics
+
+
+The `set tics` command can be used to change the tics to be drawn outwards.
+
+Syntax:
+@example
+      set tics @{<direction>@}
+      show tics
+
+@end example
+
+where <direction> may be `in` (the default) or `out`.
+
+See also @ref{xtics} for more control of major (labelled) tic marks and @ref{mxtics} for control of minor tic marks.
+
+@node ticslevel, ticscale, tics, set-show
+@subsection ticslevel
+
+@c ?commands set ticslevel
+@c ?commands show ticslevel
+@c ?set ticslevel
+@c ?show ticslevel
+@cindex ticslevel
+@opindex ticslevel
+
+
+Using `splot`, one can adjust the relative height of the vertical (Z) axis
+using @ref{ticslevel}.  The numeric argument provided specifies the location
+of the bottom of the scale (as a fraction of the z-range) above the xy-plane.
+The default value is 0.5.  Negative values are permitted, but tic labels on
+the three axes may overlap.
+
+To place the xy-plane at a position 'pos' on the z-axis, @ref{ticslevel} should
+be set equal to  (pos - zmin) / (zmin - zmax).
+
+Syntax:
+@example
+      set ticslevel @{<level>@}
+      show tics
+
+@end example
+
+See also @ref{view}.
+
+@node ticscale, timestamp, ticslevel, set-show
+@subsection ticscale
+
+@c ?commands set ticscale
+@c ?commands show ticscale
+@c ?set ticscale
+@c ?show ticscale
+@cindex ticscale
+@opindex ticscale
+
+
+The size of the tic marks can be adjusted with @ref{ticscale}.
+
+Syntax:
+@example
+      set ticscale @{<major> @{<minor>@}@}
+      show tics
+
+@end example
+
+If <minor> is not specified, it is 0.5*<major>.  The default size is 1.0 for
+major tics and 0.5 for minor tics.  Note that it is possible to have the tic
+marks pointing outward by specifying a negative size.
+
+@node timestamp, timefmt, ticscale, set-show
+@subsection timestamp
+
+@c ?commands set timestamp
+@c ?commands set time
+@c ?commands set notimestamp
+@c ?commands show timestamp
+@c ?set timestamp
+@c ?set time
+@c ?set notimestamp
+@c ?show timestamp
+@cindex timestamp
+@opindex timestamp
+
+
+@cindex notimestamp
+
+The command @ref{timestamp} places the time and date of the plot in the left
+margin.
+
+Syntax:
+@example
+      set timestamp @{"<format>"@} @{top|bottom@} @{@{no@}rotate@}
+                    @{<xoff>@}@{,<yoff>@} @{"<font>"@}
+      set notimestamp
+      show timestamp
+
+@end example
+
+The format string allows you to choose the format used to write the date and
+time.  Its default value is what asctime() uses: "%a %b %d %H:%M:%S %Y"
+(weekday, month name, day of the month, hours, minutes, seconds, four-digit
+year).  With `top` or `bottom` you can place the timestamp at the top or
+bottom of the left margin (default: bottom).  `rotate` lets you write the
+timestamp vertically, if your terminal supports vertical text.  The constants
+<xoff> and <off> are offsets from the default position given in character
+screen coordinates.  <font> is used to specify the font with which the time
+is to be written.
+
+The abbreviation `time` may be used in place of @ref{timestamp}.
+
+Example:
+@example
+      set timestamp "%d/%m/%y %H:%M" 80,-2 "Helvetica"
+
+@end example
+
+See @ref{timefmt} for more information about time format strings.
+
+@node timefmt, title_, timestamp, set-show
+@subsection timefmt
+
+@c ?commands set timefmt
+@c ?commands show timefmt
+@c ?set timefmt
+@c ?show timefmt
+@cindex timefmt
+@opindex timefmt
+
+
+This command applies to timeseries where data are composed of dates/times.
+It has no meaning unless the command `set xdata time` is given also.
+
+Syntax:
+@example
+      set timefmt "<format string>"
+      show timefmt
+
+@end example
+
+The string argument tells `gnuplot` how to read timedata from the datafile.
+The valid formats are:
+
+
+@example
+      Format       Explanation
+      %d           day of the month, 1--31
+      %m           month of the year, 1--12
+      %y           year, 0--99
+      %Y           year, 4-digit
+      %j           day of the year, 1--365
+      %H           hour, 0--24
+      %M           minute, 0--60
+      %S           second, 0--60
+      %b           three-character abbreviation of the name of the month
+      %B           name of the month
+
+@end example
+
+Any character is allowed in the string, but must match exactly.  \t (tab) is
+recognized.  Backslash-octals (\nnn) are converted to char.  If there is no
+separating character between the time/date elements, then %d, %m, %y, %H, %M
+and %S read two digits each, %Y reads four digits and %j reads three digits.
+%b requires three characters, and %B requires as many as it needs.
+
+Spaces are treated slightly differently.  A space in the string stands for
+zero or more whitespace characters in the file.  That is, "%H %M" can be used
+to read "1220" and "12     20" as well as "12 20".
+
+Each set of non-blank characters in the timedata counts as one column in the
+`using n:n` specification.  Thus `11:11  25/12/76  21.0` consists of three
+columns.  To avoid confusion, `gnuplot` requires that you provide a complete
+@ref{using} specification if your file contains timedata.
+
+Since `gnuplot` cannot read non-numerical text, if the date format includes
+the day or month in words, the format string must exclude this text.  But
+it can still be printed with the "%a", "%A", "%b", or "%B" specifier: see
+`set format` for more details about these and other options for printing
+timedata.  (`gnuplot` will determine the proper month and weekday from the
+numerical values.)
+
+See also @ref{xdata} and `Time/date` for more information.
+
+Example:
+@example
+      set timefmt "%d/%m/%Y\t%H:%M"
+@end example
+
+tells `gnuplot` to read date and time separated by tab.  (But look closely at
+your data---what began as a tab may have been converted to spaces somewhere
+along the line; the format string must match what is actually in the file.)
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/timedat.html,Time Data Demo }
+
+@node title_, tmargin, timefmt, set-show
+@subsection title
+
+@c ?commands set title
+@c ?commands show title
+@c ?set title
+@c ?show title
+@cindex title
+@opindex title
+
+
+The `set title` command produces a plot title that is centered at the top of
+the plot.  `set title` is a special case of @ref{label}.
+
+Syntax:
+@example
+      set title @{"<title-text>"@} @{<xoff>@}@{,<yoff>@} @{"<font>,@{<size>@}"@}
+      show title
+
+@end example
+
+Specifying constants <xoff> or <yoff> as optional offsets for the title will
+move the title <xoff> or <yoff> character screen coordinates (not graph
+coordinates).  For example, "`set title ,-1`" will change only the y offset
+of the title, moving the title down by roughly the height of one character.
+
+<font> is used to specify the font with which the title is to be written;
+the units of the font <size> depend upon which terminal is used.
+
+`set title` with no parameters clears the title.
+
+See `syntax` for details about the processing of backslash sequences and
+the distinction between single- and double-quotes.
+
+@node tmargin, trange, title_, set-show
+@subsection tmargin
+
+@c ?commands set tmargin
+@c ?set tmargin
+@cindex tmargin
+@opindex tmargin
+
+
+The command @ref{tmargin} sets the size of the top margin.  Please see
+@ref{margin} for details.
+
+@node trange, urange, tmargin, set-show
+@subsection trange
+
+@c ?commands set trange
+@c ?commands show trange
+@c ?set trange
+@c ?show trange
+@cindex trange
+@opindex trange
+
+
+The @ref{trange} command sets the parametric range used to compute x and y
+values when in parametric or polar modes.  Please see @ref{xrange} for
+details.
+
+@node urange, variables, trange, set-show
+@subsection urange
+
+@c ?commands set urange
+@c ?commands show urange
+@c ?set urange
+@c ?show urange
+@cindex urange
+@opindex urange
+
+
+The @ref{urange} and @ref{vrange} commands set the parametric ranges used
+to compute x, y, and z values when in `splot` parametric mode.  Please see
+@ref{xrange} for details.
+
+@node variables, version, urange, set-show
+@subsection variables
+
+@c ?commands show variables
+@c ?show variables
+The @ref{variables} command lists all user-defined variables and their
+values.
+
+Syntax:
+@example
+      show variables
+
+@end example
+
+@node version, view, variables, set-show
+@subsection version
+
+@c ?show version
+The @ref{version} command lists the version of gnuplot being run, its last
+modification date, the copyright holders, and email addresses for the FAQ,
+the info-gnuplot mailing list, and reporting bugs--in short, the information
+listed on the screen when the program is invoked interactively.
+
+Syntax:
+@example
+      show version @{long@}
+
+@end example
+
+When the `long` option is given, it also lists the operating system, the
+compilation options used when `gnuplot` was installed, the location of the
+help file, and (again) the useful email addresses.
+
+@node view, vrange, version, set-show
+@subsection view
+
+@c ?commands set view
+@c ?commands show view
+@c ?set view
+@c ?show view
+@cindex view
+@opindex view
+
+
+The @ref{view} command sets the viewing angle for `splot`s.  It controls how
+the 3-d coordinates of the plot are mapped into the 2-d screen space.  It
+provides controls for both rotation and scaling of the plotted data, but
+supports orthographic projections only.
+
+Syntax:
+@example
+      set view <rot_x> @{,@{<rot_z>@}@{,@{<scale>@}@{,<scale_z>@}@}@}
+      show view
+
+@end example
+
+where <rot_x> and <rot_z> control the rotation angles (in degrees) in a
+virtual 3-d coordinate system aligned with the screen such that initially
+(that is, before the rotations are performed) the screen horizontal axis is
+x, screen vertical axis is y, and the axis perpendicular to the screen is z.
+The first rotation applied is <rot_x> around the x axis.  The second rotation
+applied is <rot_z> around the new z axis.
+
+<rot_x> is bounded to the [0:180] range with a default of 60 degrees, while
+<rot_z> is bounded to the [0:360] range with a default of 30 degrees.
+<scale> controls the scaling of the entire `splot`, while <scale_z> scales
+the z axis only.  Both scales default to 1.0.
+
+Examples:
+@example
+      set view 60, 30, 1, 1
+      set view ,,0.5
+
+@end example
+
+The first sets all the four default values.  The second changes only scale,
+to 0.5.
+
+See also @ref{ticslevel}.
+
+@node vrange, x2data, view, set-show
+@subsection vrange
+
+@c ?commands set vrange
+@c ?commands show vrange
+@c ?set vrange
+@c ?show vrange
+@cindex vrange
+@opindex vrange
+
+
+The @ref{urange} and @ref{vrange} commands set the parametric ranges used
+to compute x, y, and z values when in `splot` parametric mode.  Please see
+@ref{xrange} for details.
+
+@node x2data, x2dtics, vrange, set-show
+@subsection x2data
+
+@c ?commands set x2data
+@c ?commands show x2data
+@c ?set x2data
+@c ?show x2data
+@cindex x2data
+@opindex x2data
+
+
+The @ref{x2data} command sets data on the x2 (top) axis to timeseries
+(dates/times).  Please see @ref{xdata}.
+
+@node x2dtics, x2label, x2data, set-show
+@subsection x2dtics
+
+@c ?commands set x2dtics
+@c ?commands set nox2dtics
+@c ?commands show x2dtics
+@c ?set x2dtics
+@c ?set nox2dtics
+@c ?show x2dtics
+@cindex x2dtics
+@opindex x2dtics
+
+
+@cindex nox2dtics
+
+The @ref{x2dtics} command changes tics on the x2 (top) axis to days of the
+week.  Please see @ref{xdtics} for details.
+
+@node x2label, x2mtics, x2dtics, set-show
+@subsection x2label
+
+@c ?commands set x2label
+@c ?commands show x2label
+@c ?set x2label
+@c ?show x2label
+@cindex x2label
+@opindex x2label
+
+
+The @ref{x2label} command sets the label for the x2 (top) axis.  Please see
+@ref{xlabel}.
+
+@node x2mtics, x2range, x2label, set-show
+@subsection x2mtics
+
+@c ?commands set x2mtics
+@c ?commands set nox2mtics
+@c ?commands show x2mtics
+@c ?set x2mtics
+@c ?set nox2mtics
+@c ?show x2mtics
+@cindex x2mtics
+@opindex x2mtics
+
+
+@cindex nox2mtics
+
+The @ref{x2mtics} command changes tics on the x2 (top) axis to months of the
+year.  Please see @ref{xmtics} for details.
+
+@node x2range, x2tics, x2mtics, set-show
+@subsection x2range
+
+@c ?commands set x2range
+@c ?commands show x2range
+@c ?set x2range
+@c ?show x2range
+@cindex x2range
+@opindex x2range
+
+
+The @ref{x2range} command sets the horizontal range that will be displayed on
+the x2 (top) axis.  Please see @ref{xrange} for details.
+
+@node x2tics, x2zeroaxis, x2range, set-show
+@subsection x2tics
+
+@c ?commands set x2tics
+@c ?commands set nox2tics
+@c ?commands show x2tics
+@c ?set x2tics
+@c ?set nox2tics
+@c ?show x2tics
+@cindex x2tics
+@opindex x2tics
+
+
+@cindex nox2tics
+
+The @ref{x2tics} command controls major (labelled) tics on the x2 (top) axis.
+Please see @ref{xtics} for details.
+
+@node x2zeroaxis, xdata, x2tics, set-show
+@subsection x2zeroaxis
+
+@c ?commands set x2zeroaxis
+@c ?commands set nox2zeroaxis
+@c ?commands show x2zeroaxis
+@c ?set x2zeroaxis
+@c ?set nox2zeroaxis
+@c ?show x2zeroaxis
+@cindex x2zeroaxis
+@opindex x2zeroaxis
+
+
+@cindex nox2zeroaxis
+
+The @ref{x2zeroaxis} command draws a line at the origin of the x2 (top) axis
+(y2 = 0).  For details, please see
+@ref{zeroaxis}.
+
+@node xdata, xdtics, x2zeroaxis, set-show
+@subsection xdata
+
+@c ?commands set xdata
+@c ?commands show xdata
+@c ?set xdata
+@c ?show xdata
+@cindex xdata
+@opindex xdata
+
+
+This command sets the datatype on the x axis to time/date.  A similar command
+does the same thing for each of the other axes.
+
+Syntax:
+@example
+      set xdata @{time@}
+      show xdata
+
+@end example
+
+The same syntax applies to @ref{ydata}, @ref{zdata}, @ref{x2data} and @ref{y2data}.
+
+The `time` option signals that the datatype is indeed time/date.  If the
+option is not specified, the datatype reverts to normal.
+
+See @ref{timefmt} to tell `gnuplot` how to read date or time data.  The
+time/date is converted to seconds from start of the century.  There is
+currently only one timefmt, which implies that all the time/date columns must
+confirm to this format.  Specification of ranges should be supplied as quoted
+strings according to this format to avoid interpretation of the time/date as
+an expression.
+
+The function 'strftime' (type "man strftime" on unix to look it up) is used
+to print tic-mark labels.  `gnuplot` tries to figure out a reasonable format
+for this  unless the `set format x "string"` has supplied something that does
+not look like a decimal format (more than one '%' or neither %f nor %g).
+
+See also `Time/date` for more information.
+
+@node xdtics, xlabel, xdata, set-show
+@subsection xdtics
+
+@c ?commands set xdtics
+@c ?commands set noxdtics
+@c ?commands show xdtics
+@c ?set xdtics
+@c ?set noxdtics
+@c ?show xdtics
+@cindex xdtics
+@opindex xdtics
+
+
+@cindex noxdtics
+
+The @ref{xdtics} commands converts the x-axis tic marks to days of the week
+where 0=Sun and 6=Sat.  Overflows are converted modulo 7 to dates.  `set
+noxdtics` returns the labels to their default values.  Similar commands do
+the same things for the other axes.
+
+Syntax:
+@example
+      set xdtics
+      set noxdtics
+      show xdtics
+
+@end example
+
+The same syntax applies to @ref{ydtics}, @ref{zdtics}, @ref{x2dtics} and @ref{y2dtics}.
+
+See also the `set format` command.
+
+@node xlabel, xmtics, xdtics, set-show
+@subsection xlabel
+
+@c ?commands set xlabel
+@c ?commands show xlabel
+@c ?set xlabel
+@c ?show xlabel
+@cindex xlabel
+@opindex xlabel
+
+
+The @ref{xlabel} command sets the x axis label.  Similar commands set labels
+on the other axes.
+
+Syntax:
+@example
+      set xlabel @{"<label>"@} @{<xoff>@}@{,<yoff>@} @{"<font>@{,<size>@}"@}
+      show xlabel
+
+@end example
+
+The same syntax applies to @ref{x2label}, @ref{ylabel}, @ref{y2label} and @ref{zlabel}.
+
+Specifying the constants <xoff> or <yoff> as optional offsets for a label
+will move it <xoff> or <yoff> character widths or heights.  For example,
+"` set xlabel -1`" will change only the x offset of the xlabel, moving the
+label roughly one character width to the left.   The size of a character
+depends on both the font and the terminal.
+
+<font> is used to specify the font in which the label is written; the units
+of the font <size> depend upon which terminal is used.
+
+To clear a label, put no options on the command line, e.g., "@ref{y2label}".
+
+The default positions of the axis labels are as follows:
+
+xlabel:  The x-axis label is centered below the bottom axis.
+
+ylabel:  The position of the y-axis label depends on the terminal, and can be
+one of the following three positions:
+
+1. Horizontal text flushed left at the top left of the plot.  Terminals that
+cannot rotate text will probably use this method.  If @ref{x2tics} is also
+in use, the ylabel may overwrite the left-most x2tic label.  This may be
+remedied by adjusting the ylabel position or the left margin.
+
+2. Vertical text centered vertically at the left of the plot.  Terminals
+that can rotate text will probably use this method.
+
+3. Horizontal text centered vertically at the left of the plot.  The EEPIC,
+LaTeX and TPIC drivers use this method.  The user must insert line breaks
+using \\ to prevent the ylabel from overwriting the plot.  To produce a
+vertical row of characters, add \\ between every printing character (but this
+is ugly).
+
+zlabel: The z-axis label is centered along the z axis and placed in the space
+above the grid level.
+
+y2label: The y2-axis label is placed to the right of the y2 axis.  The
+position is terminal-dependent in the same manner as is the y-axis label.
+
+x2label: The x2-axis label is placed above the top axis but below the plot
+title.  It is also possible to create an x2-axis label by using new-line
+characters to make a multi-line plot title, e.g.,
+
+@example
+      set title "This is the title\n\nThis is the x2label"
+
+@end example
+
+Note that double quotes must be used.  The same font will be used for both
+lines, of course.
+
+If you are not satisfied with the default position of an axis label, use @ref{label} instead--that command gives you much more control over where text is
+placed.
+
+Please see `set syntax` for further information about backslash processing
+and the difference between single- and double-quoted strings.
+
+@node xmtics, xrange, xlabel, set-show
+@subsection xmtics
+
+@c ?commands set xmtics
+@c ?commands set noxmtics
+@c ?commands show xmtics
+@c ?set xmtics
+@c ?set noxmtics
+@c ?show xmtics
+@cindex xmtics
+@opindex xmtics
+
+
+@cindex noxmtics
+
+The @ref{xmtics} commands converts the x-axis tic marks to months of the
+year where 1=Jan and 12=Dec.  Overflows are converted modulo 12 to months.
+The tics are returned to their default labels by `set noxmtics`.  Similar
+commands perform the same duties for the other axes.
+
+Syntax:
+@example
+      set xmtics
+      set noxmtics
+      show xmtics
+
+@end example
+
+The same syntax applies to @ref{x2mtics}, @ref{ymtics}, @ref{y2mtics}, and @ref{zmtics}.
+
+See also the `set format` command.
+
+@node xrange, xtics, xmtics, set-show
+@subsection xrange
+
+@c ?commands set xrange
+@c ?commands show xrange
+@c ?set xrange
+@c ?show xrange
+@cindex xrange
+@opindex xrange
+
+
+The @ref{xrange} command sets the horizontal range that will be displayed.
+A similar command exists for each of the other axes, as well as for the
+polar radius r and the parametric variables t, u, and v.
+
+Syntax:
+@example
+      set xrange [@{@{<min>@}:@{<max>@}@}] @{@{no@}reverse@} @{@{no@}writeback@}
+      show xrange
+
+@end example
+
+where <min> and <max> terms are constants, expressions or an asterisk to set
+autoscaling.  If the data are time/date, you must give the range as a quoted
+string according to the @ref{timefmt} format.  Any value omitted will not be
+changed.
+
+The same syntax applies to @ref{yrange}, @ref{zrange}, @ref{x2range}, @ref{y2range},
+@ref{rrange}, @ref{trange}, @ref{urange} and @ref{vrange}.
+
+The `reverse` option reverses the direction of the axis, e.g., `set xrange
+[0:1] reverse` will produce an axis with 1 on the left and 0 on the right.
+This is identical to the axis produced by `set xrange [1:0]`, of course.
+`reverse` is intended primarily for use with @ref{autoscale}.
+
+The `writeback` option essentially saves the range found by @ref{autoscale} in
+the buffers that would be filled by @ref{xrange}.  This is useful if you wish
+to plot several functions together but have the range determined by only
+some of them.  The `writeback` operation is performed during the @ref{plot}
+execution, so it must be specified before that command.  For example,
+
+@example
+      set xrange [-10:10]
+      set yrange [] writeback
+      plot sin(x)
+      set noautoscale y
+      replot x/2
+
+@end example
+
+results in a yrange of [-1:1] as found only from the range of sin(x); the
+[-5:5] range of x/2 is ignored.  Executing @ref{yrange} after each command
+in the above example should help you understand what is going on.
+
+In 2-d, @ref{xrange} and @ref{yrange} determine the extent of the axes, @ref{trange}
+determines the range of the parametric variable in parametric mode or the
+range of the angle in polar mode.  Similarly in parametric 3-d, @ref{xrange},
+@ref{yrange}, and @ref{zrange} govern the axes and @ref{urange} and @ref{vrange} govern the
+parametric variables.
+
+In polar mode, @ref{rrange} determines the radial range plotted.  <rmin> acts as
+an additive constant to the radius, whereas <rmax> acts as a clip to the
+radius---no point with radius greater than <rmax> will be plotted.  @ref{xrange}
+and @ref{yrange} are affected---the ranges can be set as if the graph was of
+r(t)-rmin, with rmin added to all the labels.
+
+Any range may be partially or totally autoscaled, although it may not make
+sense to autoscale a parametric variable unless it is plotted with data.
+
+Ranges may also be specified on the @ref{plot} command line.  A range given on
+the plot line will be used for that single @ref{plot} command; a range given by
+a `set` command will be used for all subsequent plots that do not specify
+their own ranges.  The same holds true for `splot`.
+
+Examples:
+
+To set the xrange to the default:
+@example
+      set xrange [-10:10]
+
+@end example
+
+To set the yrange to increase downwards:
+@example
+      set yrange [10:-10]
+
+@end example
+
+To change zmax to 10 without affecting zmin (which may still be autoscaled):
+@example
+      set zrange [:10]
+
+@end example
+
+To autoscale xmin while leaving xmax unchanged:
+@example
+      set xrange [*:]
+
+@end example
+
+@node xtics, xzeroaxis, xrange, set-show
+@subsection xtics
+
+@c ?commands set xtics
+@c ?commands set noxtics
+@c ?commands show xtics
+@c ?set xtics
+@c ?set noxtics
+@c ?show xtics
+@cindex xtics
+@opindex xtics
+
+
+@cindex noxtics
+
+Fine control of the major (labelled) tics on the x axis is possible with the
+@ref{xtics} command.  The tics may be turned off with the `set noxtics`
+command, and may be turned on (the default state) with @ref{xtics}.  Similar
+commands control the major tics on the y, z, x2 and y2 axes.
+
+Syntax:
+@example
+      set xtics @{axis | border@} @{@{no@}mirror@} @{@{no@}rotate@}
+                @{  autofreq
+                 | <incr>
+                 | <start>, <incr> @{,<end>@}
+                 | (@{"<label>"@} <pos> @{,@{"<label>"@} <pos>@}...) @}
+      set noxtics
+      show xtics
+
+@end example
+
+The same syntax applies to @ref{ytics}, @ref{ztics}, @ref{x2tics} and @ref{y2tics}.
+
+`axis` or @ref{border} tells `gnuplot` to put the tics (both the tics themselves
+and the accompanying labels) along the axis or the border, respectively.  If
+the axis is very close to the border, the `axis` option can result in tic
+labels overwriting other text written in the margin.
+
+`mirror` tells `gnuplot` to put unlabelled tics at the same positions on the
+opposite border.  `nomirror` does what you think it does.
+
+`rotate` asks `gnuplot` to rotate the text through 90 degrees, which will be
+done if the terminal driver in use supports text rotation.  `norotate`
+cancels this.
+
+The defaults are `border mirror norotate` for tics on the x and y axes, and
+`border nomirror norotate` for tics on the x2 and y2 axes.  For the z axis,
+the the `@{axis | border@}` option is not available and the default is
+`nomirror`.  If you do want to mirror the z-axis tics, you might want to
+create a bit more room for them with @ref{border}.
+
+@ref{xtics} with no options restores the default border or axis if xtics are
+being displayed;  otherwise it has no effect.  Any previously specified tic
+frequency or position @{and labels@} are retained.
+
+Positions of the tics are calculated automatically by default or if the
+`autofreq` option is given; otherwise they may be specified in either of
+two forms:
+
+The implicit <start>, <incr>, <end> form specifies that a series of tics will
+be plotted on the axis between the values <start> and <end> with an increment
+of <incr>.  If <end> is not given, it is assumed to be infinity.  The
+increment may be negative.  If neither <start> nor <end> is given, <start> is
+assumed to be negative infinity, <end> is assumed to be positive infinity,
+and the tics will be drawn at integral multiples of <step>.  If the axis is
+logarithmic, the increment will be used as a multiplicative factor.
+
+Examples:
+
+Make tics at 0, 0.5, 1, 1.5, ..., 9.5, 10.
+@example
+      set xtics 0,.5,10
+
+@end example
+
+Make tics at ..., -10, -5, 0, 5, 10, ...
+@example
+      set xtics 5
+
+@end example
+
+Make tics at 1, 100, 1e4, 1e6, 1e8.
+@example
+      set logscale x; set xtics 1,100,10e8
+
+@end example
+
+The explicit ("<label>" <pos>, ...) form allows arbitrary tic positions or
+non-numeric tic labels.  A set of tics is a set of positions, each with its
+own optional label.  Note that the label is a string enclosed by quotes.  It
+may be a constant string, such as "hello", may contain formatting information
+for converting the position into its label, such as "%3f clients", or may be
+empty, "".  See `set format` for more information.  If no string is given,
+the default label (numerical) is used.  In this form, the tics do not need to
+be listed in numerical order.
+
+Examples:
+@example
+      set xtics ("low" 0, "medium" 50, "high" 100)
+      set xtics (1,2,4,8,16,32,64,128,256,512,1024)
+      set ytics ("bottom" 0, "" 10, "top" 20)
+
+@end example
+
+In the second example, all tics are labelled.  In the third, only the end
+tics are labelled.
+
+However they are specified, tics will only be plotted when in range.
+
+Format (or omission) of the tic labels is controlled by `set format`, unless
+the explicit text of a labels is included in the `set xtic (`<label>`)` form.
+
+Minor (unlabelled) tics can be added by the @ref{mxtics} command.
+
+In case of timeseries data, position values must be given as quoted dates
+or times according to the format @ref{timefmt}.  If the <start>, <incr>, <end>
+form is used, <start> and <end> must be given according to @ref{timefmt}, but
+<incr> must be in seconds.  Times will be written out according to the format
+given on `set format`, however.
+
+Examples:
+@example
+      set xdata time
+      set timefmt "%d/%m"
+      set format x "%b %d"
+      set xrange ["01/12":"06/12"]
+      set xtics "01/12", 172800, "05/12"
+
+@end example
+
+@example
+      set xdata time
+      set timefmt "%d/%m"
+      set format x "%b %d"
+      set xrange ["01/12":"06/12"]
+      set xtics ("01/12", "" "03/12", "05/12")
+@end example
+
+Both of these will produce tics "Dec 1", "Dec 3", and "Dec 5", but in the
+second example the tic at "Dec 3" will be unlabelled.
+
+
+@node xzeroaxis, y2data, xtics, set-show
+@subsection xzeroaxis
+
+@c ?commands set xzeroaxis
+@c ?commands set noxzeroaxis
+@c ?commands show xzeroaxis
+@c ?set xzeroaxis
+@c ?set noxzeroaxis
+@c ?show xzeroaxis
+@cindex xzeroaxis
+@opindex xzeroaxis
+
+
+@cindex noxzeroaxis
+
+The @ref{xzeroaxis} command draws a line at y = 0.  For details, please see
+@ref{zeroaxis}.
+
+@node y2data, y2dtics, xzeroaxis, set-show
+@subsection y2data
+
+@c ?commands set y2data
+@c ?commands show y2data
+@c ?set y2data
+@c ?show y2data
+@cindex y2data
+@opindex y2data
+
+
+The @ref{y2data} command sets y2 (right-hand) axis data to timeseries
+(dates/times).  Please see @ref{xdata}.
+
+@node y2dtics, y2label, y2data, set-show
+@subsection y2dtics
+
+@c ?commands set y2dtics
+@c ?commands set noy2dtics
+@c ?set y2dtics
+@c ?set noy2dtics
+@c ?show y2dtics
+@cindex y2dtics
+@opindex y2dtics
+
+
+@cindex noy2dtics
+
+The @ref{y2dtics} command changes tics on the y2 (right-hand) axis to days of
+the week.  Please see @ref{xdtics} for details.
+
+@node y2label, y2mtics, y2dtics, set-show
+@subsection y2label
+
+@c ?commands set y2label
+@c ?commands show y2label
+@c ?set y2label
+@c ?show y2label
+@cindex y2label
+@opindex y2label
+
+
+The @ref{y2dtics} command sets the label for the y2 (right-hand) axis.
+Please see @ref{xlabel}.
+
+@node y2mtics, y2range, y2label, set-show
+@subsection y2mtics
+
+@c ?commands set y2mtics
+@c ?commands set noy2mtics
+@c ?commands show y2mtics
+@c ?set y2mtics
+@c ?set noy2mtics
+@c ?show y2mtics
+@cindex y2mtics
+@opindex y2mtics
+
+
+@cindex noy2mtics
+
+The @ref{y2mtics} command changes tics on the y2 (right-hand) axis to months
+of the year.  Please see @ref{xmtics} for details.
+
+@node y2range, y2tics, y2mtics, set-show
+@subsection y2range
+
+@c ?commands set y2range
+@c ?commands show y2range
+@c ?set y2range
+@c ?show y2range
+@cindex y2range
+@opindex y2range
+
+
+The @ref{y2range} command sets the vertical range that will be displayed on
+the y2 (right-hand) axis.  Please see @ref{xrange} for details.
+
+@node y2tics, y2zeroaxis, y2range, set-show
+@subsection y2tics
+
+@c ?commands set y2tics
+@c ?commands set noy2tics
+@c ?commands show y2tics
+@c ?set y2tics
+@c ?set noy2tics
+@c ?show y2tics
+@cindex y2tics
+@opindex y2tics
+
+
+@cindex noy2tics
+
+The @ref{y2tics} command controls major (labelled) tics on the y2 (right-hand)
+axis.  Please see @ref{xtics} for details.
+
+@node y2zeroaxis, ydata, y2tics, set-show
+@subsection y2zeroaxis
+
+@c ?commands set y2zeroaxis
+@c ?commands set noy2zeroaxis
+@c ?commands show y2zeroaxis
+@c ?set y2zeroaxis
+@c ?set noy2zeroaxis
+@c ?show y2zeroaxis
+@cindex y2zeroaxis
+@opindex y2zeroaxis
+
+
+@cindex noy2zeroaxis
+
+The @ref{y2zeroaxis} command draws a line at the origin of the y2 (right-hand)
+axis (x2 = 0).  For details, please see @ref{zeroaxis}.
+
+@node ydata, ydtics, y2zeroaxis, set-show
+@subsection ydata
+
+@c ?commands set ydata
+@c ?commands show ydata
+@c ?set ydata
+@c ?show ydata
+@cindex ydata
+@opindex ydata
+
+
+Sets y-axis data to timeseries (dates/times).  Please see @ref{xdata}.
+
+@node ydtics, ylabel, ydata, set-show
+@subsection ydtics
+
+@c ?commands set ydtics
+@c ?commands set noydtics
+@c ?commands show ydtics
+@c ?set ydtics
+@c ?set noydtics
+@c ?show ydtics
+@cindex ydtics
+@opindex ydtics
+
+
+@cindex noydtics
+
+The @ref{ydtics} command changes tics on the y axis to days of the week.
+Please see @ref{xdtics} for details.
+
+@node ylabel, ymtics, ydtics, set-show
+@subsection ylabel
+
+@c ?commands set ylabel
+@c ?commands show ylabel
+@c ?set ylabel
+@c ?show ylabel
+@cindex ylabel
+@opindex ylabel
+
+
+This command sets the label for the y axis.  Please see @ref{xlabel}.
+
+@node ymtics, yrange, ylabel, set-show
+@subsection ymtics
+
+@c ?commands set ymtics
+@c ?commands set noymtics
+@c ?commands show ymtics
+@c ?set ymtics
+@c ?set noymtics
+@c ?show ymtics
+@cindex ymtics
+@opindex ymtics
+
+
+@cindex noymtics
+
+The @ref{ymtics} command changes tics on the y axis to months of the year.
+Please see @ref{xmtics} for details.
+
+@node yrange, ytics, ymtics, set-show
+@subsection yrange
+
+@c ?commands set yrange
+@c ?commands show yrange
+@c ?set yrange
+@c ?show yrange
+@cindex yrange
+@opindex yrange
+
+
+The @ref{yrange} command sets the vertical range that will be displayed on
+the y axis.  Please see @ref{xrange} for details.
+
+@node ytics, yzeroaxis, yrange, set-show
+@subsection ytics
+
+@c ?commands set ytics
+@c ?commands set noytics
+@c ?commands show ytics
+@c ?set ytics
+@c ?set noytics
+@c ?show ytics
+@cindex ytics
+@opindex ytics
+
+
+@cindex noytics
+
+The @ref{ytics} command controls major (labelled) tics on the y axis.
+Please see @ref{xtics} for details.
+
+@node yzeroaxis, zdata, ytics, set-show
+@subsection yzeroaxis
+
+@c ?commands set yzeroaxis
+@c ?commands set noyzeroaxis
+@c ?commands show yzeroaxis
+@c ?set yzeroaxis
+@c ?set noyzeroaxis
+@c ?show yzeroaxis
+@cindex yzeroaxis
+@opindex yzeroaxis
+
+
+@cindex noyzeroaxis
+
+The @ref{yzeroaxis} command draws a line at x = 0.  For details, please see
+@ref{zeroaxis}.
+
+@node zdata, zdtics, yzeroaxis, set-show
+@subsection zdata
+
+@c ?commands set zdata
+@c ?commands show zdata
+@c ?set zdata
+@c ?show zdata
+@cindex zdata
+@opindex zdata
+
+
+Set zaxis date to timeseries (dates/times).  Please see @ref{xdata}.
+
+@node zdtics, zero, zdata, set-show
+@subsection zdtics
+
+@c ?commands set zdtics
+@c ?commands set nozdtics
+@c ?commands show zdtics
+@c ?set zdtics
+@c ?set nozdtics
+@c ?show zdtics
+@cindex zdtics
+@opindex zdtics
+
+
+@cindex nozdtics
+
+The @ref{zdtics} command changes tics on the z axis to days of the week.
+Please see @ref{xdtics} for details.
+
+@node zero, zeroaxis, zdtics, set-show
+@subsection zero
+
+@c ?commands set zero
+@c ?commands show zero
+@c ?set zero
+@c ?show zero
+@cindex zero
+@opindex zero
+
+
+The `zero` value is the default threshold for values approaching 0.0.
+
+Syntax:
+@example
+      set zero <expression>
+      show zero
+
+@end example
+
+`gnuplot` will not plot a point if its imaginary part is greater in magnitude
+than the `zero` threshold.  This threshold is also used in various other
+parts of `gnuplot` as a (crude) numerical-error threshold.  The default
+`zero` value is 1e-8.  `zero` values larger than 1e-3 (the reciprocal of the
+number of pixels in a typical bitmap display) should probably be avoided, but
+it is not unreasonable to set `zero` to 0.0.
+
+@node zeroaxis, zlabel, zero, set-show
+@subsection zeroaxis
+
+@c ?commands set zeroaxis
+@c ?commands set nozeroaxis
+@c ?commands show zeroaxis
+@c ?set zeroaxis
+@c ?set nozeroaxis
+@c ?show zeroaxis
+@cindex zeroaxis
+@opindex zeroaxis
+
+
+@cindex nozeroaxis
+
+The x axis may be drawn by @ref{xzeroaxis} and removed by `set noxzeroaxis`.
+Similar commands behave similarly for the y, x2, and y2 axes.
+
+Syntax:
+@example
+      set @{x|x2|y|y2|@}zeroaxis @{ @{linestyle | ls <line_style>@}
+                                 | @{ linetype | lt <line_type>@}
+                                   @{ linewidth | lw <line_width>@}@}
+      set no@{x|x2|y|y2|@}zeroaxis
+      show @{x|y|@}zeroaxis
+
+@end example
+
+
+By default, these options are off.  The selected zero axis is drawn
+with a line of type <line_type> and width <line_width> (if supported
+by the terminal driver currently in use), or a user-defined style
+<line_style>.
+
+If no linetype is specified, any zero axes selected will be drawn
+using the axis linetype (linetype 0).
+
+`set zeroaxis l` is equivalent to `set xzeroaxis l; set yzeroaxis l`. `set
+nozeroaxis` is equivalent to `set noxzeroaxis; set noyzeroaxis`.
+
+@node zlabel, zmtics, zeroaxis, set-show
+@subsection zlabel
+
+@c ?commands set zlabel
+@c ?commands show zlabel
+@c ?set zlabel
+@c ?show zlabel
+@cindex zlabel
+@opindex zlabel
+
+
+This command sets the label for the z axis.  Please see @ref{xlabel}.
+
+@node zmtics, zrange, zlabel, set-show
+@subsection zmtics
+
+@c ?commands set zmtics
+@c ?commands set nozmtics
+@c ?commands show zmtics
+@c ?set zmtics
+@c ?set nozmtics
+@c ?show zmtics
+@cindex zmtics
+@opindex zmtics
+
+
+@cindex nozmtics
+
+The @ref{zmtics} command changes tics on the z axis to months of the year.
+Please see @ref{xmtics} for details.
+
+@node zrange, ztics, zmtics, set-show
+@subsection zrange
+
+@c ?commands set zrange
+@c ?commands show zrange
+@c ?set zrange
+@c ?show zrange
+@cindex zrange
+@opindex zrange
+
+
+The @ref{zrange} command sets the range that will be displayed on the z axis.
+The zrange is used only by `splot` and is ignored by @ref{plot}.  Please see @ref{xrange} for details.
+
+@node ztics,  , zrange, set-show
+@subsection ztics
+
+@c ?commands set ztics
+@c ?commands set noztics
+@c ?commands show ztics
+@c ?set ztics
+@c ?set noztics
+@c ?show ztics
+@cindex ztics
+@opindex ztics
+
+
+@cindex noztics
+
+The @ref{ztics} command controls major (labelled) tics on the z axis.
+Please see @ref{xtics} for details.
+
+@node shell, splot, set-show, Commands
+@section shell
+
+@c ?commands shell
+@cindex shell
+@cmindex shell
+
+
+The @ref{shell} command spawns an interactive shell.  To return to `gnuplot`,
+type `logout` if using VMS, @ref{exit} or the END-OF-FILE character if using
+Unix, `endcli` if using AmigaOS, or @ref{exit} if using MS-DOS or OS/2.
+
+A single shell command may be spawned by preceding it with the ! character
+($ if using VMS) at the beginning of a command line.  Control will return
+immediately to `gnuplot` after this command is executed.  For example, in
+Unix, AmigaOS, MS-DOS or OS/2,
+
+@example
+      ! dir
+
+@end example
+
+prints a directory listing and then returns to `gnuplot`.
+
+On an Atari, the `!` command first checks whether a shell is already loaded
+and uses it, if available.  This is practical if `gnuplot` is run from
+`gulam`, for example.
+
+@node splot, test, shell, Commands
+@section splot
+
+@c ?commands splot
+@cindex splot
+@cmindex splot
+
+
+`splot` is the command for drawing 3-d plots (well, actually projections on
+a 2-d surface, but you knew that).  It can create a plot from functions or
+a data file in a manner very similar to the @ref{plot} command.
+
+See @ref{plot} for features common to the @ref{plot} command; only differences are
+discussed in detail here.  Note specifically that the @ref{binary} and @ref{matrix}
+options (discussed under "datafile-modifiers") are not available for @ref{plot}.
+
+Syntax:
+@example
+      splot @{<ranges>@}
+            <function> | "<datafile>" @{datafile-modifiers@}@}
+            @{<title-spec>@} @{with <style>@}
+            @{, @{definitions,@} <function> ...@}
+
+@end example
+
+where either a <function> or the name of a data file enclosed in quotes is
+supplied.  The function can be a mathematical expression, or a triple of
+mathematical expressions in parametric mode.
+
+By default `splot` draws the xy plane completely below the plotted data.
+The offset between the lowest ztic and the xy plane can be changed by @ref{ticslevel}.  The orientation of a `splot` projection is controlled by
+@ref{view}.  See @ref{view} and @ref{ticslevel} for more information.
+
+The syntax for setting ranges on the `splot` command is the same as for
+@ref{plot}.  In non-parametric mode, the order in which ranges must be given is
+@ref{xrange}, @ref{yrange}, and @ref{zrange}.  In parametric mode, the order is @ref{urange},
+@ref{vrange}, @ref{xrange}, @ref{yrange}, and @ref{zrange}.
+
+The `title` option is the same as in @ref{plot}.  The operation of @ref{with} is also
+the same as in @ref{plot}, except that the plotting styles available to `splot`
+are limited to `lines`, `points`, @ref{linespoints}, @ref{dots}, and @ref{impulses};  the
+error-bar capabilities of @ref{plot} are not available for `splot`.
+
+The datafile options have more differences.
+
+@menu
+* data-file_::                  
+* grid_data::                   
+* splot_overview::              
+@end menu
+
+@node data-file_, grid_data, splot, splot
+@subsection data-file
+
+@c ?commands splot datafile
+@c ?splot datafile
+@c ?splot data-file
+As for @ref{plot}, discrete data contained in a file can be displayed by
+specifying the name of the data file, enclosed in quotes,  on the `splot`
+command line.
+
+Syntax:
+@example
+      splot '<file_name>' @{binary | matrix@}
+                          @{index <index list>@}
+                          @{every <every list>@}
+                          @{using <using list>@}
+
+@end example
+
+The special filenames `""` and `"-"` are permitted, as in @ref{plot}.
+
+In brief, @ref{binary} and @ref{matrix} indicate that the the data are in a special
+form, @ref{index} selects which data sets in a multi-data-set file are to be
+plotted, @ref{every} specifies which datalines (subsets) within a single data
+set are to be plotted, and @ref{using} determines how the columns within a single
+record are to be interpreted.
+
+The options @ref{index} and @ref{every} behave the same way as with @ref{plot};  @ref{using}
+does so also, except that the @ref{using} list must provide three entries
+instead of two.
+
+The @ref{plot} options @ref{thru} and @ref{smooth} are not available for `splot`, but
+`cntrparams` and @ref{dgrid3d} provide limited smoothing cabilities.
+
+Data file organization is essentially the same as for @ref{plot}, except that
+each point is an (x,y,z) triple.  If only a single value is provided, it
+will be used for z, the datablock number will be used for y, and the index
+of the data point in the datablock will be used for x.  If two values are
+provided, `gnuplot` gives you an error message.  Three values are interpreted
+as an (x,y,z) triple.  Additional values are generally used as errors, which
+can be used by `fit`.
+
+Single blank records separate datablocks in a `splot` datafile; `splot`
+treats datablocks as the equivalent of function y-isolines.  No line will
+join points separated by a blank record.  If all datablocks contain the same
+number of points, `gnuplot` will draw cross-isolines between datablocks,
+connecting corresponding points.  This is termed "grid data", and is required
+for drawing a surface, for contouring (@ref{contour}) and hidden-line removal
+(@ref{hidden3d}). See also `splot grid data`
+
+It is no longer necessary to specify `parametric` mode for three-column
+`splot`s.
+
+@menu
+* binary::                      
+* example_datafile_::           
+* matrix::                      
+@end menu
+
+@node binary, example_datafile_, data-file_, data-file_
+@subsubsection binary
+
+@c ?commands splot datafile binary
+@c ?splot datafile binary
+@c ?splot binary
+@c ?data-file binary
+@c ?datafile binary
+@cindex binary
+
+@c ?binary data
+@c ?binary files
+`splot` can read binary files written with a specific format (and on a
+system with a compatible binary file representation.)
+
+In previous versions, `gnuplot` dynamically detected binary data files.  It
+is now necessary to specify the keyword @ref{binary} directly after the filename.
+
+Single precision floats are stored in a binary file as follows:
+
+@example
+      <N+1>  <y0>   <y1>   <y2>  ...  <yN>
+       <x0> <z0,0> <z0,1> <z0,2> ... <z0,N>
+       <x1> <z1,0> <z1,1> <z1,2> ... <z1,N>
+        :      :      :      :   ...    :
+
+@end example
+
+which are converted into triplets:
+@example
+      <x0> <y0> <z0,0>
+      <x0> <y1> <z0,1>
+      <x0> <y2> <z0,2>
+       :    :     :
+      <x0> <yN> <z0,N>
+
+@end example
+
+@example
+      <x1> <y0> <z1,0>
+      <x1> <y1> <z1,1>
+       :    :     :
+
+@end example
+
+These triplets are then converted into `gnuplot` iso-curves and then
+`gnuplot` proceeds in the usual manner to do the rest of the plotting.
+
+A collection of matrix and vector manipulation routines (in C) is provided
+in `binary.c`.  The routine to write binary data is
+
+@example
+      int fwrite_matrix(file,m,nrl,nrl,ncl,nch,row_title,column_title)
+
+@end example
+
+An example of using these routines is provided in the file `bf_test.c`, which
+generates binary files for the demo file `demo/binary.dem`.
+
+The @ref{index} keyword is not supported, since the file format allows only one
+surface per file.  The @ref{every} and @ref{using} filters are supported.  @ref{using}
+operates as if the data were read in the above triplet form.
+@uref{http://www.gnuplot.vt.edu/gnuplot/gpdocs/binary.html,Binary File Splot Demo.}
+
+@node example_datafile_, matrix, binary, data-file_
+@subsubsection example datafile
+
+@c ?commands splot datafile example
+@c ?splot datafile example
+@c ?splot example
+A simple example of plotting a 3-d data file is
+
+@example
+      splot 'datafile.dat'
+
+@end example
+
+where the file "datafile.dat" might contain:
+
+@example
+      # The valley of the Gnu.
+         0 0 10
+         0 1 10
+         0 2 10
+
+@end example
+
+@example
+         1 0 10
+         1 1 5
+         1 2 10
+
+@end example
+
+@example
+         2 0 10
+         2 1 1
+         2 2 10
+
+@end example
+
+@example
+         3 0 10
+         3 1 0
+         3 2 10
+
+@end example
+
+Note that "datafile.dat" defines a 4 by 3 grid ( 4 rows of 3 points each ).
+Rows (datablocks) are separated by blank records.
+
+@c ^ <img align=bottom src="http://www.nas.nasa.gov/~woo/gnuplot/doc/splot.gif" alt="[splot.gif]" width=640 height=480>
+Note also that the x value is held constant within each dataline.  If you
+instead keep y constant, and plot with hidden-line removal enabled, you will
+find that the surface is drawn 'inside-out'.
+
+Actually for grid data it is not necessary to keep the x values constant
+within a datablock, nor is it necessary to keep the same sequence of y
+values.  `gnuplot` requires only that the number of points be the same for
+each datablock.  However since the surface mesh, from which contours are
+derived, connects sequentially corresponding points, the effect of an
+irregular grid on a surface plot is unpredictable and should be examined
+on a case-by-case basis.
+
+@node matrix,  , example_datafile_, data-file_
+@subsubsection matrix
+
+@c ?commands splot datafile matrix
+@c ?splot datafile matrix
+@c ?splot matrix
+@c ?data-file matrix
+@c ?datafile matrix
+@cindex matrix
+
+The @ref{matrix} flag indicates that the ASCII data are stored in matrix format.
+The z-values are read in a row at a time, i. e.,
+@example
+      z11 z12 z13 z14 ...
+      z21 z22 z23 z24 ...
+      z31 z32 z33 z34 ...
+@end example
+
+and so forth.  The row and column indices are used for the x- and y-values.
+
+@node grid_data, splot_overview, data-file_, splot
+@subsection grid_data
+
+@c ?commands splot grid_data
+@c ?splot grid_data
+@cindex grid_data
+
+The 3D routines are designed for points in a grid format, with one sample,
+datapoint, at each mesh intersection; the datapoints may originate from
+either evaluating a function, see @ref{isosamples}, or reading a datafile,
+see `splot datafile`.  The term "isoline" is applied to the mesh lines for
+both functions and data.  Note that the mesh need not be rectangular in x
+and y, as it may be parameterized in u and v, see @ref{isosamples}.
+
+However, `gnuplot` does not require that format.  In the case of functions,
+'samples' need not be equal to 'isosamples', i.e., not every x-isoline
+sample need intersect a y-isoline. In the case of data files, if there
+are an equal number of scattered data points in each datablock, then
+"isolines" will connect the points in a datablock, and "cross-isolines"
+will connect the corresponding points in each datablock to generate a
+"surface".  In either case, contour and hidden3d modes may give different
+plots than if the points were in the intended format.  Scattered data can be
+converted to a @{different@} grid format with @ref{dgrid3d}.
+
+The contour code tests for z intensity along a line between a point on a
+y-isoline and the corresponding point in the next y-isoline.  Thus a `splot`
+contour of a surface with samples on the x-isolines that do not coincide with
+a y-isoline intersection will ignore such samples. Try:
+@example
+       set xrange [-pi/2:pi/2]; set yrange [-pi/2:pi/2]
+       set function style lp
+       set contour
+       set isosamples 10,10; set samples 10,10;
+       splot cos(x)*cos(y)
+       set samples 4,10; replot
+       set samples 10,4; replot
+
+@end example
+
+
+@node splot_overview,  , grid_data, splot
+@subsection splot_overview
+
+@c ?commands splot_overview
+@c ? splot_overview
+`splot` can display a surface as a collection of points, or by connecting
+those points.  As with @ref{plot}, the points may be read from a data file or
+result from evaluation of a function at specified intervals, see @ref{isosamples}.  The surface may be approximated by connecting the points
+with straight line segments, see @ref{surface}, in which case the surface
+can be made opaque with `set hidden3d.`  The orientation from which the 3d
+surface is viewed can be changed with @ref{view}.
+
+Additionally, for points in a grid format, `splot` can interpolate points
+having a common amplitude (see @ref{contour}) and can then connect those
+new points to display contour lines, either directly with straight-line
+segments or smoothed lines (see `set cntrparams`).  Functions are already
+evaluated in a grid format, determined by @ref{isosamples} and @ref{samples},
+while file data must either be in a grid format, as described in `data-file`,
+or be used to generate a grid (see @ref{dgrid3d}).
+
+Contour lines may be displayed either on the surface or projected onto the
+base.  The base projections of the contour lines may be written to a
+file, and then read with @ref{plot}, to take advantage of @ref{plot}'s additional
+formatting capabilities.
+
+@node test, update, splot, Commands
+@section test
+
+@c ?commands test
+@cindex test
+@cmindex test
+
+
+@ref{test} creates a display of line and point styles and other useful things
+appropriate for the terminal you are using.
+
+Syntax:
+@example
+      test
+
+@end example
+
+@node update,  , test, Commands
+@section update
+
+@c ?commands update
+@cindex update
+@cmindex update
+
+
+This command writes the current values of the fit parameters into the given
+file, formatted as an initial-value file (as described in the `fit`section).
+This is useful for saving the current values for later use or for restarting
+a converged or stopped fit.
+
+Syntax:
+@example
+      update <filename> @{<filename>@}
+
+@end example
+
+If a second filename is supplied, the updated values are written to this
+file, and the original parameter file is left unmodified.
+
+Otherwise, if the file already exists, `gnuplot` first renames it by
+appending `.old` and then opens a new file.  That is, "`update 'fred'`"
+behaves the same as "`!rename fred fred.old; update 'fred.old' 'fred'`".
+[On DOS and other systems that use the twelve-character "filename.ext"
+naming convention, "ext" will be "`old`" and "filename" will be related
+(hopefully recognizably) to the initial name.  Renaming is not done at all
+on VMS systems, since they use file-versioning.]
+
+Please see `fit` for more information.
+
+@node Graphical_User_Interfaces, Bugs, Commands, Top
+@chapter Graphical User Interfaces
+
+@c ?graphical user interfaces
+@cindex gui's
+
+Several graphical user interfaces have been written for `gnuplot` and one for
+win32 is included in this distribution.  In addition, there is a Macintosh
+interface at
+@uref{ftp://ftp.ee.gatech.edu/pub/mac/gnuplot,ftp://ftp.ee.gatech.edu/pub/mac/gnuplot
+}
+and several X11 interfaces include three Tcl/Tk located at the usual Tcl/Tk
+repositories.
+
+@node Bugs, Concept_Index, Graphical_User_Interfaces, Top
+@chapter Bugs
+
+@cindex bugs
+
+Floating point exceptions (floating point number too large/small, divide by
+zero, etc.) may occasionally be generated by user defined functions.  Some of
+the demos in particular may cause numbers to exceed the floating point range.
+Whether the system ignores such exceptions (in which case `gnuplot` labels
+the corresponding point as undefined) or aborts `gnuplot` depends on the
+compiler/runtime environment.
+
+The bessel functions do not work for complex arguments.
+
+The gamma function does not work for complex arguments.
+
+As of `gnuplot` version 3.7, all development has been done using ANSI C.
+With current operating system, compiler, and library releases, the OS
+specific bugs documented in release 3.5, now relegated to `old_bugs`, may
+no longer be relevant.
+
+Bugs reported since the current release may be located via the official
+distribution site:
+@example
+       ftp://ftp.dartmouth.edu/pub/gnuplot
+      http://www.cs.dartmouth.edu/gnuplot_info.html
+
+@end example
+
+Please e-mail any bugs to bug-gnuplot@@dartmouth.edu.
+
+@menu
+* Old_bugs::			
+@end menu
+
+@node Old_bugs,  , Bugs, Bugs
+@section Old_bugs
+
+@cindex old_bugs
+
+@cindex os_bugs
+
+There is a bug in the stdio library for old Sun operating systems (SunOS
+Sys4-3.2).  The "%g" format for 'printf' sometimes incorrectly prints numbers
+(e.g., 200000.0 as "2").  Thus, tic mark labels may be incorrect on a Sun4
+version of `gnuplot`.  A work-around is to rescale the data or use the `set
+format` command to change the tic mark format to "%7.0f" or some other
+appropriate format.  This appears to have been fixed in SunOS 4.0.
+
+Another bug: On a Sun3 under SunOS 4.0, and on Sun4's under Sys4-3.2 and
+SunOS 4.0, the 'sscanf' routine incorrectly parses "00 12" with the format
+"%f %f" and reads 0 and 0 instead of 0 and 12.  This affects data input.  If
+the data file contains x coordinates that are zero but are specified like
+'00', '000', etc, then you will read the wrong y values.  Check any data
+files or upgrade the SunOS.  It appears to have been fixed in SunOS 4.1.1.
+
+Suns appear to overflow when calculating exp(-x) for large x, so `gnuplot`
+gets an undefined result.  One work-around is to make a user-defined function
+like e(x) = x<-500 ? 0 : exp(x).  This affects plots of Gaussians (exp(-x*x))
+in particular, since x*x grows quite rapidly.
+
+Microsoft C 5.1 has a nasty bug associated with the %g format for 'printf'.
+When any of the formats "%.2g", "%.1g", "%.0g", "%.g" are used, 'printf' will
+incorrectly print numbers in the range 1e-4 to 1e-1.  Numbers that should be
+printed in the %e format are incorrectly printed in the %f format, with the
+wrong number of zeros after the decimal point.  To work around this problem,
+use the %e or %f formats explicitly.
+
+`gnuplot`, when compiled with Microsoft C, did not work correctly on two VGA
+displays that were tested.  The CGA, EGA and VGA drivers should probably be
+rewritten to use the Microsoft C graphics library.  `gnuplot` compiled with
+Borland C++ uses the Turbo C graphics drivers and does work correctly with
+VGA displays.
+
+VAX/VMS 4.7 C compiler release 2.4 also has a poorly implemented %g format
+for 'printf'.  The numbers are printed numerically correct, but may not be in
+the requested format.  The K&R second edition says that for the %g format, %e
+is used if the exponent is less than -4 or greater than or equal to the
+precision.  The VAX uses %e format if the exponent is less than -1.  The VAX
+appears to take no notice of the precision when deciding whether to use %e or
+%f for numbers less than 1.  To work around this problem, use the %e or %f
+formats explicitly.  From the VAX C 2.4 release notes: e,E,f,F,g,G  Result
+will always contain a decimal  point.  For g and G, trailing zeros will not
+be removed from the result.
+
+VAX/VMS 5.2 C compiler release 3.0 has a slightly better implemented %g
+format than release 2.4, but not much.  Trailing decimal points are now
+removed, but trailing zeros are still not removed from %g numbers in
+exponential format.
+
+The two preceding problems are actually in the libraries rather than in the
+compilers.  Thus the problems will occur whether `gnuplot` is built using
+either the DEC compiler or some other one (e.g. the latest gcc).
+
+ULTRIX X11R3 has a bug that causes the X11 driver to display "every other"
+graph.  The bug seems to be fixed in DEC's release of X11R4 so newer releases
+of ULTRIX don't seem to have the problem.  Solutions for older sites include
+upgrading the X11 libraries (from DEC or direct from MIT) or defining
+ULTRIX_KLUDGE when compiling the x11.trm file.  Note that the kludge is not
+an ideal fix, however.
+
+The constant HUGE was incorrectly defined in the NeXT OS 2.0 operating
+system.  HUGE should be set to 1e38 in plot.h. This error has been corrected
+in the 2.1 version of NeXT OS.
+
+Some older models of HP plotters do not have a page eject command 'PG'.  The
+current HPGL driver uses this command in HPGL_reset.  This may need to be
+removed for these plotters.  The current PCL5 driver uses HPGL/2 for text as
+well as graphics.  This should be modified to use scalable PCL fonts.
+
+On the Atari version, it is not possible to send output directly to the
+printer (using `/dev/lp` as output file), since CRs are added to LFs in
+binary output.  As a work-around, write the output to a file and copy it to
+the printer afterwards using a shell command.
+
+On AIX 4, the literal 'NaNq' in a datafile causes the special internal value
+'not-a-number' to be stored, rather than setting an internal 'undefined'
+flag.  A workaround is to use `set missing 'NaNq'`.
+
+There may be an up-to-date list of bugs since the release on the WWW page:
+@example
+      http://www.cs.dartmouth.edu/gnuplot_info.html
+
+@end example
+
+Please report any bugs to bug-gnuplot@@dartmouth.edu.
+@node Concept_Index, Command_Index, Bugs, Top
+@unnumbered Concept Index
+@printindex cp
+
+@node Command_Index, Options_Index, Concept_Index, Top
+@unnumbered Command Index
+@printindex cm
+
+@node Options_Index, Function_Index, Command_Index, Top
+@unnumbered Options Index
+@printindex op
+
+@node Function_Index, Terminal_Index, Options_Index, Top
+@unnumbered Function Index
+@printindex fn
+
+@node Terminal_Index,  , Function_Index, Top
+@unnumbered Terminal Index
+@printindex tm
+
+@c @shortcontents
+@contents
+@bye
diff -urN gnuplot-3.7/docs/latextut/header.tex gnuplot-3.7.1/docs/latextut/header.tex
--- gnuplot-3.7/docs/latextut/header.tex	Wed Apr 15 20:16:46 1998
+++ gnuplot-3.7.1/docs/latextut/header.tex	Sun Aug 22 19:54:04 1999
@@ -47,7 +47,24 @@
 % To show a syntax for a gnutex command
 \newenvironment{syntax}{\begin{quote}\tt}{\end{quote}}
 
-\documentstyle[titlepage,11pt]{article}
+\ifx\LaTeXe\undefined
+% old LaTeX version
+% add `,a4' to `toc_entry' to load settings for A4-paper
+% see below if you add 11pt or 12pt
+\documentstyle[titlepage,a4]{article}
+\else
+% LaTeX2e version
+% add `[a4paper]' before `{article}' to load settings for A4-paper
+% see below if you add 11pt or 12pt
+\documentclass[titlepage,a4paper]{article} % DSL 24 May 1995
+\usepackage{latexsym}
+% If you are concerned about
+% LaTeX Warning: \oval, \circle, or \line size unavailable on input line
+% warnings, uncomment one of the following lines. You'll need to create
+% tutorial.ps then.
+%\usepackage{eepic}
+%\usepackage{pspicture}
+\fi
 
 % Margins
 \sloppy
diff -urN gnuplot-3.7/docs/makefile.ami gnuplot-3.7.1/docs/makefile.ami
--- gnuplot-3.7/docs/makefile.ami	Fri Oct  9 15:25:35 1998
+++ gnuplot-3.7.1/docs/makefile.ami	Fri Oct  9 15:25:35 1998
@@ -1,5 +1,5 @@
 #
-# $Id: makefile.ami,v 1.2 1993/09/27 17:13:14 alex Exp $
+# $Id: makefile.ami,v 1.2 1998/10/09 14:25:35 lhecking Exp $
 #
 # Makefile for GNUPLOT documentation (Aztec C v5.xx Version)
 #
@@ -15,7 +15,7 @@
 #   or
 #    make "TROFF=itroff" troff    (for troff; use your troff for itroff here)
 #
-# $Id: makefile.ami,v 1.2 1993/09/27 17:13:14 alex Exp $
+# $Id: makefile.ami,v 1.2 1998/10/09 14:25:35 lhecking Exp $
 
 # usually overridden by ../Makefile
 HELPDEST = /usr/local/lib/
diff -urN gnuplot-3.7/docs/makefile.dst gnuplot-3.7.1/docs/makefile.dst
--- gnuplot-3.7/docs/makefile.dst	Thu Nov 26 19:06:30 1998
+++ gnuplot-3.7.1/docs/makefile.dst	Thu Nov 26 19:06:30 1998
@@ -1,5 +1,5 @@
 #
-# $Id: makefile,v 1.10 1996/06/27 21:08:08 drd Exp $
+# $Id: makefile.dst,v 1.1 1998/11/26 19:06:30 lhecking Exp $
 #
 #
 # Makefile for GNUPLOT documentation
@@ -16,7 +16,7 @@
 #   or
 #    make "TROFF=itroff" troff    (for troff; use your troff here)
 #
-# $Id: makefile,v 1.10 1996/06/27 21:08:08 drd Exp $
+# $Id: makefile.dst,v 1.1 1998/11/26 19:06:30 lhecking Exp $
 
 # usually overridden by ../Makefile
 HELPDEST = /usr/local/lib
diff -urN gnuplot-3.7/docs/old/ChangeLog.old gnuplot-3.7.1/docs/old/ChangeLog.old
--- gnuplot-3.7/docs/old/ChangeLog.old	Mon Nov 16 13:07:33 1998
+++ gnuplot-3.7.1/docs/old/ChangeLog.old	Mon Nov 16 13:07:33 1998
@@ -8,7 +8,10 @@
  * working. This means that the revision numbers in the individual files
  * do not agree with the one in the log. I hope to fix this some time soon.
  *
- * $Log: version.c,v $
+ * $Log: ChangeLog.old,v $
+ * Revision 1.1  1998/11/16 13:07:33  lhecking
+ * Moved from version.c.
+ *
  *
  * I have moved these entries from version.c. All future code changes
  * should be logged in ChangeLog. Lars Hecking
diff -urN gnuplot-3.7/docs/old/README.3p5 gnuplot-3.7.1/docs/old/README.3p5
--- gnuplot-3.7/docs/old/README.3p5	Mon Nov 16 13:01:23 1998
+++ gnuplot-3.7.1/docs/old/README.3p5	Mon Nov 16 13:01:23 1998
@@ -1,9 +1,12 @@
 This is a bugfix to version 3.4.
 
 
-# $Id: README.3p5,v 1.1 1993/09/27 17:07:30 alex Exp $
+# $Id: README.3p5,v 1.1 1998/11/16 13:01:23 lhecking Exp $
 #
 # $Log: README.3p5,v $
+# Revision 1.1  1998/11/16 13:01:23  lhecking
+# Moved from top level dir.
+#
 # Revision 1.1  1993/09/27 17:07:30  alex
 # gnuplot 3.5 release
 #
diff -urN gnuplot-3.7/docs/old/makefile.r gnuplot-3.7.1/docs/old/makefile.r
--- gnuplot-3.7/docs/old/makefile.r	Wed Dec  9 17:24:30 1998
+++ gnuplot-3.7.1/docs/old/makefile.r	Wed Dec  9 17:24:30 1998
@@ -1,7 +1,10 @@
 
-# $Id: makefile.r,v 1.7 1998/04/14 00:15:55 drd Exp $
+# $Id: makefile.r,v 1.1 1998/12/09 17:24:30 lhecking Exp $
 #
 # $Log: makefile.r,v $
+# Revision 1.1  1998/12/09 17:24:30  lhecking
+# Moved from ../..
+#
 # Revision 1.7  1998/04/14 00:15:55  drd
 # HBB, Lars : latest mega monster patches. (Yes, this was supposed
 #             to be frozen...)
diff -urN gnuplot-3.7/docs/ps/Makefile gnuplot-3.7.1/docs/ps/Makefile
--- gnuplot-3.7/docs/ps/Makefile	Tue Aug 18 17:31:10 1998
+++ gnuplot-3.7.1/docs/ps/Makefile	Thu Jan  1 01:00:00 1970
@@ -1,20 +0,0 @@
-#
-# Create ps_symbols.ps
-#
-
-top_srcdir=../..
-
-all: ps_symbols.ps
-
-ps_symbols.ps: ps_symbols.gpi
-	@if test -f $(top_srcdir)/gnuplot ; then \
-		$(top_srcdir)/gnuplot ps_symbols.gpi ; \
-	else \
-		gnuplot ps_symbols.gpi ; \
-	fi
-
-clean:
-	-rm -f ps_symbols.ps
-
-distclean: clean
-
diff -urN gnuplot-3.7/docs/ps/README gnuplot-3.7.1/docs/ps/README
--- gnuplot-3.7/docs/ps/README	Tue Aug 18 17:31:10 1998
+++ gnuplot-3.7.1/docs/ps/README	Thu Jan  1 01:00:00 1970
@@ -1,21 +0,0 @@
-This set of files contains information about the gnuplot-PostScript interface.
-
-ps_file.doc
-  is a discussion of a PostScript file as written by gnuplot.
-
-ps_guide.ps
-  is a PostScript file that has two pages.  The first is a summary of the
-  enhanced syntax (available via "set terminal postscript enhanced".  The
-  second is a table of the character codes.  The table has the standard
-  encoding (shown in Times-Roman), the Symbol and Zapf-Dingbats fonts, and
-  the ISO-Latin1 (also known as ISO-8859-1) encoding.  The last entry may
-  be changed to CP850 (for OS/2) or CP437 (for MS-DOS) by editing line #14
-  in the file.  These non-standard encodings are selected via the "set
-  encoding" command.
-
-ps_symbols.gpi
-  is a gnuplot command file that generates ps_symbols. ps.ps_symbols.ps
-  is a PostScript file that shows a simple display of the 76 symbol types
-  available to the "postscript" terminal and selectable via the "pt" option
-  on the "plot" command.
-
diff -urN gnuplot-3.7/docs/ps/ps_file.doc gnuplot-3.7.1/docs/ps/ps_file.doc
--- gnuplot-3.7/docs/ps/ps_file.doc	Tue Aug 18 17:31:10 1998
+++ gnuplot-3.7.1/docs/ps/ps_file.doc	Thu Jan  1 01:00:00 1970
@@ -1,360 +0,0 @@
-A short guide to PostScript files created by gnuplot's "postscript" terminal
-
-by Dick Crawford, aka rccrawford@lanl.gov
-
-Before we begin, let me say a few words about PostScript.  It is highly ver-
-satile, but with versatility comes complexity.  Syntax is extremely important;
-a misplaced command can do unexpected things.  Thus the adventurous soul who
-wishes to alter the PostScript but has not been initiated into the arcana of
-PostScript would be well-advised to change only those items (like numerical
-values, font names or heights, or the letters defining symbols) that are
-fairly obvious as to their meaning.
-
-PostScript is stack-oriented and works in Reverse Polish notation:
-'a b add' takes 'a' and 'b' off of the stack and replaces them with 'a+b'.
-
-The 'stroke' command actually draws lines on the page.  It uses whatever line
-width and style are currently defined.  Thus if we specify a bunch of commands
-like 'LT1 1 2 moveto 3 4 lineto LT3 stroke' [LT1 and LT3 are line type defi-
-nitions, 'x y moveto' moves the (virtual) pen to (x,y) and 'x y lineto' draws
-a line from wherever the pen was to (x,y)], the line connecting points (1,2)
-and (3,4) will be in type LT3.
-
-PostScript is case-sensitive.
-
-The sample file below has been pruned of repeated commands, just to keep its
-length down.  Comment lines begin with '%'.  Lines beginning with '%%' are
-inserted for "encapsulated PostScript" -- these lines are read by applications
-that import PostScript.  Lines beginning with '%#' have been added to the
-sample by me for explanatory purposes.
-
-I have merged files created by the postscript terminal with no options, with
-the "eps" option and with the "enhanced" option.  The differences will be
-clearly pointed out when appropriate.
-
-Here we go.
-
-%!PS-Adobe-2.0
-%%Title: psgenh
-%%Creator: gnuplot 3.5 (pre 3.6) patchlevel beta 338
-%%CreationDate: Fri Jan 16 13:18:18 1998
-%%DocumentFonts: (atend)
-%%BoundingBox: 50 50 554 770
-%%Orientation: Landscape
-%# In 'eps' mode, the preceding two lines would look like:
-%# %%BoundingBox: 50 50 410 302
-%# %%Orientation: Portrait
-%%Pages: (atend)
-%%EndComments
-%# 
-%#  The 'dictionary' contains stuff defined by the user.
-%# 
-/gnudict 120 dict def
-gnudict begin
-%# 
-%#  The following switch toggles between color and monochromatic.
-%# 
-/Color false def
-%# 
-%#  The following switch toggles between solid and dot-dash lines.
-%# 
-/Solid false def
-%# 
-%#  The following parameter scales all linewidths in the plot.
-%# 
-/gnulinewidth 5.000 def
-/userlinewidth gnulinewidth def
-%# 
-%#  The following parameter specifies the vertical displacement of the labels
-%#  and titles (it is used in the 'show' commands defined below).  It should
-%#  be about 1/3 of the font height.
-%# 
-/vshift -46 def
-%# 
-%#  The following parameter scales the lengths of all dot-dash patterns.
-%# 
-/dl {10 mul} def
-%# 
-%#  The following two parameters scale the horizontal and vertical sizes of
-%#  the symbols used by 'plot with points'.
-%# 
-/hpt_ 31.5 def
-/vpt_ 31.5 def
-/hpt hpt_ def
-/vpt vpt_ def
-%# 
-%#  The following four commands are aliases of the four 'pen movement'
-%#  commands. Use of these aliases significantly shortens the file.  Note
-%#  that the first two are 'absolute' movements and the latter two are
-%#  'relative'.  M and R move to the specified position; L and V draw a
-%#  straight line (from the current position) to it.
-%# 
-/M {moveto} bind def
-/L {lineto} bind def
-/R {rmoveto} bind def
-/V {rlineto} bind def
-%#
-%#  These are a couple more parameters used in plotting symbols.  Why
-%#  they are here instead of up with 'hpt' and 'vpt' I know not.
-%#
-/vpt2 vpt 2 mul def
-/hpt2 hpt 2 mul def
-%# 
-%#  The 'show' command writes out a character string.  The following three
-%#  varieties do so as left-, right-, and center-justified.  [Remember,
-%#  we're still in the dictionary--the font doesn't need to be specified
-%#  until we actually use one of these.]
-%# 
-/Lshow { currentpoint stroke M
-  0 vshift R show } def
-/Rshow { currentpoint stroke M
-  dup stringwidth pop neg vshift R show } def
-/Cshow { currentpoint stroke M
-  dup stringwidth pop -2 div vshift R show } def
-%# 
-%#  The following commands define the various line types (normal, bold,
-%#  dashed, etc.) used by gnuplot.
-%# 
-%#  UP, DL, and UL are busywork commands used by others here
-%#
-/UP { dup vpt_ mul /vpt exch def hpt_ mul /hpt exch def
-  /hpt2 hpt 2 mul def /vpt2 vpt 2 mul def } def
-/DL { Color {setrgbcolor Solid {pop []} if 0 setdash }
- {pop pop pop Solid {pop []} if 0 setdash} ifelse } def
-/BL { stroke gnulinewidth 2 mul setlinewidth } def      %# twice the linewidth
-/AL { stroke gnulinewidth 2 div setlinewidth } def      %# half the linewidth
-/UL { gnulinewidth mul /userlinewidth exch def } def
-/PL { stroke userlinewidth setlinewidth } def           %# normal linewidth
-/LTb { BL [] 0 0 0 DL } def
-/LTa { AL [1 dl 2 dl] 0 setdash 0 0 0 setrgbcolor } def
-/LT0 { PL [] 0 1 0 DL } def
-/LT1 { PL [4 dl 2 dl] 0 0 1 DL } def
-%# 
-%#  ...and a bunch more.
-%#  In the LT's, the first command ('PL' for LT1) sets the linewidth,
-%#  the stuff in [...] defines the dot-dash pattern, and the three numbers
-%#  define the rgb color.
-%# 
-%#  The following commands define the symbols used to plot data points.
-%# 
-/Pnt { stroke [] 0 setdash
-   gsave 1 setlinecap M 0 0 V stroke grestore } def
-/Dia { stroke [] 0 setdash 2 copy vpt add M
-  hpt neg vpt neg V hpt vpt neg V
-  hpt vpt V hpt neg vpt V closepath stroke
-  Pnt } def
-%# 
-%#  ...and a bunch (dozens) more.
-%# 
-%#  The 'MF...' commands are used to handle the 'enhanced' syntax.  If the
-%#  'enhanced' mode is not invoked, these commands won't appear in the file.
-%# 
-/MFshow {{dup dup 0 get findfont exch 1 get scalefont setfont
-     [ currentpoint ] exch dup 2 get 0 exch rmoveto dup dup 5 get exch 4 get
-     {show} {stringwidth pop 0 rmoveto}ifelse dup 3 get
-     {2 get neg 0 exch rmoveto pop} {pop aload pop moveto}ifelse} forall} bind def
-/MFwidth {0 exch {dup 3 get{dup dup 0 get findfont exch 1 get scalefont setfont
-      5 get stringwidth pop add}
-    {pop} ifelse} forall} bind def
-/MLshow { currentpoint stroke M
-  0 exch R MFshow } bind def
-/MRshow { currentpoint stroke M
-  exch dup MFwidth neg 3 -1 roll R MFshow } def
-/MCshow { currentpoint stroke M
-  exch dup MFwidth -2 div 3 -1 roll R MFshow } def
-end
-%# 
-%#  The dictionary is now complete.  We activate it, save what went before
-%#  (the 'gsave' command saves everything on a different stack) and begin.
-%# 
-%%EndProlog
-%%Page: 1 1
-gnudict begin
-gsave
-%# 
-%#  First we position the plot on the page and scale it.
-%# 
-%#  The 'translate' command moves the origin to the specified position.
-%#  [The PostScript default origin is near the lower left-hand corner.]
-%#  The 'scale' command changes the units used in the plot.
-%#  [The PostScript default unit is the point: 72 points equal one inch.] 
-%#  The 'rotation' command rotates the coordinates clockwise through the
-%#  specified angle (degrees).
-%#  [The PostScript default orientation is profile.]
-%# 
-%#  This sample changes the orientation to landscape (the gnuplot default)
-%#  and the unit to tenths of a point.  Note that if the first two commands
-%#  were interchanged, the translation would be only five points in each
-%#  direction, instead of fifty.
-%#
-%#  If this had been generated in 'eps' mode, the "90 rotate" and "0 -5040
-%#  translate" commands would not appear and the units would be 0.050 instead
-%#  of 0.100.
-%# 
-%#  If you want to change the size or the position of the plot, this is where
-%#  to do it.
-%# 
-50 50 translate
-0.100 0.100 scale
-90 rotate
-0 -5040 translate
-0 setgray
-newpath
-%# 
-%#  Define the default font.  The number is the height.  As usual, fonts
-%#  used primarily for text have characters only about 70% the specified
-%#  height, because spacing between lines is built-in.  The Symbol font and
-%#  others that are normally not used for text produce characters that are
-%#  more nearly the specified height.  Thus if you want to intersperse, for
-%#  example, Greek and Roman letters (as you might when writing an equation),
-%#  you'll need to play with the heights of the two fonts in order for them
-%#  to look reasonably proportioned.
-%# 
-%#  The font defined here is used for the tick labels first, then the axis
-%#  labels and plot titles, and finally the key.  If you want to change the
-%#  font, simply insert the modified line after you are done with the old one
-%#  (i.e. the last 'show' command to use it) but before the new one is needed.
-%#  Note that if you change the font height, you'll also want to change the
-%#  value of 'vshift' (it's near the top of the dictionary).  I'll give an
-%#  example of this later on...
-%# 
-(Helvetica) findfont 140 scalefont setfont
-LTb
-%# 
-%#  Label and draw the ticks along the y-axis.  I've given you three
-%#  y-tics in different formats...
-%# 
-%#  The tick length is 63 units.
-%#  
-%#  This first y-tic is in 'normal' mode:
-%#
-728 560 M
-63 0 V
-6325 0 R
--63 0 V
-644 560 M
-(-10) Rshow
-%#  
-%#  This y-tic is in 'enhanced' mode:
-%#
-728 1645 M
-63 0 V
-6325 0 R
--63 0 V
- stroke
-644 1645 M
-[ [(Helvetica) 140.0 0.0 true true (-5)]
-] -46.7 MRshow
-%#
-%#  This one is in 'normal' mode, but is rotated:
-%#
-434 2730 M
-63 0 V
-6619 0 R
--63 0 V
--6759 0 R
-currentpoint gsave translate 90 rotate 0 0 M
-(0) Cshow
-grestore
-%#
-%#  Now the x-tics.  Here's one:
-%#
-728 560 M
-0 63 V
-0 4277 R
-0 -63 V
- stroke
-728 420 M
-[ [(Helvetica) 140.0 0.0 true true (-10)]
-] -46.7 MCshow
-LTb
-%# 
-%#  Now draw the left and lower axes.  Were this drawn by 'splot'
-%#  instead of 'plot', there might be some other axes drawn.
-%# 
-728 560 M
-6388 0 V
-0 4340 V
--6388 0 V
-728 560 L
- stroke
-%#  Now come labels (both for the axes and those on "set label" commands)
-%#  and other titles.  I just give you axis labels here, in 'enhanced' mode:
-%#
-140 2730 M
-currentpoint gsave translate 90 rotate 0 0 moveto
-[ [(Helvetica) 140.0 0.0 true true (ylabel)]
-] -46.7 MCshow
-grestore
-3922 210 M
-[ [(Helvetica) 140.0 0.0 true true (xlabel)]
-] -46.7 MCshow
-%#
-%#  We're finally ready to plot functions and/or data.
-%# 
-%#  The key is drawn just before the applicable data.
-%# 
-%#  Choose a line type and write the key.
-%#  In this sample, it is drawn with lines.
-%# 
-1.000 UL
-LT0
-6465 4767 M (x) Rshow       %# the function label in the key
-6549 4767 M                 %# the sample line in the key
-399 0 V
-%#
-%#  Now the data (this is drawn with some combination of absolute and
-%#  relative lineto's and moveto's):
-%#
-728 560 M
-2043 560 V
-4926 911 L
-2043 560 V
-7116 4900 L
-%#
-%#  ...and more.
-%# 
-%#  We don't need to eplicitly 'stroke' to draw the lines for each function
-%#  because the 'stroke' command is included in the line-type definition
-%#  commands.  Thus switching line types automatically 'strokes' previous
-%#  lines.  Clever program, that gnuplot...
-%# 
-%#  We can now repeat commands for the key and data for as many items
-%#  as were specified on the "plot" or "splot" command.
-%#
-%#  Here's a second function, plotted with dots:
-%#
-LT1
-6486 4486 M
-(function 2) Rshow
-6654 4486 Pnt
-%# 
-%#  The data:
-%# 
-840 911 Pnt
-2883 2030 Pnt
-4926 2590 Pnt
-6969 3710 Pnt
-%#
-%#  ...and more.
-%# 
-%#  Since we're now done, we 'stroke' the last lines, close the dictionary
-%#  and restore the previous settings (those saved by the 'gsave' at the top).
-%#  [The 'gsave'/'grestore' pair is included so that if this file is embedded
-%#  in another PostScript file, this patch won't mess up the other parts of
-%#  the picture.  It's considered good PostScript style to do this.]
-%# 
-stroke
-grestore
-end
-%# 
-%#  And, finally, we send the page to the printer.  [If we do embed this
-%#  file into another PostScript file, we'd remove this 'showpage'.  Unless,
-%#  of course, this was appended to the other file, in which case we'd
-%#  remove the 'showpage' from the end of that file.]
-%# 
-%#
-showpage
-%%Trailer
-%%DocumentFonts: Helvetica
-%%Pages: 1
diff -urN gnuplot-3.7/docs/ps/ps_guide.ps gnuplot-3.7.1/docs/ps/ps_guide.ps
--- gnuplot-3.7/docs/ps/ps_guide.ps	Thu Oct  1 11:50:16 1998
+++ gnuplot-3.7.1/docs/ps/ps_guide.ps	Thu Jan  1 01:00:00 1970
@@ -1,475 +0,0 @@
-%!PS-Adobe-2.0
-%%Creator: gnuplot, modified by Richard Crawford
-%%Pages: 2
-%%EndComments
-/gnudict 120 dict def
-gnudict begin
-
-% definitions for the character codes page:
-
-% the variable "LastColumn" determines which encoding vector is used for
-% the last (right-most) column in the display
-%    1 = ISO-Latin1 (also known as ISO-8859-1) for Unix
-%    2 = CP 437 for MS-DOS
-%    3 = CP 850 for OS/2
-/LastColumn 1 def
-
-/reEncode { findfont dup length dict begin
-            { 1 index /FID ne { def }{ pop pop } ifelse } forall
-            currentdict /CharStrings known {
-            CharStrings EncodingCheck known {
-            /Encoding EncodingVector def } if} if
-            currentdict end definefont pop } def
-
-/ISOLatin1 { /EncodingCheck /ydieresis def /EncodingVector ISOLatin1Encoding def } def
-
-/CP437 { /EncodingCheck /ydieresis def /EncodingVector [
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright
-/parenleft/parenright/asterisk/plus/comma/minus/period/slash
-/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon
-/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N
-/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright
-/asciicircum/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m
-/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde/.notdef
-/Ccedilla/udieresis/eacute/acircumflex/adieresis/agrave/aring/ccedilla
-/ecircumflex/edieresis/egrave/idieresis/icircumflex/igrave/Adieresis/Aring
-/Eacute/ae/AE/ocircumflex/odieresis/ograve/ucircumflex/ugrave
-/ydieresis/Odieresis/Udieresis/cent/sterling/yen/.notdef/florin
-/aacute/iacute/oacute/uacute/ntilde/Ntilde/ordfeminine/ordmasculine
-/questiondown/.notdef/logicalnot/onehalf/onequarter/exclamdown/guillemotleft/guillemotright
-/space/space/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/germandbls/.notdef/.notdef/.notdef/.notdef/mu/.notdef
-/.notdef/.notdef/.notdef/.notdef/infinity/.notdef/.notdef/.notdef
-/.notdef/plusminus/greaterequal/lessequal/.notdef/.notdef/divide/.notdef
-/degree/bullet/periodcentered/.notdef/nsuperior/twosuperior/.notdef
-] def } def
-
-/CP850 { /EncodingCheck /ydieresis def /EncodingVector [
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
-/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright
-/parenleft/parenright/asterisk/plus/comma/minus/period/slash
-/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon
-/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N
-/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright
-/asciicircum/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m
-/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde/.notdef
-/Ccedilla/udieresis/eacute/acircumflex/adieresis/agrave/aring/ccedilla
-/ecircumflex/edieresis/egrave/idieresis/icircumflex/igrave/Adieresis/Aring
-/Eacute/ae/AE/ocircumflex/odieresis/ograve/ucircumflex/ugrave
-/ydieresis/Odieresis/Udieresis/oslash/sterling/Oslash/multiply/florin
-/aacute/iacute/oacute/uacute/ntilde/Ntilde/ordfeminine/ordmasculine
-/questiondown/registered/logicalnot/onehalf/onequarter/exclamdown/guillemotleft/guillemotright
-/space/space/.notdef/.notdef/.notdef/Aacute/Acircumflex/Agrave
-/.notdef/.notdef/.notdef/.notdef/.notdef/cent/yen/.notdef
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/atilde/Atilde
-/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/currency
-/eth/Eth/Ecircumflex/Edieresis/Egrave/dotlessi/Iacute/Icircumflex
-/Idieresis/.notdef/.notdef/.notdef/.notdef/brokenbar/Igrave/.notdef
-/Oacute/germandbls/Ocircumflex/Ograve/otilde/Otilde/mu/thorn
-/Thorn/Uacute/Ucircumflex/Ugrave/yacute/Yacute/macron/acute
-/hyphen/plusminus/equal/threequarters/paragraph/section/divide/.notdef
-/degree/.notdef/periodcentered/onesuperior/threesuperior/twosuperior/.notdef
-] def } def
-
-/Numbs [ (040) (041) (042) (043) (044) (045) (046) (047)
-         (050) (051) (052) (053) (054) (055) (056) (057)
-         (060) (061) (062) (063) (064) (065) (066) (067)
-         (070) (071) (072) (073) (074) (075) (076) (077)
-         (100) (101) (102) (103) (104) (105) (106) (107)
-         (110) (111) (112) (113) (114) (115) (116) (117)
-         (120) (121) (122) (123) (124) (125) (126) (127)
-         (130) (131) (132) (133) (134) (135) (136) (137)
-         (140) (141) (142) (143) (144) (145) (146) (147)
-         (150) (151) (152) (153) (154) (155) (156) (157)
-         (160) (161) (162) (163) (164) (165) (166) (167)
-         (170) (171) (172) (173) (174) (175) (176)
-         (220) (221) (222) (223) (224) (225) (226) (227)
-         (230)       (232) (233)       (235) (236) (237)
-         (240) (241) (242) (243) (244) (245) (246) (247)
-         (250) (251) (252) (253) (254) (255) (256) (257)
-         (260) (261) (262) (263) (264) (265) (266) (267)
-         (270) (271) (272) (273) (274) (275) (276) (277)
-         (300) (301) (302) (303) (304) (305) (306) (307)
-         (310) (311) (312) (313) (314) (315) (316) (317)
-         (320) (321) (322) (323) (324) (325) (326) (327)
-         (330) (331) (332) (333) (334) (335) (336) (337)
-         (340) (341) (342) (343) (344) (345) (346) (347)
-         (350) (351) (352) (353) (354) (355) (356) (357)
-         (360) (361) (362) (363) (364) (365) (366) (367)
-         (370) (371) (372) (373) (374) (375) (376) (377) ] def
-/Codes [ (\040) (\041) (\042) (\043) (\044) (\045) (\046) (\047)
-         (\050) (\051) (\052) (\053) (\054) (\055) (\056) (\057)
-         (\060) (\061) (\062) (\063) (\064) (\065) (\066) (\067)
-         (\070) (\071) (\072) (\073) (\074) (\075) (\076) (\077)
-         (\100) (\101) (\102) (\103) (\104) (\105) (\106) (\107)
-         (\110) (\111) (\112) (\113) (\114) (\115) (\116) (\117)
-         (\120) (\121) (\122) (\123) (\124) (\125) (\126) (\127)
-         (\130) (\131) (\132) (\133) (\134) (\135) (\136) (\137)
-         (\140) (\141) (\142) (\143) (\144) (\145) (\146) (\147)
-         (\150) (\151) (\152) (\153) (\154) (\155) (\156) (\157)
-         (\160) (\161) (\162) (\163) (\164) (\165) (\166) (\167)
-         (\170) (\171) (\172) (\173) (\174) (\175) (\176)
-         (\220) (\221) (\222) (\223) (\224) (\225) (\226) (\227)
-         (\230)        (\232) (\233)        (\235) (\236) (\237)
-         (\240) (\241) (\242) (\243) (\244) (\245) (\246) (\247)
-         (\250) (\251) (\252) (\253) (\254) (\255) (\256) (\257)
-         (\260) (\261) (\262) (\263) (\264) (\265) (\266) (\267)
-         (\270) (\271) (\272) (\273) (\274) (\275) (\276) (\277)
-         (\300) (\301) (\302) (\303) (\304) (\305) (\306) (\307)
-         (\310) (\311) (\312) (\313) (\314) (\315) (\316) (\317)
-         (\320) (\321) (\322) (\323) (\324) (\325) (\326) (\327)
-         (\330) (\331) (\332) (\333) (\334) (\335) (\336) (\337)
-         (\340) (\341) (\342) (\343) (\344) (\345) (\346) (\347)
-         (\350) (\351) (\352) (\353) (\354) (\355) (\356) (\357)
-         (\360) (\361) (\362) (\363) (\364) (\365) (\366) (\367)
-         (\370) (\371) (\372) (\373) (\374) (\375) (\376) (\377) ] def
-/Doit { 0 1 204 { /Ind exch def                   % stores the index
-		  /Col Ind 41 idiv def            % column number
-		  /Row Ind Col 41 mul sub def     % row number
-		  Col 1.60 mul dX add Row -.225 mul moveto
-		  Sym Ind get show
-      } for } def
-
-% definitions for the enhanced syntax page:
-
-/Color false def
-/Solid false def
-/gnulinewidth 5.000 def
-/vshift -40 def
-/M {moveto} bind def
-/L {lineto} bind def
-/R {rmoveto} bind def
-/V {rlineto} bind def
-/Lshow { currentpoint stroke M
-  0 vshift R show } def
-/Rshow { currentpoint stroke M
-  dup stringwidth pop neg vshift R show } def
-/Cshow { currentpoint stroke M
-  dup stringwidth pop -2 div vshift R show } def
-/DL { Color {setrgbcolor Solid {pop []} if 0 setdash }
- {pop pop pop Solid {pop []} if 0 setdash} ifelse } def
-/MFshow {{dup dup 0 get findfont exch 1 get scalefont setfont
-     [ currentpoint ] exch dup 2 get 0 exch rmoveto dup dup 5 get exch 4 get
-     {show} {stringwidth pop 0 rmoveto}ifelse dup 3 get
-     {2 get neg 0 exch rmoveto pop} {pop aload pop moveto}ifelse} forall} bind def
-/MFwidth {0 exch {dup 3 get{dup dup 0 get findfont exch 1 get scalefont setfont
-      5 get stringwidth pop add}
-    {pop} ifelse} forall} bind def
-/MLshow { currentpoint stroke M
-  0 exch R MFshow } bind def
-/MRshow { currentpoint stroke M
-  exch dup MFwidth neg 3 -1 roll R MFshow } def
-/MCshow { currentpoint stroke M
-  exch dup MFwidth -2 div 3 -1 roll R MFshow } def
-
-end
-%%EndProlog
-%%Page: 1
-gnudict begin
-gsave
-50 50 translate
-0.100 0.100 scale
-0 setgray
-newpath
-(Times-Roman) findfont 120 scalefont setfont
-gnulinewidth 2 mul setlinewidth [] 0 0 0 DL
-2525 7080 M
-[ [(Times-Roman) 160.0 0.0 true true (Syntax for )]
-[(Times-Bold) 160.0 0.0 true true (postscript enhanced)]
-[(Times-Roman) 160.0 0.0 true true ( option)]
-] -53.3 MCshow
-2525 6804 M
-[ [(Times-Bold) 120.0 0.0 true true (enhpost)]
-[(Times-Roman) 120.0 0.0 true true ( is the product of David Denholm and Matt Heffron.)]
-] -40.0 MCshow
-2525 6597 M
-[ [(Times-Roman) 120.0 0.0 true true (This guide is the product of Dick Crawford.)]
-] -40.0 MCshow
-3679 6321 M
-[ [(Times-Roman) 120.0 0.0 true true (text)]
-] -40.0 MCshow
-4602 6321 M
-[ [(Times-Roman) 120.0 0.0 true true (result)]
-] -40.0 MCshow
-2755 6045 M
-[ [(Times-Roman) 120.0 0.0 true true (Superscripts are denoted by ^:)]
-] -40.0 MRshow
-3679 6045 M
-[ [(Times-Roman) 120.0 0.0 true true ('10^{-2}')]
-] -40.0 MCshow
-4602 6045 M
-[ [(Times-Roman) 120.0 0.0 true true (10)]
-[(Times-Roman) 96.0 60.0 true true (-2)]
-] -52.0 MCshow
-2755 5838 M
-[ [(Times-Roman) 120.0 0.0 true true (Subscripts are denoted by _:)]
-] -40.0 MRshow
-3679 5838 M
-[ [(Times-Roman) 120.0 0.0 true true ('A_{j,k}')]
-] -40.0 MCshow
-4602 5838 M
-[ [(Times-Roman) 120.0 0.0 true true (A)]
-[(Times-Roman) 96.0 -36.0 true true (j,k)]
-] -28.0 MCshow
-2755 5631 M
-[ [(Times-Roman) 120.0 0.0 true true (Braces are not needed for single characters:)]
-] -40.0 MRshow
-3679 5631 M
-[ [(Times-Roman) 120.0 0.0 true true ('e^x')]
-] -40.0 MCshow
-4602 5631 M
-[ [(Times-Roman) 120.0 0.0 true true (e)]
-[(Times-Roman) 96.0 60.0 true true (x)]
-] -52.0 MCshow
-2755 5286 M
-[ [(Times-Roman) 120.0 0.0 true true (Use @ to align sub- and superscripts:)]
-] -40.0 MRshow
-3679 5286 M
-[ [(Times-Roman) 120.0 0.0 true true ('x@^2_k')]
-] -40.0 MCshow
-4602 5286 M
-[ [(Times-Roman) 120.0 0.0 true true (x)]
-[(Times-Roman) 96.0 60.0 false true (2)]
-[(Times-Roman) 96.0 -36.0 true true (k)]
-] -40.0 MCshow
-2755 5079 M
-[ [(Times-Roman) 120.0 0.0 true true (Put the shorter of the two first:)]
-] -40.0 MRshow
-3679 5079 M
-[ [(Times-Roman) 120.0 0.0 true true ('x@_0^{-3/2}y')]
-] -40.0 MCshow
-4602 5079 M
-[ [(Times-Roman) 120.0 0.0 true true (x)]
-[(Times-Roman) 96.0 -36.0 false true (0)]
-[(Times-Roman) 96.0 60.0 true true (-3/2)]
-[(Times-Roman) 120.0 0.0 true true (y)]
-] -40.0 MCshow
-2755 4872 M
-[ [(Times-Roman) 120.0 0.0 true true (...rather than:)]
-] -40.0 MRshow
-3679 4872 M
-[ [(Times-Roman) 120.0 0.0 true true ('x@^{-3/2}_0y')]
-] -40.0 MCshow
-4602 4872 M
-[ [(Times-Roman) 120.0 0.0 true true (x)]
-[(Times-Roman) 96.0 60.0 false true (-3/2)]
-[(Times-Roman) 96.0 -36.0 true true (0)]
-[(Times-Roman) 120.0 0.0 true true (y)]
-] -40.0 MCshow
-2755 4527 M
-[ [(Times-Roman) 120.0 0.0 true true (Font changes are enclosed in braces:)]
-] -40.0 MRshow
-3679 4527 M
-[ [(Times-Roman) 120.0 0.0 true true ('{/Helvetica m}')]
-] -40.0 MCshow
-4602 4527 M
-[ [(Helvetica) 120.0 0.0 true true (m)]
-] -40.0 MCshow
-2755 4320 M
-[ [(Times-Roman) 120.0 0.0 true true (...size, too:)]
-] -40.0 MRshow
-3679 4320 M
-[ [(Times-Roman) 120.0 0.0 true true ('{/=8 m}')]
-] -40.0 MCshow
-4602 4320 M
-[ [(Times-Roman) 80.0 0.0 true true (m)]
-] -40.0 MCshow
-2755 4113 M
-[ [(Times-Roman) 120.0 0.0 true true (...or both:)]
-] -40.0 MRshow
-3679 4113 M
-[ [(Times-Roman) 120.0 0.0 true true ('{/Helvetica=18 m}')]
-] -40.0 MCshow
-4602 4113 M
-[ [(Helvetica) 180.0 0.0 true true (m)]
-] -60.0 MCshow
-2755 3768 M
-[ [(Times-Roman) 120.0 0.0 true true (Characters can be specified by code:)]
-] -40.0 MRshow
-3679 3768 M
-[ [(Times-Roman) 120.0 0.0 true true ('{\\120}')]
-] -40.0 MCshow
-4602 3768 M
-[ [(Times-Roman) 120.0 0.0 true true (\120)]
-] -40.0 MCshow
-2755 3562 M
-[ [(Times-Roman) 120.0 0.0 true true (...which is how to get nonkeyboard characters:)]
-] -40.0 MRshow
-3679 3562 M
-[ [(Times-Roman) 120.0 0.0 true true ('{\\267}')]
-] -40.0 MCshow
-4602 3562 M
-[ [(Times-Roman) 120.0 0.0 true true (\267)]
-] -40.0 MCshow
-2755 3355 M
-[ [(Times-Roman) 120.0 0.0 true true (Use keyboard characters or codes for other fonts:)]
-] -40.0 MRshow
-3679 3355 M
-[ [(Times-Roman) 120.0 0.0 true true ('{/Symbol p\\271 22/7}')]
-] -40.0 MCshow
-4602 3355 M
-[ [(Symbol) 120.0 0.0 true true (p\271 22/7)]
-] -40.0 MCshow
-2755 3010 M
-[ [(Times-Roman) 120.0 0.0 true true (Everything outside braces is in the default font:)]
-] -40.0 MRshow
-3679 3010 M
-[ [(Times-Roman) 120.0 0.0 true true ('P = {/Symbol r}kT')]
-] -40.0 MCshow
-4602 3010 M
-[ [(Times-Roman) 120.0 0.0 true true (P = )]
-[(Symbol) 120.0 0.0 true true (r)]
-[(Times-Roman) 120.0 0.0 true true (kT)]
-] -40.0 MCshow
-2755 2665 M
-[ [(Times-Roman) 120.0 0.0 true true (Space of a given size can be inserted with &:)]
-] -40.0 MRshow
-3679 2665 M
-[ [(Times-Roman) 120.0 0.0 true true ('<junk>')]
-] -40.0 MCshow
-4602 2665 M
-[ [(Times-Roman) 120.0 0.0 true true (<junk>)]
-] -40.0 MCshow
-3679 2458 M
-[ [(Times-Roman) 120.0 0.0 true true ('<&{junk}>')]
-] -40.0 MCshow
-4602 2458 M
-[ [(Times-Roman) 120.0 0.0 true true (<)]
-[(Times-Roman) 120.0 0.0 true false (junk)]
-[(Times-Roman) 120.0 0.0 true true (>)]
-] -40.0 MCshow
-2755 2113 M
-[ [(Times-Roman) 120.0 0.0 true true (Special characters \(^,_,{,},@,&,\\\) can be escaped by \\:)]
-] -40.0 MRshow
-3679 2113 M
-[ [(Times-Roman) 120.0 0.0 true true ('f\\{x,y\\}')]
-] -40.0 MCshow
-4602 2113 M
-[ [(Times-Roman) 120.0 0.0 true true (f{x,y})]
-] -40.0 MCshow
-2755 1906 M
-[ [(Times-Roman) 120.0 0.0 true true (...or \\\\ if within a double-quoted string:)]
-] -40.0 MRshow
-3679 1906 M
-[ [(Times-Roman) 120.0 0.0 true true ("f\\\\{x,y\\\\}")]
-] -40.0 MCshow
-4602 1906 M
-[ [(Times-Roman) 120.0 0.0 true true (f{x,y})]
-] -40.0 MCshow
-216 1630 M
-[ [(Times-Roman) 120.0 0.0 true true (Everything can be done recursively:)]
-] -40.0 MLshow
-216 1423 M
-[ [(Times-Roman) 120.0 0.0 true true (the text)]
-] -40.0 MLshow
-2755 1423 M
-[ [(Times-Roman) 120.0 0.0 true true ('{/Symbol=18 \\362@_{/=9.6 0}^{/=12 \\245}})]
-] -40.0 MCshow
-2755 1216 M
-[ [(Times-Roman) 120.0 0.0 true true ({/Helvetica e^{-{/Symbol m}^2/2} d}{/Symbol m = \(p/2\)^{1/2}}')]
-] -40.0 MCshow
-216 1009 M
-[ [(Times-Roman) 120.0 0.0 true true (produces the result:)]
-] -40.0 MLshow
-2755 1009 M
-[ [(Symbol) 180.0 0.0 true true (\362)]
-[(Symbol) 96.0 -54.0 false true (0)]
-[(Symbol) 120.0 90.0 true true (\245)]
-[(Helvetica) 120.0 0.0 true true (e)]
-[(Helvetica) 96.0 60.0 true true (-)]
-[(Symbol) 96.0 60.0 true true (m)]
-[(Helvetica) 76.8 108.0 true true (2)]
-[(Helvetica) 96.0 60.0 true true (/2)]
-[(Helvetica) 120.0 0.0 true true ( d)]
-[(Symbol) 120.0 0.0 true true (m = \(p/2\))]
-[(Symbol) 96.0 60.0 true true (1/2)]
-] -60.0 MCshow
-216 802 M
-[ [(Times-Roman) 120.0 0.0 true true (Note how font sizes and definitions are preserved across pairs of braces.)]
-] -40.0 MLshow
-216 388 M
-[ [(Times-Roman) 120.0 0.0 true true (The default font for this page is /Times-Roman=12.  These and other options may be changed)]
-] -40.0 MLshow
-216 250 M
-[ [(Times-Roman) 120.0 0.0 true true (on the command )]
-[(Times-Bold) 120.0 0.0 true true (set terminal postscript)]
-[(Times-Roman) 120.0 0.0 true true (.  See the manual or )]
-[(Times-Bold) 120.0 0.0 true true (help postscript)]
-[(Times-Roman) 120.0 0.0 true true ( for details.)]
-] -40.0 MLshow
-gnulinewidth setlinewidth [] 0 1 0 DL
-stroke
-showpage grestore
-
-%%Page: 2
-% Character code page
-
-gsave
-72 72 scale 1.0 10.5 translate 0 0 moveto
-/Times-Roman findfont .225 scalefont setfont
-/Title (PostScript Character Codes) def
-Title stringwidth pop -2 div
-3.2 add 0 rmoveto Title show
-/Times-Roman findfont .20 scalefont setfont
-0 -.25 translate 0 0 moveto
-/Extra LastColumn 1 eq {(ISO Latin-1)} if
-       LastColumn 2 eq {(CP437)} if
-       LastColumn 3 eq {(CP850)} if def
-/H (T = text (here Times-Roman)    S = Symbol    Z = ZapfDingbats    E = ) def
-H stringwidth pop Extra stringwidth pop add
-( encoding) stringwidth pop add -2 div
-3.2 add 0 rmoveto H show Extra show ( encoding) show
-/H ((the "E" character set is accessed via an option on "set encoding" )) def
-H stringwidth pop -2 div 3.2 add -.20 moveto H show
--.6 -.5 translate
-0 1 4 { 1.60 mul /X0 exch def X0 .375 add 0 moveto (T) show
-        X0 .625 add 0 moveto (S) show X0 .875 add 0 moveto
-        (Z) show  X0 1.125 add 0 moveto (E) show } for
-0 -.25 translate
-% first subcolumn: ACSII code
-/Times-Roman findfont .175 scalefont setfont
-/dX 0 def          % subcolumn offset
-/Sym Numbs def     % item to be printed
-Doit
-% second subcolumn: Times-Roman
-/Times-Roman findfont .175 scalefont setfont
-/dX .375 def       % subcolumn offset
-/Sym Codes def     % item to be printed
-Doit
-% third subcolumn: Symbol
-/Symbol findfont .175 scalefont setfont
-/dX .625 def       % subcolumn offset
-/Sym Codes def     % item to be printed
-Doit
-% fourth subcolumn: ZapfDingbats
-/ZapfDingbats findfont .175 scalefont setfont
-/dX .875 def       % subcolumn offset
-/Sym Codes def     % item to be printed
-Doit
-% fifth subcolumn: selected by "LastColumn"
-LastColumn 1 eq { % Times-Roman with ISO Latin-1 encoding
-                  /TRISOL1 ISOLatin1 /Times-Roman reEncode
-                  /TRISOL1 findfont .175 scalefont setfont } if
-LastColumn 2 eq { % subcolumn: Times-Roman with CP 437 encoding
-                  /TRCP437 CP437 /Times-Roman reEncode
-                  /TRCP437 findfont .175 scalefont setfont } if
-LastColumn 3 eq { % Times-Roman with CP 850 encoding
-                  /TRCP850 CP850 /Times-Roman reEncode
-                  /TRCP850 findfont .175 scalefont setfont } if
-/dX 1.125 def      % subcolumn offset
-/Sym Codes def     % item to be printed
-Doit
-showpage
-grestore end
diff -urN gnuplot-3.7/docs/ps/ps_symbols.gpi gnuplot-3.7.1/docs/ps/ps_symbols.gpi
--- gnuplot-3.7/docs/ps/ps_symbols.gpi	Tue Aug 18 17:31:11 1998
+++ gnuplot-3.7.1/docs/ps/ps_symbols.gpi	Thu Jan  1 01:00:00 1970
@@ -1,40 +0,0 @@
-set terminal postscript; set output 'ps_symbols.ps'
-set noborder; set nozeroaxis; set noxtics; set noytics
-set xlabel ''; set ylabel ''; set nokey; set size square;
-set xrange [-1.2:1.2]; set yrange [-1.2:1.2]; set parametric; set samples 2
-f(x)=cos(pi*x/38.0); g(x)=sin(pi*x/38.0)
-set label '(#70--75 are opaque)' at 0,0 center
-set label  '0' at  1.07*f(0),  1.07*g(0) center
-set label '10' at  1.07*f(10), 1.07*g(10) center
-set label '20' at  1.07*f(20), 1.07*g(20) center
-set label '30' at  1.07*f(30), 1.07*g(30) center
-set label '40' at  1.07*f(40), 1.07*g(40) center
-set label '50' at  1.07*f(50), 1.07*g(50) center
-set label '60' at  1.07*f(60), 1.07*g(60) center
-set label '70' at  1.07*f(70), 1.07*g(70) center
-plot f( 0),g( 0) w p 0  0,\
- f( 1),g( 1) w p 0  1,  f( 2),g( 2) w p 0  2,  f( 3),g( 3) w p 0  3,\
- f( 4),g( 4) w p 0  4,  f( 5),g( 5) w p 0  5,  f( 6),g( 6) w p 0  6,\
- f( 7),g( 7) w p 0  7,  f( 8),g( 8) w p 0  8,  f( 9),g( 9) w p 0  9,\
- f(10),g(10) w p 0 10,  f(11),g(11) w p 0 11,  f(12),g(12) w p 0 12,\
- f(13),g(13) w p 0 13,  f(14),g(14) w p 0 14,  f(15),g(15) w p 0 15,\
- f(16),g(16) w p 0 16,  f(17),g(17) w p 0 17,  f(18),g(18) w p 0 18,\
- f(19),g(19) w p 0 19,  f(20),g(20) w p 0 20,  f(21),g(21) w p 0 21,\
- f(22),g(22) w p 0 22,  f(23),g(23) w p 0 23,  f(24),g(24) w p 0 24,\
- f(25),g(25) w p 0 25,  f(26),g(26) w p 0 26,  f(27),g(27) w p 0 27,\
- f(28),g(28) w p 0 28,  f(29),g(29) w p 0 29,  f(30),g(30) w p 0 30,\
- f(31),g(31) w p 0 31,  f(32),g(32) w p 0 32,  f(33),g(33) w p 0 33,\
- f(34),g(34) w p 0 34,  f(35),g(35) w p 0 35,  f(36),g(36) w p 0 36,\
- f(37),g(37) w p 0 37,  f(38),g(38) w p 0 38,  f(39),g(39) w p 0 39,\
- f(40),g(40) w p 0 40,  f(41),g(41) w p 0 41,  f(42),g(42) w p 0 42,\
- f(43),g(43) w p 0 43,  f(44),g(44) w p 0 44,  f(45),g(45) w p 0 45,\
- f(46),g(46) w p 0 46,  f(47),g(47) w p 0 47,  f(48),g(48) w p 0 48,\
- f(49),g(49) w p 0 49,  f(50),g(50) w p 0 50,  f(51),g(51) w p 0 51,\
- f(52),g(52) w p 0 52,  f(53),g(53) w p 0 53,  f(54),g(54) w p 0 54,\
- f(55),g(55) w p 0 55,  f(56),g(56) w p 0 56,  f(57),g(57) w p 0 57,\
- f(58),g(58) w p 0 58,  f(59),g(59) w p 0 59,  f(60),g(60) w p 0 60,\
- f(61),g(61) w p 0 61,  f(62),g(62) w p 0 62,  f(63),g(63) w p 0 63,\
- f(64),g(64) w p 0 64,  f(65),g(65) w p 0 65,  f(66),g(66) w p 0 66,\
- f(67),g(67) w p 0 67,  f(68),g(68) w p 0 68,  f(69),g(69) w p 0 69,\
- f(70),g(70) w p 0 70,  f(71),g(71) w p 0 71,  f(72),g(72) w p 0 72,\
- f(73),g(73) w p 0 73,  f(74),g(74) w p 0 74,  f(75),g(75) w p 0 75
diff -urN gnuplot-3.7/docs/psdoc/Makefile gnuplot-3.7.1/docs/psdoc/Makefile
--- gnuplot-3.7/docs/psdoc/Makefile	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/docs/psdoc/Makefile	Thu Aug 19 15:22:08 1999
@@ -0,0 +1,20 @@
+#
+# Create ps_symbols.ps
+#
+
+top_srcdir=../..
+
+all: ps_symbols.ps
+
+ps_symbols.ps: ps_symbols.gpi
+	@if test -f $(top_srcdir)/gnuplot ; then \
+		$(top_srcdir)/gnuplot ps_symbols.gpi ; \
+	else \
+		gnuplot ps_symbols.gpi ; \
+	fi
+
+clean:
+	-rm -f ps_symbols.ps
+
+distclean: clean
+
diff -urN gnuplot-3.7/docs/psdoc/README gnuplot-3.7.1/docs/psdoc/README
--- gnuplot-3.7/docs/psdoc/README	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/docs/psdoc/README	Thu Aug 19 15:22:09 1999
@@ -0,0 +1,21 @@
+This set of files contains information about the gnuplot-PostScript interface.
+
+ps_file.doc
+  is a discussion of a PostScript file as written by gnuplot.
+
+ps_guide.ps
+  is a PostScript file that has two pages.  The first is a summary of the
+  enhanced syntax (available via "set terminal postscript enhanced".  The
+  second is a table of the character codes.  The table has the standard
+  encoding (shown in Times-Roman), the Symbol and Zapf-Dingbats fonts, and
+  the ISO-Latin1 (also known as ISO-8859-1) encoding.  The last entry may
+  be changed to CP850 (for OS/2) or CP437 (for MS-DOS) by editing line #14
+  in the file.  These non-standard encodings are selected via the "set
+  encoding" command.
+
+ps_symbols.gpi
+  is a gnuplot command file that generates ps_symbols. ps.ps_symbols.ps
+  is a PostScript file that shows a simple display of the 76 symbol types
+  available to the "postscript" terminal and selectable via the "pt" option
+  on the "plot" command.
+
diff -urN gnuplot-3.7/docs/psdoc/ps_file.doc gnuplot-3.7.1/docs/psdoc/ps_file.doc
--- gnuplot-3.7/docs/psdoc/ps_file.doc	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/docs/psdoc/ps_file.doc	Thu Aug 19 15:22:09 1999
@@ -0,0 +1,360 @@
+A short guide to PostScript files created by gnuplot's "postscript" terminal
+
+by Dick Crawford, aka rccrawford@lanl.gov
+
+Before we begin, let me say a few words about PostScript.  It is highly ver-
+satile, but with versatility comes complexity.  Syntax is extremely important;
+a misplaced command can do unexpected things.  Thus the adventurous soul who
+wishes to alter the PostScript but has not been initiated into the arcana of
+PostScript would be well-advised to change only those items (like numerical
+values, font names or heights, or the letters defining symbols) that are
+fairly obvious as to their meaning.
+
+PostScript is stack-oriented and works in Reverse Polish notation:
+'a b add' takes 'a' and 'b' off of the stack and replaces them with 'a+b'.
+
+The 'stroke' command actually draws lines on the page.  It uses whatever line
+width and style are currently defined.  Thus if we specify a bunch of commands
+like 'LT1 1 2 moveto 3 4 lineto LT3 stroke' [LT1 and LT3 are line type defi-
+nitions, 'x y moveto' moves the (virtual) pen to (x,y) and 'x y lineto' draws
+a line from wherever the pen was to (x,y)], the line connecting points (1,2)
+and (3,4) will be in type LT3.
+
+PostScript is case-sensitive.
+
+The sample file below has been pruned of repeated commands, just to keep its
+length down.  Comment lines begin with '%'.  Lines beginning with '%%' are
+inserted for "encapsulated PostScript" -- these lines are read by applications
+that import PostScript.  Lines beginning with '%#' have been added to the
+sample by me for explanatory purposes.
+
+I have merged files created by the postscript terminal with no options, with
+the "eps" option and with the "enhanced" option.  The differences will be
+clearly pointed out when appropriate.
+
+Here we go.
+
+%!PS-Adobe-2.0
+%%Title: psgenh
+%%Creator: gnuplot 3.5 (pre 3.6) patchlevel beta 338
+%%CreationDate: Fri Jan 16 13:18:18 1998
+%%DocumentFonts: (atend)
+%%BoundingBox: 50 50 554 770
+%%Orientation: Landscape
+%# In 'eps' mode, the preceding two lines would look like:
+%# %%BoundingBox: 50 50 410 302
+%# %%Orientation: Portrait
+%%Pages: (atend)
+%%EndComments
+%# 
+%#  The 'dictionary' contains stuff defined by the user.
+%# 
+/gnudict 120 dict def
+gnudict begin
+%# 
+%#  The following switch toggles between color and monochromatic.
+%# 
+/Color false def
+%# 
+%#  The following switch toggles between solid and dot-dash lines.
+%# 
+/Solid false def
+%# 
+%#  The following parameter scales all linewidths in the plot.
+%# 
+/gnulinewidth 5.000 def
+/userlinewidth gnulinewidth def
+%# 
+%#  The following parameter specifies the vertical displacement of the labels
+%#  and titles (it is used in the 'show' commands defined below).  It should
+%#  be about 1/3 of the font height.
+%# 
+/vshift -46 def
+%# 
+%#  The following parameter scales the lengths of all dot-dash patterns.
+%# 
+/dl {10 mul} def
+%# 
+%#  The following two parameters scale the horizontal and vertical sizes of
+%#  the symbols used by 'plot with points'.
+%# 
+/hpt_ 31.5 def
+/vpt_ 31.5 def
+/hpt hpt_ def
+/vpt vpt_ def
+%# 
+%#  The following four commands are aliases of the four 'pen movement'
+%#  commands. Use of these aliases significantly shortens the file.  Note
+%#  that the first two are 'absolute' movements and the latter two are
+%#  'relative'.  M and R move to the specified position; L and V draw a
+%#  straight line (from the current position) to it.
+%# 
+/M {moveto} bind def
+/L {lineto} bind def
+/R {rmoveto} bind def
+/V {rlineto} bind def
+%#
+%#  These are a couple more parameters used in plotting symbols.  Why
+%#  they are here instead of up with 'hpt' and 'vpt' I know not.
+%#
+/vpt2 vpt 2 mul def
+/hpt2 hpt 2 mul def
+%# 
+%#  The 'show' command writes out a character string.  The following three
+%#  varieties do so as left-, right-, and center-justified.  [Remember,
+%#  we're still in the dictionary--the font doesn't need to be specified
+%#  until we actually use one of these.]
+%# 
+/Lshow { currentpoint stroke M
+  0 vshift R show } def
+/Rshow { currentpoint stroke M
+  dup stringwidth pop neg vshift R show } def
+/Cshow { currentpoint stroke M
+  dup stringwidth pop -2 div vshift R show } def
+%# 
+%#  The following commands define the various line types (normal, bold,
+%#  dashed, etc.) used by gnuplot.
+%# 
+%#  UP, DL, and UL are busywork commands used by others here
+%#
+/UP { dup vpt_ mul /vpt exch def hpt_ mul /hpt exch def
+  /hpt2 hpt 2 mul def /vpt2 vpt 2 mul def } def
+/DL { Color {setrgbcolor Solid {pop []} if 0 setdash }
+ {pop pop pop Solid {pop []} if 0 setdash} ifelse } def
+/BL { stroke gnulinewidth 2 mul setlinewidth } def      %# twice the linewidth
+/AL { stroke gnulinewidth 2 div setlinewidth } def      %# half the linewidth
+/UL { gnulinewidth mul /userlinewidth exch def } def
+/PL { stroke userlinewidth setlinewidth } def           %# normal linewidth
+/LTb { BL [] 0 0 0 DL } def
+/LTa { AL [1 dl 2 dl] 0 setdash 0 0 0 setrgbcolor } def
+/LT0 { PL [] 0 1 0 DL } def
+/LT1 { PL [4 dl 2 dl] 0 0 1 DL } def
+%# 
+%#  ...and a bunch more.
+%#  In the LT's, the first command ('PL' for LT1) sets the linewidth,
+%#  the stuff in [...] defines the dot-dash pattern, and the three numbers
+%#  define the rgb color.
+%# 
+%#  The following commands define the symbols used to plot data points.
+%# 
+/Pnt { stroke [] 0 setdash
+   gsave 1 setlinecap M 0 0 V stroke grestore } def
+/Dia { stroke [] 0 setdash 2 copy vpt add M
+  hpt neg vpt neg V hpt vpt neg V
+  hpt vpt V hpt neg vpt V closepath stroke
+  Pnt } def
+%# 
+%#  ...and a bunch (dozens) more.
+%# 
+%#  The 'MF...' commands are used to handle the 'enhanced' syntax.  If the
+%#  'enhanced' mode is not invoked, these commands won't appear in the file.
+%# 
+/MFshow {{dup dup 0 get findfont exch 1 get scalefont setfont
+     [ currentpoint ] exch dup 2 get 0 exch rmoveto dup dup 5 get exch 4 get
+     {show} {stringwidth pop 0 rmoveto}ifelse dup 3 get
+     {2 get neg 0 exch rmoveto pop} {pop aload pop moveto}ifelse} forall} bind def
+/MFwidth {0 exch {dup 3 get{dup dup 0 get findfont exch 1 get scalefont setfont
+      5 get stringwidth pop add}
+    {pop} ifelse} forall} bind def
+/MLshow { currentpoint stroke M
+  0 exch R MFshow } bind def
+/MRshow { currentpoint stroke M
+  exch dup MFwidth neg 3 -1 roll R MFshow } def
+/MCshow { currentpoint stroke M
+  exch dup MFwidth -2 div 3 -1 roll R MFshow } def
+end
+%# 
+%#  The dictionary is now complete.  We activate it, save what went before
+%#  (the 'gsave' command saves everything on a different stack) and begin.
+%# 
+%%EndProlog
+%%Page: 1 1
+gnudict begin
+gsave
+%# 
+%#  First we position the plot on the page and scale it.
+%# 
+%#  The 'translate' command moves the origin to the specified position.
+%#  [The PostScript default origin is near the lower left-hand corner.]
+%#  The 'scale' command changes the units used in the plot.
+%#  [The PostScript default unit is the point: 72 points equal one inch.] 
+%#  The 'rotation' command rotates the coordinates clockwise through the
+%#  specified angle (degrees).
+%#  [The PostScript default orientation is profile.]
+%# 
+%#  This sample changes the orientation to landscape (the gnuplot default)
+%#  and the unit to tenths of a point.  Note that if the first two commands
+%#  were interchanged, the translation would be only five points in each
+%#  direction, instead of fifty.
+%#
+%#  If this had been generated in 'eps' mode, the "90 rotate" and "0 -5040
+%#  translate" commands would not appear and the units would be 0.050 instead
+%#  of 0.100.
+%# 
+%#  If you want to change the size or the position of the plot, this is where
+%#  to do it.
+%# 
+50 50 translate
+0.100 0.100 scale
+90 rotate
+0 -5040 translate
+0 setgray
+newpath
+%# 
+%#  Define the default font.  The number is the height.  As usual, fonts
+%#  used primarily for text have characters only about 70% the specified
+%#  height, because spacing between lines is built-in.  The Symbol font and
+%#  others that are normally not used for text produce characters that are
+%#  more nearly the specified height.  Thus if you want to intersperse, for
+%#  example, Greek and Roman letters (as you might when writing an equation),
+%#  you'll need to play with the heights of the two fonts in order for them
+%#  to look reasonably proportioned.
+%# 
+%#  The font defined here is used for the tick labels first, then the axis
+%#  labels and plot titles, and finally the key.  If you want to change the
+%#  font, simply insert the modified line after you are done with the old one
+%#  (i.e. the last 'show' command to use it) but before the new one is needed.
+%#  Note that if you change the font height, you'll also want to change the
+%#  value of 'vshift' (it's near the top of the dictionary).  I'll give an
+%#  example of this later on...
+%# 
+(Helvetica) findfont 140 scalefont setfont
+LTb
+%# 
+%#  Label and draw the ticks along the y-axis.  I've given you three
+%#  y-tics in different formats...
+%# 
+%#  The tick length is 63 units.
+%#  
+%#  This first y-tic is in 'normal' mode:
+%#
+728 560 M
+63 0 V
+6325 0 R
+-63 0 V
+644 560 M
+(-10) Rshow
+%#  
+%#  This y-tic is in 'enhanced' mode:
+%#
+728 1645 M
+63 0 V
+6325 0 R
+-63 0 V
+ stroke
+644 1645 M
+[ [(Helvetica) 140.0 0.0 true true (-5)]
+] -46.7 MRshow
+%#
+%#  This one is in 'normal' mode, but is rotated:
+%#
+434 2730 M
+63 0 V
+6619 0 R
+-63 0 V
+-6759 0 R
+currentpoint gsave translate 90 rotate 0 0 M
+(0) Cshow
+grestore
+%#
+%#  Now the x-tics.  Here's one:
+%#
+728 560 M
+0 63 V
+0 4277 R
+0 -63 V
+ stroke
+728 420 M
+[ [(Helvetica) 140.0 0.0 true true (-10)]
+] -46.7 MCshow
+LTb
+%# 
+%#  Now draw the left and lower axes.  Were this drawn by 'splot'
+%#  instead of 'plot', there might be some other axes drawn.
+%# 
+728 560 M
+6388 0 V
+0 4340 V
+-6388 0 V
+728 560 L
+ stroke
+%#  Now come labels (both for the axes and those on "set label" commands)
+%#  and other titles.  I just give you axis labels here, in 'enhanced' mode:
+%#
+140 2730 M
+currentpoint gsave translate 90 rotate 0 0 moveto
+[ [(Helvetica) 140.0 0.0 true true (ylabel)]
+] -46.7 MCshow
+grestore
+3922 210 M
+[ [(Helvetica) 140.0 0.0 true true (xlabel)]
+] -46.7 MCshow
+%#
+%#  We're finally ready to plot functions and/or data.
+%# 
+%#  The key is drawn just before the applicable data.
+%# 
+%#  Choose a line type and write the key.
+%#  In this sample, it is drawn with lines.
+%# 
+1.000 UL
+LT0
+6465 4767 M (x) Rshow       %# the function label in the key
+6549 4767 M                 %# the sample line in the key
+399 0 V
+%#
+%#  Now the data (this is drawn with some combination of absolute and
+%#  relative lineto's and moveto's):
+%#
+728 560 M
+2043 560 V
+4926 911 L
+2043 560 V
+7116 4900 L
+%#
+%#  ...and more.
+%# 
+%#  We don't need to eplicitly 'stroke' to draw the lines for each function
+%#  because the 'stroke' command is included in the line-type definition
+%#  commands.  Thus switching line types automatically 'strokes' previous
+%#  lines.  Clever program, that gnuplot...
+%# 
+%#  We can now repeat commands for the key and data for as many items
+%#  as were specified on the "plot" or "splot" command.
+%#
+%#  Here's a second function, plotted with dots:
+%#
+LT1
+6486 4486 M
+(function 2) Rshow
+6654 4486 Pnt
+%# 
+%#  The data:
+%# 
+840 911 Pnt
+2883 2030 Pnt
+4926 2590 Pnt
+6969 3710 Pnt
+%#
+%#  ...and more.
+%# 
+%#  Since we're now done, we 'stroke' the last lines, close the dictionary
+%#  and restore the previous settings (those saved by the 'gsave' at the top).
+%#  [The 'gsave'/'grestore' pair is included so that if this file is embedded
+%#  in another PostScript file, this patch won't mess up the other parts of
+%#  the picture.  It's considered good PostScript style to do this.]
+%# 
+stroke
+grestore
+end
+%# 
+%#  And, finally, we send the page to the printer.  [If we do embed this
+%#  file into another PostScript file, we'd remove this 'showpage'.  Unless,
+%#  of course, this was appended to the other file, in which case we'd
+%#  remove the 'showpage' from the end of that file.]
+%# 
+%#
+showpage
+%%Trailer
+%%DocumentFonts: Helvetica
+%%Pages: 1
diff -urN gnuplot-3.7/docs/psdoc/ps_guide.ps gnuplot-3.7.1/docs/psdoc/ps_guide.ps
--- gnuplot-3.7/docs/psdoc/ps_guide.ps	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/docs/psdoc/ps_guide.ps	Thu Aug 19 15:22:10 1999
@@ -0,0 +1,475 @@
+%!PS-Adobe-2.0
+%%Creator: gnuplot, modified by Richard Crawford
+%%Pages: 2
+%%EndComments
+/gnudict 120 dict def
+gnudict begin
+
+% definitions for the character codes page:
+
+% the variable "LastColumn" determines which encoding vector is used for
+% the last (right-most) column in the display
+%    1 = ISO-Latin1 (also known as ISO-8859-1) for Unix
+%    2 = CP 437 for MS-DOS
+%    3 = CP 850 for OS/2
+/LastColumn 1 def
+
+/reEncode { findfont dup length dict begin
+            { 1 index /FID ne { def }{ pop pop } ifelse } forall
+            currentdict /CharStrings known {
+            CharStrings EncodingCheck known {
+            /Encoding EncodingVector def } if} if
+            currentdict end definefont pop } def
+
+/ISOLatin1 { /EncodingCheck /ydieresis def /EncodingVector ISOLatin1Encoding def } def
+
+/CP437 { /EncodingCheck /ydieresis def /EncodingVector [
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright
+/parenleft/parenright/asterisk/plus/comma/minus/period/slash
+/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon
+/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N
+/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright
+/asciicircum/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m
+/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde/.notdef
+/Ccedilla/udieresis/eacute/acircumflex/adieresis/agrave/aring/ccedilla
+/ecircumflex/edieresis/egrave/idieresis/icircumflex/igrave/Adieresis/Aring
+/Eacute/ae/AE/ocircumflex/odieresis/ograve/ucircumflex/ugrave
+/ydieresis/Odieresis/Udieresis/cent/sterling/yen/.notdef/florin
+/aacute/iacute/oacute/uacute/ntilde/Ntilde/ordfeminine/ordmasculine
+/questiondown/.notdef/logicalnot/onehalf/onequarter/exclamdown/guillemotleft/guillemotright
+/space/space/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/germandbls/.notdef/.notdef/.notdef/.notdef/mu/.notdef
+/.notdef/.notdef/.notdef/.notdef/infinity/.notdef/.notdef/.notdef
+/.notdef/plusminus/greaterequal/lessequal/.notdef/.notdef/divide/.notdef
+/degree/bullet/periodcentered/.notdef/nsuperior/twosuperior/.notdef
+] def } def
+
+/CP850 { /EncodingCheck /ydieresis def /EncodingVector [
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright
+/parenleft/parenright/asterisk/plus/comma/minus/period/slash
+/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon
+/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N
+/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright
+/asciicircum/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m
+/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde/.notdef
+/Ccedilla/udieresis/eacute/acircumflex/adieresis/agrave/aring/ccedilla
+/ecircumflex/edieresis/egrave/idieresis/icircumflex/igrave/Adieresis/Aring
+/Eacute/ae/AE/ocircumflex/odieresis/ograve/ucircumflex/ugrave
+/ydieresis/Odieresis/Udieresis/oslash/sterling/Oslash/multiply/florin
+/aacute/iacute/oacute/uacute/ntilde/Ntilde/ordfeminine/ordmasculine
+/questiondown/registered/logicalnot/onehalf/onequarter/exclamdown/guillemotleft/guillemotright
+/space/space/.notdef/.notdef/.notdef/Aacute/Acircumflex/Agrave
+/.notdef/.notdef/.notdef/.notdef/.notdef/cent/yen/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/atilde/Atilde
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/currency
+/eth/Eth/Ecircumflex/Edieresis/Egrave/dotlessi/Iacute/Icircumflex
+/Idieresis/.notdef/.notdef/.notdef/.notdef/brokenbar/Igrave/.notdef
+/Oacute/germandbls/Ocircumflex/Ograve/otilde/Otilde/mu/thorn
+/Thorn/Uacute/Ucircumflex/Ugrave/yacute/Yacute/macron/acute
+/hyphen/plusminus/equal/threequarters/paragraph/section/divide/.notdef
+/degree/.notdef/periodcentered/onesuperior/threesuperior/twosuperior/.notdef
+] def } def
+
+/Numbs [ (040) (041) (042) (043) (044) (045) (046) (047)
+         (050) (051) (052) (053) (054) (055) (056) (057)
+         (060) (061) (062) (063) (064) (065) (066) (067)
+         (070) (071) (072) (073) (074) (075) (076) (077)
+         (100) (101) (102) (103) (104) (105) (106) (107)
+         (110) (111) (112) (113) (114) (115) (116) (117)
+         (120) (121) (122) (123) (124) (125) (126) (127)
+         (130) (131) (132) (133) (134) (135) (136) (137)
+         (140) (141) (142) (143) (144) (145) (146) (147)
+         (150) (151) (152) (153) (154) (155) (156) (157)
+         (160) (161) (162) (163) (164) (165) (166) (167)
+         (170) (171) (172) (173) (174) (175) (176)
+         (220) (221) (222) (223) (224) (225) (226) (227)
+         (230)       (232) (233)       (235) (236) (237)
+         (240) (241) (242) (243) (244) (245) (246) (247)
+         (250) (251) (252) (253) (254) (255) (256) (257)
+         (260) (261) (262) (263) (264) (265) (266) (267)
+         (270) (271) (272) (273) (274) (275) (276) (277)
+         (300) (301) (302) (303) (304) (305) (306) (307)
+         (310) (311) (312) (313) (314) (315) (316) (317)
+         (320) (321) (322) (323) (324) (325) (326) (327)
+         (330) (331) (332) (333) (334) (335) (336) (337)
+         (340) (341) (342) (343) (344) (345) (346) (347)
+         (350) (351) (352) (353) (354) (355) (356) (357)
+         (360) (361) (362) (363) (364) (365) (366) (367)
+         (370) (371) (372) (373) (374) (375) (376) (377) ] def
+/Codes [ (\040) (\041) (\042) (\043) (\044) (\045) (\046) (\047)
+         (\050) (\051) (\052) (\053) (\054) (\055) (\056) (\057)
+         (\060) (\061) (\062) (\063) (\064) (\065) (\066) (\067)
+         (\070) (\071) (\072) (\073) (\074) (\075) (\076) (\077)
+         (\100) (\101) (\102) (\103) (\104) (\105) (\106) (\107)
+         (\110) (\111) (\112) (\113) (\114) (\115) (\116) (\117)
+         (\120) (\121) (\122) (\123) (\124) (\125) (\126) (\127)
+         (\130) (\131) (\132) (\133) (\134) (\135) (\136) (\137)
+         (\140) (\141) (\142) (\143) (\144) (\145) (\146) (\147)
+         (\150) (\151) (\152) (\153) (\154) (\155) (\156) (\157)
+         (\160) (\161) (\162) (\163) (\164) (\165) (\166) (\167)
+         (\170) (\171) (\172) (\173) (\174) (\175) (\176)
+         (\220) (\221) (\222) (\223) (\224) (\225) (\226) (\227)
+         (\230)        (\232) (\233)        (\235) (\236) (\237)
+         (\240) (\241) (\242) (\243) (\244) (\245) (\246) (\247)
+         (\250) (\251) (\252) (\253) (\254) (\255) (\256) (\257)
+         (\260) (\261) (\262) (\263) (\264) (\265) (\266) (\267)
+         (\270) (\271) (\272) (\273) (\274) (\275) (\276) (\277)
+         (\300) (\301) (\302) (\303) (\304) (\305) (\306) (\307)
+         (\310) (\311) (\312) (\313) (\314) (\315) (\316) (\317)
+         (\320) (\321) (\322) (\323) (\324) (\325) (\326) (\327)
+         (\330) (\331) (\332) (\333) (\334) (\335) (\336) (\337)
+         (\340) (\341) (\342) (\343) (\344) (\345) (\346) (\347)
+         (\350) (\351) (\352) (\353) (\354) (\355) (\356) (\357)
+         (\360) (\361) (\362) (\363) (\364) (\365) (\366) (\367)
+         (\370) (\371) (\372) (\373) (\374) (\375) (\376) (\377) ] def
+/Doit { 0 1 204 { /Ind exch def                   % stores the index
+		  /Col Ind 41 idiv def            % column number
+		  /Row Ind Col 41 mul sub def     % row number
+		  Col 1.60 mul dX add Row -.225 mul moveto
+		  Sym Ind get show
+      } for } def
+
+% definitions for the enhanced syntax page:
+
+/Color false def
+/Solid false def
+/gnulinewidth 5.000 def
+/vshift -40 def
+/M {moveto} bind def
+/L {lineto} bind def
+/R {rmoveto} bind def
+/V {rlineto} bind def
+/Lshow { currentpoint stroke M
+  0 vshift R show } def
+/Rshow { currentpoint stroke M
+  dup stringwidth pop neg vshift R show } def
+/Cshow { currentpoint stroke M
+  dup stringwidth pop -2 div vshift R show } def
+/DL { Color {setrgbcolor Solid {pop []} if 0 setdash }
+ {pop pop pop Solid {pop []} if 0 setdash} ifelse } def
+/MFshow {{dup dup 0 get findfont exch 1 get scalefont setfont
+     [ currentpoint ] exch dup 2 get 0 exch rmoveto dup dup 5 get exch 4 get
+     {show} {stringwidth pop 0 rmoveto}ifelse dup 3 get
+     {2 get neg 0 exch rmoveto pop} {pop aload pop moveto}ifelse} forall} bind def
+/MFwidth {0 exch {dup 3 get{dup dup 0 get findfont exch 1 get scalefont setfont
+      5 get stringwidth pop add}
+    {pop} ifelse} forall} bind def
+/MLshow { currentpoint stroke M
+  0 exch R MFshow } bind def
+/MRshow { currentpoint stroke M
+  exch dup MFwidth neg 3 -1 roll R MFshow } def
+/MCshow { currentpoint stroke M
+  exch dup MFwidth -2 div 3 -1 roll R MFshow } def
+
+end
+%%EndProlog
+%%Page: 1
+gnudict begin
+gsave
+50 50 translate
+0.100 0.100 scale
+0 setgray
+newpath
+(Times-Roman) findfont 120 scalefont setfont
+gnulinewidth 2 mul setlinewidth [] 0 0 0 DL
+2525 7080 M
+[ [(Times-Roman) 160.0 0.0 true true (Syntax for )]
+[(Times-Bold) 160.0 0.0 true true (postscript enhanced)]
+[(Times-Roman) 160.0 0.0 true true ( option)]
+] -53.3 MCshow
+2525 6804 M
+[ [(Times-Bold) 120.0 0.0 true true (enhpost)]
+[(Times-Roman) 120.0 0.0 true true ( is the product of David Denholm and Matt Heffron.)]
+] -40.0 MCshow
+2525 6597 M
+[ [(Times-Roman) 120.0 0.0 true true (This guide is the product of Dick Crawford.)]
+] -40.0 MCshow
+3679 6321 M
+[ [(Times-Roman) 120.0 0.0 true true (text)]
+] -40.0 MCshow
+4602 6321 M
+[ [(Times-Roman) 120.0 0.0 true true (result)]
+] -40.0 MCshow
+2755 6045 M
+[ [(Times-Roman) 120.0 0.0 true true (Superscripts are denoted by ^:)]
+] -40.0 MRshow
+3679 6045 M
+[ [(Times-Roman) 120.0 0.0 true true ('10^{-2}')]
+] -40.0 MCshow
+4602 6045 M
+[ [(Times-Roman) 120.0 0.0 true true (10)]
+[(Times-Roman) 96.0 60.0 true true (-2)]
+] -52.0 MCshow
+2755 5838 M
+[ [(Times-Roman) 120.0 0.0 true true (Subscripts are denoted by _:)]
+] -40.0 MRshow
+3679 5838 M
+[ [(Times-Roman) 120.0 0.0 true true ('A_{j,k}')]
+] -40.0 MCshow
+4602 5838 M
+[ [(Times-Roman) 120.0 0.0 true true (A)]
+[(Times-Roman) 96.0 -36.0 true true (j,k)]
+] -28.0 MCshow
+2755 5631 M
+[ [(Times-Roman) 120.0 0.0 true true (Braces are not needed for single characters:)]
+] -40.0 MRshow
+3679 5631 M
+[ [(Times-Roman) 120.0 0.0 true true ('e^x')]
+] -40.0 MCshow
+4602 5631 M
+[ [(Times-Roman) 120.0 0.0 true true (e)]
+[(Times-Roman) 96.0 60.0 true true (x)]
+] -52.0 MCshow
+2755 5286 M
+[ [(Times-Roman) 120.0 0.0 true true (Use @ to align sub- and superscripts:)]
+] -40.0 MRshow
+3679 5286 M
+[ [(Times-Roman) 120.0 0.0 true true ('x@^2_k')]
+] -40.0 MCshow
+4602 5286 M
+[ [(Times-Roman) 120.0 0.0 true true (x)]
+[(Times-Roman) 96.0 60.0 false true (2)]
+[(Times-Roman) 96.0 -36.0 true true (k)]
+] -40.0 MCshow
+2755 5079 M
+[ [(Times-Roman) 120.0 0.0 true true (Put the shorter of the two first:)]
+] -40.0 MRshow
+3679 5079 M
+[ [(Times-Roman) 120.0 0.0 true true ('x@_0^{-3/2}y')]
+] -40.0 MCshow
+4602 5079 M
+[ [(Times-Roman) 120.0 0.0 true true (x)]
+[(Times-Roman) 96.0 -36.0 false true (0)]
+[(Times-Roman) 96.0 60.0 true true (-3/2)]
+[(Times-Roman) 120.0 0.0 true true (y)]
+] -40.0 MCshow
+2755 4872 M
+[ [(Times-Roman) 120.0 0.0 true true (...rather than:)]
+] -40.0 MRshow
+3679 4872 M
+[ [(Times-Roman) 120.0 0.0 true true ('x@^{-3/2}_0y')]
+] -40.0 MCshow
+4602 4872 M
+[ [(Times-Roman) 120.0 0.0 true true (x)]
+[(Times-Roman) 96.0 60.0 false true (-3/2)]
+[(Times-Roman) 96.0 -36.0 true true (0)]
+[(Times-Roman) 120.0 0.0 true true (y)]
+] -40.0 MCshow
+2755 4527 M
+[ [(Times-Roman) 120.0 0.0 true true (Font changes are enclosed in braces:)]
+] -40.0 MRshow
+3679 4527 M
+[ [(Times-Roman) 120.0 0.0 true true ('{/Helvetica m}')]
+] -40.0 MCshow
+4602 4527 M
+[ [(Helvetica) 120.0 0.0 true true (m)]
+] -40.0 MCshow
+2755 4320 M
+[ [(Times-Roman) 120.0 0.0 true true (...size, too:)]
+] -40.0 MRshow
+3679 4320 M
+[ [(Times-Roman) 120.0 0.0 true true ('{/=8 m}')]
+] -40.0 MCshow
+4602 4320 M
+[ [(Times-Roman) 80.0 0.0 true true (m)]
+] -40.0 MCshow
+2755 4113 M
+[ [(Times-Roman) 120.0 0.0 true true (...or both:)]
+] -40.0 MRshow
+3679 4113 M
+[ [(Times-Roman) 120.0 0.0 true true ('{/Helvetica=18 m}')]
+] -40.0 MCshow
+4602 4113 M
+[ [(Helvetica) 180.0 0.0 true true (m)]
+] -60.0 MCshow
+2755 3768 M
+[ [(Times-Roman) 120.0 0.0 true true (Characters can be specified by code:)]
+] -40.0 MRshow
+3679 3768 M
+[ [(Times-Roman) 120.0 0.0 true true ('{\\120}')]
+] -40.0 MCshow
+4602 3768 M
+[ [(Times-Roman) 120.0 0.0 true true (\120)]
+] -40.0 MCshow
+2755 3562 M
+[ [(Times-Roman) 120.0 0.0 true true (...which is how to get nonkeyboard characters:)]
+] -40.0 MRshow
+3679 3562 M
+[ [(Times-Roman) 120.0 0.0 true true ('{\\267}')]
+] -40.0 MCshow
+4602 3562 M
+[ [(Times-Roman) 120.0 0.0 true true (\267)]
+] -40.0 MCshow
+2755 3355 M
+[ [(Times-Roman) 120.0 0.0 true true (Use keyboard characters or codes for other fonts:)]
+] -40.0 MRshow
+3679 3355 M
+[ [(Times-Roman) 120.0 0.0 true true ('{/Symbol p\\271 22/7}')]
+] -40.0 MCshow
+4602 3355 M
+[ [(Symbol) 120.0 0.0 true true (p\271 22/7)]
+] -40.0 MCshow
+2755 3010 M
+[ [(Times-Roman) 120.0 0.0 true true (Everything outside braces is in the default font:)]
+] -40.0 MRshow
+3679 3010 M
+[ [(Times-Roman) 120.0 0.0 true true ('P = {/Symbol r}kT')]
+] -40.0 MCshow
+4602 3010 M
+[ [(Times-Roman) 120.0 0.0 true true (P = )]
+[(Symbol) 120.0 0.0 true true (r)]
+[(Times-Roman) 120.0 0.0 true true (kT)]
+] -40.0 MCshow
+2755 2665 M
+[ [(Times-Roman) 120.0 0.0 true true (Space of a given size can be inserted with &:)]
+] -40.0 MRshow
+3679 2665 M
+[ [(Times-Roman) 120.0 0.0 true true ('<junk>')]
+] -40.0 MCshow
+4602 2665 M
+[ [(Times-Roman) 120.0 0.0 true true (<junk>)]
+] -40.0 MCshow
+3679 2458 M
+[ [(Times-Roman) 120.0 0.0 true true ('<&{junk}>')]
+] -40.0 MCshow
+4602 2458 M
+[ [(Times-Roman) 120.0 0.0 true true (<)]
+[(Times-Roman) 120.0 0.0 true false (junk)]
+[(Times-Roman) 120.0 0.0 true true (>)]
+] -40.0 MCshow
+2755 2113 M
+[ [(Times-Roman) 120.0 0.0 true true (Special characters \(^,_,{,},@,&,\\\) can be escaped by \\:)]
+] -40.0 MRshow
+3679 2113 M
+[ [(Times-Roman) 120.0 0.0 true true ('f\\{x,y\\}')]
+] -40.0 MCshow
+4602 2113 M
+[ [(Times-Roman) 120.0 0.0 true true (f{x,y})]
+] -40.0 MCshow
+2755 1906 M
+[ [(Times-Roman) 120.0 0.0 true true (...or \\\\ if within a double-quoted string:)]
+] -40.0 MRshow
+3679 1906 M
+[ [(Times-Roman) 120.0 0.0 true true ("f\\\\{x,y\\\\}")]
+] -40.0 MCshow
+4602 1906 M
+[ [(Times-Roman) 120.0 0.0 true true (f{x,y})]
+] -40.0 MCshow
+216 1630 M
+[ [(Times-Roman) 120.0 0.0 true true (Everything can be done recursively:)]
+] -40.0 MLshow
+216 1423 M
+[ [(Times-Roman) 120.0 0.0 true true (the text)]
+] -40.0 MLshow
+2755 1423 M
+[ [(Times-Roman) 120.0 0.0 true true ('{/Symbol=18 \\362@_{/=9.6 0}^{/=12 \\245}})]
+] -40.0 MCshow
+2755 1216 M
+[ [(Times-Roman) 120.0 0.0 true true ({/Helvetica e^{-{/Symbol m}^2/2} d}{/Symbol m = \(p/2\)^{1/2}}')]
+] -40.0 MCshow
+216 1009 M
+[ [(Times-Roman) 120.0 0.0 true true (produces the result:)]
+] -40.0 MLshow
+2755 1009 M
+[ [(Symbol) 180.0 0.0 true true (\362)]
+[(Symbol) 96.0 -54.0 false true (0)]
+[(Symbol) 120.0 90.0 true true (\245)]
+[(Helvetica) 120.0 0.0 true true (e)]
+[(Helvetica) 96.0 60.0 true true (-)]
+[(Symbol) 96.0 60.0 true true (m)]
+[(Helvetica) 76.8 108.0 true true (2)]
+[(Helvetica) 96.0 60.0 true true (/2)]
+[(Helvetica) 120.0 0.0 true true ( d)]
+[(Symbol) 120.0 0.0 true true (m = \(p/2\))]
+[(Symbol) 96.0 60.0 true true (1/2)]
+] -60.0 MCshow
+216 802 M
+[ [(Times-Roman) 120.0 0.0 true true (Note how font sizes and definitions are preserved across pairs of braces.)]
+] -40.0 MLshow
+216 388 M
+[ [(Times-Roman) 120.0 0.0 true true (The default font for this page is /Times-Roman=12.  These and other options may be changed)]
+] -40.0 MLshow
+216 250 M
+[ [(Times-Roman) 120.0 0.0 true true (on the command )]
+[(Times-Bold) 120.0 0.0 true true (set terminal postscript)]
+[(Times-Roman) 120.0 0.0 true true (.  See the manual or )]
+[(Times-Bold) 120.0 0.0 true true (help postscript)]
+[(Times-Roman) 120.0 0.0 true true ( for details.)]
+] -40.0 MLshow
+gnulinewidth setlinewidth [] 0 1 0 DL
+stroke
+showpage grestore
+
+%%Page: 2
+% Character code page
+
+gsave
+72 72 scale 1.0 10.5 translate 0 0 moveto
+/Times-Roman findfont .225 scalefont setfont
+/Title (PostScript Character Codes) def
+Title stringwidth pop -2 div
+3.2 add 0 rmoveto Title show
+/Times-Roman findfont .20 scalefont setfont
+0 -.25 translate 0 0 moveto
+/Extra LastColumn 1 eq {(ISO Latin-1)} if
+       LastColumn 2 eq {(CP437)} if
+       LastColumn 3 eq {(CP850)} if def
+/H (T = text (here Times-Roman)    S = Symbol    Z = ZapfDingbats    E = ) def
+H stringwidth pop Extra stringwidth pop add
+( encoding) stringwidth pop add -2 div
+3.2 add 0 rmoveto H show Extra show ( encoding) show
+/H ((the "E" character set is accessed via an option on "set encoding" )) def
+H stringwidth pop -2 div 3.2 add -.20 moveto H show
+-.6 -.5 translate
+0 1 4 { 1.60 mul /X0 exch def X0 .375 add 0 moveto (T) show
+        X0 .625 add 0 moveto (S) show X0 .875 add 0 moveto
+        (Z) show  X0 1.125 add 0 moveto (E) show } for
+0 -.25 translate
+% first subcolumn: ACSII code
+/Times-Roman findfont .175 scalefont setfont
+/dX 0 def          % subcolumn offset
+/Sym Numbs def     % item to be printed
+Doit
+% second subcolumn: Times-Roman
+/Times-Roman findfont .175 scalefont setfont
+/dX .375 def       % subcolumn offset
+/Sym Codes def     % item to be printed
+Doit
+% third subcolumn: Symbol
+/Symbol findfont .175 scalefont setfont
+/dX .625 def       % subcolumn offset
+/Sym Codes def     % item to be printed
+Doit
+% fourth subcolumn: ZapfDingbats
+/ZapfDingbats findfont .175 scalefont setfont
+/dX .875 def       % subcolumn offset
+/Sym Codes def     % item to be printed
+Doit
+% fifth subcolumn: selected by "LastColumn"
+LastColumn 1 eq { % Times-Roman with ISO Latin-1 encoding
+                  /TRISOL1 ISOLatin1 /Times-Roman reEncode
+                  /TRISOL1 findfont .175 scalefont setfont } if
+LastColumn 2 eq { % subcolumn: Times-Roman with CP 437 encoding
+                  /TRCP437 CP437 /Times-Roman reEncode
+                  /TRCP437 findfont .175 scalefont setfont } if
+LastColumn 3 eq { % Times-Roman with CP 850 encoding
+                  /TRCP850 CP850 /Times-Roman reEncode
+                  /TRCP850 findfont .175 scalefont setfont } if
+/dX 1.125 def      % subcolumn offset
+/Sym Codes def     % item to be printed
+Doit
+showpage
+grestore end
diff -urN gnuplot-3.7/docs/psdoc/ps_symbols.gpi gnuplot-3.7.1/docs/psdoc/ps_symbols.gpi
--- gnuplot-3.7/docs/psdoc/ps_symbols.gpi	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/docs/psdoc/ps_symbols.gpi	Thu Aug 19 15:22:10 1999
@@ -0,0 +1,40 @@
+set terminal postscript; set output 'ps_symbols.ps'
+set noborder; set nozeroaxis; set noxtics; set noytics
+set xlabel ''; set ylabel ''; set nokey; set size square;
+set xrange [-1.2:1.2]; set yrange [-1.2:1.2]; set parametric; set samples 2
+f(x)=cos(pi*x/38.0); g(x)=sin(pi*x/38.0)
+set label '(#70--75 are opaque)' at 0,0 center
+set label  '0' at  1.07*f(0),  1.07*g(0) center
+set label '10' at  1.07*f(10), 1.07*g(10) center
+set label '20' at  1.07*f(20), 1.07*g(20) center
+set label '30' at  1.07*f(30), 1.07*g(30) center
+set label '40' at  1.07*f(40), 1.07*g(40) center
+set label '50' at  1.07*f(50), 1.07*g(50) center
+set label '60' at  1.07*f(60), 1.07*g(60) center
+set label '70' at  1.07*f(70), 1.07*g(70) center
+plot f( 0),g( 0) w p 0  0,\
+ f( 1),g( 1) w p 0  1,  f( 2),g( 2) w p 0  2,  f( 3),g( 3) w p 0  3,\
+ f( 4),g( 4) w p 0  4,  f( 5),g( 5) w p 0  5,  f( 6),g( 6) w p 0  6,\
+ f( 7),g( 7) w p 0  7,  f( 8),g( 8) w p 0  8,  f( 9),g( 9) w p 0  9,\
+ f(10),g(10) w p 0 10,  f(11),g(11) w p 0 11,  f(12),g(12) w p 0 12,\
+ f(13),g(13) w p 0 13,  f(14),g(14) w p 0 14,  f(15),g(15) w p 0 15,\
+ f(16),g(16) w p 0 16,  f(17),g(17) w p 0 17,  f(18),g(18) w p 0 18,\
+ f(19),g(19) w p 0 19,  f(20),g(20) w p 0 20,  f(21),g(21) w p 0 21,\
+ f(22),g(22) w p 0 22,  f(23),g(23) w p 0 23,  f(24),g(24) w p 0 24,\
+ f(25),g(25) w p 0 25,  f(26),g(26) w p 0 26,  f(27),g(27) w p 0 27,\
+ f(28),g(28) w p 0 28,  f(29),g(29) w p 0 29,  f(30),g(30) w p 0 30,\
+ f(31),g(31) w p 0 31,  f(32),g(32) w p 0 32,  f(33),g(33) w p 0 33,\
+ f(34),g(34) w p 0 34,  f(35),g(35) w p 0 35,  f(36),g(36) w p 0 36,\
+ f(37),g(37) w p 0 37,  f(38),g(38) w p 0 38,  f(39),g(39) w p 0 39,\
+ f(40),g(40) w p 0 40,  f(41),g(41) w p 0 41,  f(42),g(42) w p 0 42,\
+ f(43),g(43) w p 0 43,  f(44),g(44) w p 0 44,  f(45),g(45) w p 0 45,\
+ f(46),g(46) w p 0 46,  f(47),g(47) w p 0 47,  f(48),g(48) w p 0 48,\
+ f(49),g(49) w p 0 49,  f(50),g(50) w p 0 50,  f(51),g(51) w p 0 51,\
+ f(52),g(52) w p 0 52,  f(53),g(53) w p 0 53,  f(54),g(54) w p 0 54,\
+ f(55),g(55) w p 0 55,  f(56),g(56) w p 0 56,  f(57),g(57) w p 0 57,\
+ f(58),g(58) w p 0 58,  f(59),g(59) w p 0 59,  f(60),g(60) w p 0 60,\
+ f(61),g(61) w p 0 61,  f(62),g(62) w p 0 62,  f(63),g(63) w p 0 63,\
+ f(64),g(64) w p 0 64,  f(65),g(65) w p 0 65,  f(66),g(66) w p 0 66,\
+ f(67),g(67) w p 0 67,  f(68),g(68) w p 0 68,  f(69),g(69) w p 0 69,\
+ f(70),g(70) w p 0 70,  f(71),g(71) w p 0 71,  f(72),g(72) w p 0 72,\
+ f(73),g(73) w p 0 73,  f(74),g(74) w p 0 74,  f(75),g(75) w p 0 75
diff -urN gnuplot-3.7/docs/termdoc.c gnuplot-3.7.1/docs/termdoc.c
--- gnuplot-3.7/docs/termdoc.c	Tue Nov  3 12:47:57 1998
+++ gnuplot-3.7.1/docs/termdoc.c	Tue Nov  3 12:47:57 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: termdoc.c,v 1.19 1998/04/14 00:17:14 drd Exp $
+ * $Id: termdoc.c,v 1.8 1998/11/03 12:47:57 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/docs/titlepag.tex gnuplot-3.7.1/docs/titlepag.tex
--- gnuplot-3.7/docs/titlepag.tex	Wed Dec  9 15:27:25 1998
+++ gnuplot-3.7.1/docs/titlepag.tex	Wed Dec  9 15:27:25 1998
@@ -1,5 +1,5 @@
 %
-% $Id: titlepag.tex,v 1.4 1996/09/15 13:07:38 drd Exp $
+% $Id: titlepag.tex,v 1.3 1998/12/09 15:27:25 lhecking Exp $
 %
 \ifx\LaTeXe\undefined
 % old LaTeX version
diff -urN gnuplot-3.7/docs/toc_entr.sty gnuplot-3.7.1/docs/toc_entr.sty
--- gnuplot-3.7/docs/toc_entr.sty	Wed Apr 15 20:16:45 1998
+++ gnuplot-3.7.1/docs/toc_entr.sty	Wed Apr 15 20:16:45 1998
@@ -1,5 +1,5 @@
 %
-% $Id: toc_entr.sty,v 1.4 1996/09/15 13:07:39 drd Exp $
+% $Id: toc_entr.sty,v 1.1.1.1 1998/04/15 19:16:45 lhecking Exp $
 %
 %
 %
diff -urN gnuplot-3.7/docs/xref.c gnuplot-3.7.1/docs/xref.c
--- gnuplot-3.7/docs/xref.c	Mon Oct 19 14:19:18 1998
+++ gnuplot-3.7.1/docs/xref.c	Mon Oct 19 14:19:18 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: xref.c,v 1.9 1998/03/22 23:31:53 drd Exp $
+ * $Id: xref.c,v 1.4 1998/10/19 13:19:18 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/docs/xref.h gnuplot-3.7.1/docs/xref.h
--- gnuplot-3.7/docs/xref.h	Mon Oct 19 14:19:28 1998
+++ gnuplot-3.7.1/docs/xref.h	Mon Oct 19 14:19:28 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: xref.h,v 1.2 1998/10/19 13:19:28 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/errorfix.sh gnuplot-3.7.1/errorfix.sh
--- gnuplot-3.7/errorfix.sh	Fri Nov 20 12:20:28 1998
+++ gnuplot-3.7.1/errorfix.sh	Fri Nov 20 12:20:28 1998
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: errorfix.sh,v 1.4 1998/04/14 00:15:18 drd Exp $
+# $Id: errorfix.sh,v 1.5 1998/11/20 12:20:28 lhecking Exp $
 #
 # shell script to change #error and #warn cpp statements. This is necessary
 # for the crippled non-ANSI compiler that HP ships with it's standard
diff -urN gnuplot-3.7/eval.c gnuplot-3.7.1/eval.c
--- gnuplot-3.7/eval.c	Tue Nov  3 12:52:12 1998
+++ gnuplot-3.7.1/eval.c	Tue Nov  3 12:52:12 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: eval.c,v 1.15 1998/03/22 22:31:30 drd Exp $";
+static char *RCSid = "$Id: eval.c,v 1.2 1998/11/03 12:52:12 lhecking Exp $";
 #endif
 
 /* GNUPLOT - eval.c */
diff -urN gnuplot-3.7/fit.c gnuplot-3.7.1/fit.c
--- gnuplot-3.7/fit.c	Wed Jan  6 15:50:16 1999
+++ gnuplot-3.7.1/fit.c	Fri Oct  1 19:22:14 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: fit.c,v 1.58 1998/04/14 00:15:19 drd Exp $";
+static char *RCSid = "$Id: fit.c,v 1.23.2.3 1999/10/01 18:22:14 lhecking Exp $";
 #endif
 
 /*
@@ -89,6 +89,9 @@
 extern int c_token;
 extern int df_datum, df_line_number;
 
+/* following 2 external arrays are needed to use time data */
+extern int datatype[];
+extern int df_timecol[];
 
 enum marq_res {
     OK, ERROR, BETTER, WORSE
@@ -724,9 +727,9 @@
 	for (i = 0; i < num_params; i++)
 	    Dblf3("%-15.15s = %-15g\n", par_name[i], a[i]);
     } else {
-	    Dblf2("degrees of freedom (ndf) : %d\n",  num_data - num_params);
-	    Dblf2("rms of residuals      (stdfit) = sqrt(WSSR/ndf)      : %g\n", sqrt(chisq / (num_data - num_params)));
- 	    Dblf2("variance of residuals (reduced chisquare) = WSSR/ndf : %g\n\n", chisq / (num_data - num_params));
+	Dblf2("degrees of freedom (ndf) : %d\n",  num_data - num_params);
+	Dblf2("rms of residuals      (stdfit) = sqrt(WSSR/ndf)      : %g\n", sqrt(chisq / (num_data - num_params)));
+ 	Dblf2("variance of residuals (reduced chisquare) = WSSR/ndf : %g\n\n", chisq / (num_data - num_params));
  
 	/* get covariance-, Korrelations- and Kurvature-Matrix */
 	/* and errors in the parameters                     */
@@ -790,6 +793,19 @@
 	free(dpar);
     }
 
+    /* HBB 990220: re-imported this snippet from older versions. Finally,
+     * some user noticed that it *is* necessary, after all. Not even
+     * Carsten Grammes himself remembered what it was for... :-(
+     * The thing is: the value of the last parameter is not reset to
+     * its original one after the derivatives have been calculated
+     */
+    /* restore last parameter's value (not done by calculate) */
+    {
+	struct value val;
+	Gcomplex (&val, a[num_params-1], 0.0);
+	setvar (par_name[num_params-1], val);
+     }
+
     /* call destructor for allocated vars */
     lambda = -2;		/* flag value, meaning 'destruct!' */
     (void) marquardt(a, C, &chisq, &lambda);
@@ -903,7 +919,7 @@
 
     if (!udv_ptr) {		/* generate new entry */
 	last->next_udv = udv_ptr = (struct udvt_entry *)
-	    gp_alloc((unsigned int) sizeof(struct udvt_entry), "fit setvar");
+	    gp_alloc(sizeof(struct udvt_entry), "fit setvar");
 	udv_ptr->next_udv = NULL;
     }
     safe_strncpy(udv_ptr->udv_name, varname, sizeof(udv_ptr->udv_name));
@@ -1277,6 +1293,30 @@
     if (columns == 1)
 	int_error("Need 2 to 4 using specs", c_token);
 
+    /* The following patch was made by Remko Scharroo, 25-Mar-1999
+     * We need to check if one of the columns is time data, like
+     * in plot2d and plot3d */
+
+    if (datatype[FIRST_X_AXIS] == TIME) {
+	if (columns < 2)
+	    int_error("Need full using spec for x time data", c_token);
+	df_timecol[0] = 1;
+    }
+    if (datatype[FIRST_Y_AXIS] == TIME) {
+	if (columns < 1)
+	    int_error("Need using spec for y time data", c_token);
+	df_timecol[1] = 1;
+    }
+    /* HBB 990326: added this check. Just in case some wants to fit
+     * time/date data depending on two other variables ... */
+    if (datatype[FIRST_Z_AXIS] == TIME) {
+	if (columns < 4)
+	    int_error("Need full using spec for z time data", c_token);
+	else
+	    df_timecol[2] = 1;
+    }
+    /* End of patch by Remko Scharroo */
+
     /* HBB 980401: if this is a single-variable fit, we shouldn't have
      * allowed a variable name specifier for 'y': */
     if ((dummy_y >= 0) && (columns < 4))
@@ -1284,15 +1324,17 @@
 
     /* HBB 981210: two range specs mean different things, depending
      * on wether this is a 2D or 3D fit */
-    if (columns<4) {
-      if (zrange_token != -1)
-	int_error("Three range-specs not allowed in on-variable fit", zrange_token);
-      else {
-	/* 2D fit, 2 ranges: second range is for *z*, not y: */
-	autorange_z = autorange_y;
-	min_z = min_y;
-	max_z = max_y;
-      }
+    if (columns < 4) {
+	if (zrange_token != -1)
+	    int_error("Three range-specs not allowed in on-variable fit", zrange_token);
+	else {
+	    /* 2D fit, 2 ranges: second range is for *z*, not y: */
+	    autorange_z = autorange_y;
+	    if (autorange_y & 1)
+		min_z = min_y;
+	    if (autorange_y & 2)
+		max_z = max_y;
+	}
     }
 
     /* defer actually reading the data until we have parsed the rest
@@ -1473,7 +1515,7 @@
 	TBOOLEAN fixed;
 	double tmp_par;
 	char c, *s;
-	char sstr[MAX_LINE_LEN];
+	char sstr[MAX_LINE_LEN+1];
 	FILE *f;
 
 	quote_str(sstr, c_token++, MAX_LINE_LEN);
diff -urN gnuplot-3.7/fit.h gnuplot-3.7.1/fit.h
--- gnuplot-3.7/fit.h	Wed Oct 28 21:08:54 1998
+++ gnuplot-3.7.1/fit.h	Wed Oct 28 21:08:54 1998
@@ -1,4 +1,4 @@
-/* $Id: fit.h,v 1.11 1998/04/14 00:15:21 drd Exp $ */
+/* $Id: fit.h,v 1.9 1998/10/28 21:08:54 lhecking Exp $ */
 
 /*
  *	Header file: public functions in fit.c
diff -urN gnuplot-3.7/fnproto.h gnuplot-3.7.1/fnproto.h
--- gnuplot-3.7/fnproto.h	Wed Apr 15 20:22:24 1998
+++ gnuplot-3.7.1/fnproto.h	Wed Apr 15 20:22:24 1998
@@ -1,4 +1,4 @@
-/* $Id: fnproto.h,v 1.9 1998/03/22 22:31:32 drd Exp $ */
+/* $Id: fnproto.h,v 1.1.1.2 1998/04/15 19:22:24 lhecking Exp $ */
 
 /* GNUPLOT - fnproto.h */
 
diff -urN gnuplot-3.7/gnuplot.el gnuplot-3.7.1/gnuplot.el
--- gnuplot-3.7/gnuplot.el	Wed Apr 15 20:16:29 1998
+++ gnuplot-3.7.1/gnuplot.el	Wed Apr 15 20:16:29 1998
@@ -1,5 +1,5 @@
 ;;
-;; $Id: gnuplot.el,v 1.4 1993/09/27 17:08:18 alex Exp $
+;; $Id: gnuplot.el,v 1.1.1.1 1998/04/15 19:16:29 lhecking Exp $
 ;;
 ;;
 ; 
diff -urN gnuplot-3.7/gnuplot.opt gnuplot-3.7.1/gnuplot.opt
--- gnuplot-3.7/gnuplot.opt	Wed Dec  2 18:37:24 1998
+++ gnuplot-3.7.1/gnuplot.opt	Wed Aug 25 17:15:27 1999
@@ -1,31 +1,31 @@
-alloc
-binary
-bitmap
-command
-contour
-datafile
-eval
-fit
-graphics
-graph3d
-help
-hidden3d
-internal
-interpol
-matrix
-misc
-parse
-plot
-plot2d
-plot3d
-scanner
-set
-show
-specfun
-standard
-stdfn
-term
-time
-util
-util3d
-version
+alloc.obj
+binary.obj
+bitmap.obj
+command.obj
+contour.obj
+datafile.obj
+eval.obj
+fit.obj
+graphics.obj
+graph3d.obj
+help.obj
+hidden3d.obj
+internal.obj
+interpol.obj
+matrix.obj
+misc.obj
+parse.obj
+plot.obj
+plot2d.obj
+plot3d.obj
+scanner.obj
+set.obj
+show.obj
+specfun.obj
+standard.obj
+stdfn.obj
+term.obj
+time.obj
+util.obj
+util3d.obj
+version.obj
diff -urN gnuplot-3.7/gnuplot.prj gnuplot-3.7.1/gnuplot.prj
--- gnuplot-3.7/gnuplot.prj	Wed Apr 22 14:37:12 1998
+++ gnuplot-3.7.1/gnuplot.prj	Wed Apr 22 14:37:12 1998
@@ -1,5 +1,5 @@
 ;
-;  $Id: gnuplot.prj,v 1.7 1998/04/14 00:15:21 drd Exp $
+;  $Id: gnuplot.prj,v 1.1.1.2 1998/04/22 13:37:12 lhecking Exp $
 ;
 ; gnuplot.prj - this project can be used for both PureC and TurboC on the
 ; Atari. It is currently set up for PureC, but if you change all lines
diff -urN gnuplot-3.7/gplt_x11.c gnuplot-3.7.1/gplt_x11.c
--- gnuplot-3.7/gplt_x11.c	Tue Dec 15 20:22:52 1998
+++ gnuplot-3.7.1/gplt_x11.c	Fri Oct 15 17:04:50 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: gplt_x11.c,v 1.71 1998/04/14 00:15:22 drd Exp $";
+static char *RCSid = "$Id: gplt_x11.c,v 1.16.2.4 1999/10/15 16:04:50 lhecking Exp $";
 #endif
 
 /* GNUPLOT - gplt_x11.c */
@@ -257,6 +257,7 @@
 
 #define Nbuf 1024
 char buf[Nbuf], **commands = (char **) 0;
+static int buffered_input_available = 0;
 
 FILE *X11_ipc;
 char X11_ipcpath[32];
@@ -275,7 +276,8 @@
  *   main program 
  *---------------------------------------------------------------------------*/
 
-int main(argc, argv)
+int
+main(argc, argv)
 int argc;
 char *argv[];
 {
@@ -300,7 +302,7 @@
     mainloop();
 
     if (persist) {
-	FPRINTF((stderr, "waiting for %d windows\n, windows_open"));
+	FPRINTF((stderr, "waiting for %d windows\n", windows_open));
 	/* read x events until all windows have been quit */
 	while (windows_open > 0) {
 	    XEvent event;
@@ -338,24 +340,17 @@
  *    DEFAULT_X11 mainloop
  *---------------------------------------------------------------------------*/
 
-void mainloop()
+void
+mainloop()
 {
-    int nf, nfds, cn = ConnectionNumber(dpy), in;
-    struct timeval *timer = (struct timeval *) 0;
-#ifdef ISC22
-    struct timeval timeout;
-#endif
-    fd_set rset, tset;
+    int nf, cn = ConnectionNumber(dpy), in;
+    fd_set_size_t nfds;
+    struct timeval timeout, *timer = (struct timeval *) 0;
+    fd_set tset;
 
     X11_ipc = stdin;
     in = fileno(X11_ipc);
 
-    FD_ZERO(&rset);
-    FD_SET(cn, &rset);
-
-    FD_SET(in, &rset);
-    nfds = (cn > in) ? cn + 1 : in + 1;
-
 #ifdef ISC22
 /* Added by Robert Eckardt, RobertE@beta.TP2.Ruhr-Uni-Bochum.de */
     timeout.tv_sec = 0;		/* select() in ISC2.2 needs timeout */
@@ -374,15 +369,33 @@
 
 	XFlush(dpy);
 
-	tset = rset;
-	nf = select((gp_nfds_t)nfds, gp_fd_set_p &tset, gp_fd_set_p 0,
-		     gp_fd_set_p 0, gp_timeval_p timer);
+	FD_ZERO(&tset);
+	FD_SET(cn, &tset);
+
+	/* Don't wait for events if we know that input is
+	 * already sitting in a buffer.  Also don't wait for
+	 * input to become available.
+	*/
+	if (buffered_input_available) {
+	    timeout.tv_sec  = 0;
+	    timeout.tv_usec = 0;
+	    timer = &timeout;
+	} else {
+	    timer = (struct timeval *) 0;
+	    FD_SET(in, &tset);
+	}
+
+	nfds = (cn > in) ? cn + 1 : in + 1;
+
+	nf = select(nfds, SELECT_FD_SET_CAST &tset, 0, 0, timer);
+
 	if (nf < 0) {
 	    if (errno == EINTR)
 		continue;
 	    fprintf(stderr, "gnuplot: select failed. errno:%d\n", errno);
 	    EXIT(1);
 	}
+
 	if (nf > 0)
 	    XNoOp(dpy);
 
@@ -404,32 +417,29 @@
 		process_event(&xe);
 	    } while (XPending(dpy));
 	}
-	if (FD_ISSET(in, &tset)) {
-	    if (!record())      /* end of input */
+
+	if (FD_ISSET(in, &tset) || buffered_input_available) {
+	    if (!record())	/* end of input */
 		return;
 	}
     }
 }
 
-#endif
-
 
-#ifdef CRIPPLED_SELECT
+#elif defined(CRIPPLED_SELECT)
 /*-----------------------------------------------------------------------------
  *    CRIPPLED_SELECT mainloop
  *---------------------------------------------------------------------------*/
 
-void mainloop()
+void
+mainloop()
 {
-    int nf, nfds, cn = ConnectionNumber(dpy);
+    fd_set_size_t nf, nfds, cn = ConnectionNumber(dpy);
     struct timeval timeout, *timer;
-    fd_set rset, tset;
+    fd_set tset;
     unsigned long all = (unsigned long) (-1L);
     XEvent xe;
 
-    FD_ZERO(&rset);
-    FD_SET(cn, &rset);
-
     timeout.tv_sec = 1;
     timeout.tv_usec = 0;
     timer = &timeout;
@@ -438,16 +448,37 @@
 
     while (1) {
 	XFlush(dpy);		/* see above */
-	tset = rset;
-	nf = select((gp_nfds_t)nfds, gp_fd_set_p &tset, gp_fd_set_p 0,
-		    gp_fd_set_p 0, gp_timeval_p timer);
+
+	FD_ZERO(&tset);
+	FD_SET(cn, &tset);
+
+	/* Don't wait for events if we know that input is
+	 * already sitting in a buffer.  Also don't wait for
+	 * input to become available.
+	*/
+	if (buffered_input_available) {
+	    timeout.tv_sec  = 0;
+	    timeout.tv_usec = 0;
+	    timer = &timeout;
+	} else {
+	    timer = (struct timeval *) 0;
+	    FD_SET(in, &tset);
+	}
+
+	nfds = (cn > in) ? cn + 1 : in + 1;
+
+	nf = select(nfds, SELECT_FD_SET_CAST &tset, 0, 0, timer);
+
 	if (nf < 0) {
 	    if (errno == EINTR)
 		continue;
 	    fprintf(stderr, "gnuplot: select failed. errno:%d\n", errno);
 	    EXIT(1);
 	}
-	nf > 0 && XNoOp(dpy);
+
+	if (nf > 0)
+	    XNoOp(dpy);
+
 	if (FD_ISSET(cn, &tset)) {
 	    while (XCheckMaskEvent(dpy, all, &xe)) {
 		process_event(&xe);
@@ -460,10 +491,9 @@
 	}
     }
 }
-#endif /* CRIPPLED_SELECT */
 
 
-#ifdef VMS
+#elif defined(VMS)
 /*-----------------------------------------------------------------------------
  *    VMS mainloop - Yehavi Bourvine - YEHAVI@VMS.HUJI.AC.IL
  *---------------------------------------------------------------------------*/
@@ -471,32 +501,38 @@
 /*  In VMS there is no decent Select(). hence, we have to loop inside
  *  XGetNextEvent for getting the next X window event. In order to get input
  *  from the master we assign a channel to SYS$INPUT and use AST's in order to
- *  receive data. In order to exit the mainloop, we need to somehow make XNextEvent
- *  return from within the ast. We do this with a XSendEvent() to ourselves !
+ *  receive data. In order to exit the mainloop, we need to somehow make
+ *  XNextEvent return from within the ast. We do this with a XSendEvent() to
+ *  ourselves !
  *  This needs a window to send the message to, so we create an unmapped window
  *  for this purpose. Event type XClientMessage is perfect for this, but it
- *  appears that such messages come from elsewhere (motif window manager, perhaps ?)
- *  So we need to check fairly carefully that it is the ast event that has been received.
+ *  appears that such messages come from elsewhere (motif window manager,
+ *  perhaps ?) So we need to check fairly carefully that it is the ast event
+ *  that has been received.
  */
 
 #include <iodef.h>
 char STDIIN[] = "SYS$INPUT:";
 short STDIINchannel, STDIINiosb[4];
-struct { short size, type; char *address; } STDIINdesc;
+struct {
+    short size, type;
+    char *address;
+} STDIINdesc;
 char STDIINbuffer[64];
 int status;
 
 ast()
 {
     int status = sys$qio(0, STDIINchannel, IO$_READVBLK, STDIINiosb, record,
-		  0, STDIINbuffer, sizeof(STDIINbuffer) - 1, 0, 0, 0, 0);
+			 0, STDIINbuffer, sizeof(STDIINbuffer) - 1, 0, 0, 0, 0);
     if ((status & 0x1) == 0)
 	EXIT(status);
 }
 
 Window message_window;
 
-void mainloop()
+void
+mainloop()
 {
     /* dummy unmapped window for receiving internally-generated terminate
      * messages
@@ -527,12 +563,14 @@
 	process_event(&xe);
     }
 }
-
-#endif /* VMS */
+#else /* !(DEFAULT_X11 || CRIPPLED_SELECT || VMS */
+You lose. No mainloop.
+#endif				/* !(DEFAULT_X11 || CRIPPLED_SELECT || VMS */
 
 /* delete a window / plot */
 
-void delete_plot(plot)
+void
+delete_plot(plot)
 plot_struct *plot;
 {
     int i;
@@ -559,7 +597,8 @@
 
 /* prepare the plot structure */
 
-void prepare_plot(plot, term_number)
+void
+prepare_plot(plot, term_number)
 plot_struct *plot;
 int term_number;
 {
@@ -580,7 +619,6 @@
 	plot->width = gW;
 	plot->height = gH;
     }
-
     if (!plot->window) {
 	plot->window = pr_window(plot->posn_flags, plot->x, plot->y, plot->width, plot->height);
 	++windows_open;
@@ -612,7 +650,8 @@
 
 /* store a command in a plot structure */
 
-void store_command(buffer, plot)
+void
+store_command(buffer, plot)
 char *buffer;
 plot_struct *plot;
 {
@@ -635,19 +674,79 @@
 }
 
 #ifndef VMS
+
+/* Handle input.  Use read instead of fgets because stdio buffering
+* causes trouble when combined with calls to select.
+*/
+int
+read_input ()
+{
+    static int rdbuf_size = 10*Nbuf;
+    static char rdbuf[10*Nbuf-1];
+    static int total_chars;
+    static int rdbuf_offset;
+    static int buf_offset;
+    static int partial_read = 0;
+    int fd = fileno (X11_ipc);
+
+    if (! partial_read)
+	buf_offset = 0;
+
+    if (! buffered_input_available) {
+	total_chars = read (fd, rdbuf, rdbuf_size);
+	buffered_input_available = 1;
+	partial_read = 0;
+	rdbuf_offset = 0;
+	if (total_chars < 0)
+	    return -1;
+    }
+
+    if (rdbuf_offset < total_chars) {
+	while (rdbuf_offset < total_chars && buf_offset < Nbuf) {
+	    char c = rdbuf[rdbuf_offset++];
+	    buf[buf_offset++] = c;
+	    if (c == '\n')
+		break;
+	}
+
+	if (buf_offset == Nbuf) {
+	    fputs("\
+\n\
+gnuplot: buffer overflow in read_input!\n\
+gnuplot: X11 aborted.\n", stderr);
+	    EXIT(1);
+	} else
+	    buf[buf_offset] = NUL;
+    }
+
+    if (rdbuf_offset == total_chars) {
+	buffered_input_available = 0;
+	if (buf[buf_offset-1] != '\n')
+	    partial_read = 1;
+    }
+
+    return partial_read;
+}
+
+
 /*-----------------------------------------------------------------------------
  *   record - record new plot from gnuplot inboard X11 driver (Unix)
  *---------------------------------------------------------------------------*/
 
-int record()
+int
+record()
 {
     static plot_struct *plot = plot_array;
 
-    while (fgets(buf, Nbuf, X11_ipc)) {
+    while (1) {
+	int status = read_input ();
+	if (status != 0)
+	    return status;
+
 	switch (*buf) {
 	case 'G':		/* enter graphics mode */
 	    {
-		int plot_number = atoi(buf + 1);	/* 0 if none specified */
+		int plot_number = atoi(buf + 1);    /* 0 if none specified */
 
 		if (plot_number < 0 || plot_number >= MAX_WINDOWS)
 		    plot_number = 0;
@@ -668,20 +767,6 @@
 	    continue;
 	}
     }
-
-    /* get here if fgets fails */
-
-#ifdef OSK
-    if (feof(X11_ipc))		/* On OS-9 sometimes while resizing the window,  */
-	_cleareof(X11_ipc);	/* and plotting data, the eof or error flag of   */
-    if (ferror(X11_ipc))	/* X11_ipc stream gets set, while there is       */
-	clearerr(X11_ipc);	/* nothing wrong! Probably a bug in my select()? */
-#else
-    if (feof(X11_ipc) || ferror(X11_ipc))
-	return 0;
-#endif /* not OSK */
-
-    return 1;
 }
 
 #else /* VMS */
@@ -749,7 +834,8 @@
  *   display - display a stored plot
  *---------------------------------------------------------------------------*/
 
-void display(plot)
+void
+display(plot)
 plot_struct *plot;
 {
     int n, x, y, sw, sl, lt = 0, width, type, point, px, py;
@@ -775,10 +861,10 @@
 	XFreeGC(dpy, gc);
 
     if (!plot->pixmap) {
-	FPRINTF((stderr, "Create pixmap %d : %dx%dx%d\n", plot - plot_array, plot->width, plot->height, D));
+	FPRINTF((stderr, "Create pixmap %d : %dx%dx%d\n", plot - plot_array, plot->width,
+		 plot->height, D));
 	plot->pixmap = XCreatePixmap(dpy, root, plot->width, plot->height, D);
     }
-
     gc = XCreateGC(dpy, plot->pixmap, 0, (XGCValues *) 0);
 
     XSetFont(dpy, gc, font->fid);
@@ -846,7 +932,7 @@
 		 * There may be an off-by-one (or more) error here.
 		 * style ignored here for the moment
 		 */
-		ytmp += h;		/* top left corner of rectangle to be filled */
+		ytmp += h;	/* top left corner of rectangle to be filled */
 		w *= xscale;
 		h *= yscale;
 		XSetForeground(dpy, gc, colors[0]);
@@ -1006,7 +1092,8 @@
  *  reset all cursors (since we dont have a record of the previous terminal #)
  *---------------------------------------------------------------------------*/
 
-void reset_cursor()
+void
+reset_cursor()
 {
     int plot_number;
     plot_struct *plot = plot_array;
@@ -1028,7 +1115,8 @@
  *   resize - rescale last plot if window resized
  *---------------------------------------------------------------------------*/
 
-plot_struct *find_plot(window)
+plot_struct *
+find_plot(window)
 Window window;
 {
     int plot_number;
@@ -1047,7 +1135,8 @@
     return NULL;
 }
 
-void process_event(event)
+void
+process_event(event)
 XEvent *event;
 {
     FPRINTF((stderr, "Event 0x%x\n", event->type));
@@ -1107,10 +1196,12 @@
 /*-----------------------------------------------------------------------------
  *   preset - determine options, open display, create window
  *---------------------------------------------------------------------------*/
-
+/*
 #define On(v) ( !strcmp(v,"on") || !strcmp(v,"true") || \
                 !strcmp(v,"On") || !strcmp(v,"True") || \
                 !strcmp(v,"ON") || !strcmp(v,"TRUE") )
+*/
+#define On(v) ( !strnicmp(v,"on",2) || !strnicmp(v,"true",4) )
 
 #define AppDefDir "/usr/lib/X11/app-defaults"
 #ifndef MAXHOSTNAMELEN
@@ -1157,7 +1248,8 @@
 
 #define Nopt (sizeof(options) / sizeof(options[0]))
 
-void preset(argc, argv)
+void
+preset(argc, argv)
 int argc;
 char *argv[];
 {
@@ -1189,8 +1281,11 @@
 
     while (++Argv, --Argc > 0) {
 	if (!strcmp(*Argv, "-name") && Argc > 1) {
-	    safe_strncpy(Name, Argv[1], sizeof(Name));
-	    safe_strncpy(Class, Argv[1], sizeof(Class));
+	    strncpy(Name, Argv[1], sizeof(Name) - 1);
+	    strncpy(Class, Argv[1], sizeof(Class) - 1);
+	    /* just in case */
+	    Name[sizeof(Name)-1] = NUL;
+	    Class[sizeof(Class)-1] = NUL;
 	    if (Class[0] >= 'a' && Class[0] <= 'z')
 		Class[0] -= 0x20;
 	}
@@ -1240,17 +1335,17 @@
 
 #ifdef VMS
     strcpy(buffer, "DECW$USER_DEFAULTS:GNUPLOT_X11.INI");
-#else
-# ifdef OS2
+#elif defined OS2
 /* for Xfree86 ... */
     {
 	char *appdefdir = "XFree86/lib/X11/app-defaults";
 	char *xroot = getenv("X11ROOT");
 	sprintf(buffer, "%s/%s/%s", xroot, appdefdir, "Gnuplot");
     }
-# else
-    sprintf(buffer, "%s/%s", AppDefDir, "Gnuplot");
-# endif /* !OS2 */
+# else /* !OS/2 */
+    strcpy(buffer, AppDefDir);
+    strcat(buffer, "/");
+    strcat(buffer, "Gnuplot");
 #endif /* !VMS */
 
     dbApp = XrmGetFileDatabase(buffer);
@@ -1264,7 +1359,8 @@
 #ifdef VMS
 	strcpy(buffer, "DECW$USER_DEFAULTS:DECW$XDEFAULTS.DAT");
 #else
-	sprintf(buffer, "%s/.Xdefaults", home);
+	strcpy(buffer, home);
+	strcat(buffer, ".Xdefaults");
 #endif
 	dbDef = XrmGetFileDatabase(buffer);
     }
@@ -1284,7 +1380,9 @@
 	}
 	if ((p = strchr(host, '.')) != NULL)
 	    *p = '\0';
-	sprintf(buffer, "%s/.Xdefaults-%s", home, host);
+	strcpy(buffer, home);
+	strcat(buffer, "/.Xdefaults-");
+	strcat(buffer, host);
 	dbEnv = XrmGetFileDatabase(buffer);
     }
     XrmMergeDatabases(dbEnv, &db);
@@ -1311,7 +1409,7 @@
  *---------------------------------------------------------------------------*/
 
 char *
- pr_GetR(xrdb, resource)
+pr_GetR(xrdb, resource)
 XrmDatabase xrdb;
 char *resource;
 {
@@ -1322,8 +1420,8 @@
     strcpy(class, Class);
     strcat(class, resource);
     rc = XrmGetResource(xrdb, name, class, type, &value)
-	? (char *) value.addr
-	: (char *) 0;
+    ? (char *) value.addr
+    : (char *) 0;
     return (rc);
 }
 
@@ -1347,7 +1445,8 @@
     "gray90", "gray50", "gray70", "gray30"
 };
 
-void pr_color()
+void
+pr_color()
 {
     unsigned long black = BlackPixel(dpy, scr), white = WhitePixel(dpy, scr);
     char option[20], color[30], *v, *ctype;
@@ -1429,7 +1528,8 @@
     "0", "0", "0", "0", "0", "0", "0", "0"
 };
 
-void pr_dashes()
+void
+pr_dashes()
 {
     int n, j, l, ok;
     char option[20], *v;
@@ -1465,7 +1565,8 @@
  *   pr_font - determine font          
  *---------------------------------------------------------------------------*/
 
-void pr_font()
+void
+pr_font()
 {
     char *fontname = pr_GetR(db, ".font");
 
@@ -1490,7 +1591,8 @@
  *   pr_geometry - determine window geometry      
  *---------------------------------------------------------------------------*/
 
-void pr_geometry()
+void
+pr_geometry()
 {
     char *geometry = pr_GetR(db, ".geometry");
     int x, y, flags;
@@ -1520,7 +1622,8 @@
  *   pr_pointsize - determine size of points for 'points' plotting style
  *---------------------------------------------------------------------------*/
 
-void pr_pointsize()
+void
+pr_pointsize()
 {
     if (pr_GetR(db, ".pointsize")) {
 	if (sscanf((char *) value.addr, "%lf", &pointsize) == 1) {
@@ -1546,7 +1649,8 @@
     "line1", "line2", "line3", "line4", "line5", "line6", "line7", "line8"
 };
 
-void pr_width()
+void
+pr_width()
 {
     int n;
     char option[20], *v;
@@ -1568,7 +1672,8 @@
  *   pr_window - create window 
  *---------------------------------------------------------------------------*/
 
-Window pr_window(flags, x, y, width, height)
+Window
+pr_window(flags, x, y, width, height)
 unsigned int flags;
 int x, y;
 unsigned int width, height;
@@ -1619,14 +1724,16 @@
 
 
 /***** pr_raise ***/
-void pr_raise()
+void
+pr_raise()
 {
     if (pr_GetR(db, ".raise"))
 	do_raise = (On(value.addr));
 }
 
 
-void pr_persist()
+void
+pr_persist()
 {
     if (pr_GetR(db, ".persist"))
 	persist = (On(value.addr));
@@ -1639,7 +1746,8 @@
 /* bit of a bodge, but ... */
 static struct plot_struct *exported_plot;
 
-void export_graph(plot)
+void
+export_graph(plot)
 struct plot_struct *plot;
 {
     FPRINTF((stderr, "export_graph(0x%x)\n", plot));
@@ -1651,7 +1759,8 @@
     exported_plot = plot;
 }
 
-void handle_selection_event(event)
+void
+handle_selection_event(event)
 XEvent *event;
 {
     switch (event->type) {
@@ -1675,7 +1784,7 @@
 	    FPRINTF((stderr, "selection request\n"));
 
 	    if (reply.xselection.target == XA_TARGETS) {
-		static Atom targets[] =	{XA_PIXMAP, XA_COLORMAP};
+		static Atom targets[] = { XA_PIXMAP, XA_COLORMAP };
 
 		FPRINTF((stderr, "Targets request from %d\n", reply.xselection.requestor));
 
@@ -1696,7 +1805,7 @@
 
 		XChangeProperty(dpy, reply.xselection.requestor,
 				reply.xselection.property, reply.xselection.target, 32, PropModeReplace,
-			  (unsigned char *) &(exported_plot->pixmap), 1);
+				(unsigned char *) &(exported_plot->pixmap), 1);
 	    } else {
 		reply.xselection.property = None;
 	    }
diff -urN gnuplot-3.7/graph3d.c gnuplot-3.7.1/graph3d.c
--- gnuplot-3.7/graph3d.c	Thu Dec  3 22:24:45 1998
+++ gnuplot-3.7.1/graph3d.c	Tue Oct 19 14:31:49 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: graph3d.c,v 1.106 1998/06/18 14:55:07 ddenholm Exp $";
+static char *RCSid = "$Id: graph3d.c,v 1.13.2.4 1999/10/19 13:31:49 lhecking Exp $";
 #endif
 
 /* GNUPLOT - graph3d.c */
@@ -397,13 +397,20 @@
     key_rows = ptitl_cnt;
     key_cols = 1;
     if (key == -1 && key_vpos == TUNDER) {
+      if (ptitl_cnt > 0) {
 	/* calculate max no cols, limited by label-length */
 	key_cols = (int) (xright - xleft) / ((max_ptitl_len + 4) * (t->h_char) + key_sample_width);
+	/* HBB 991019: fix division by zero problem */
+	if (key_cols == 0)
+	    key_cols = 1;
 	key_rows = (int) (ptitl_cnt / key_cols) + ((ptitl_cnt % key_cols) > 0);
 	/* now calculate actual no cols depending on no rows */
 	key_cols = (int) (ptitl_cnt / key_rows) + ((ptitl_cnt % key_rows) > 0);
 	key_col_wth = (int) (xright - xleft) / key_cols;
 	/* key_rows += ktitle_lines; - messes up key - div */
+      } else {
+	key_rows = key_cols = key_col_wth = 0;
+      }
     }
     /* this should also consider the view and number of lines in
      * xformat || yformat || xlabel || ylabel */
@@ -443,7 +450,7 @@
     /* HBB 980308: sigh... another 16bit glitch: on term's with more than
      * 8000 pixels in either direction, these calculations produce garbage
      * results if done in (16bit) ints */
-    xscaler = (xright - xleft) * 4 / 7;		/* HBB: Magic number alert! */
+    xscaler = ((xright - xleft) * 4L) / 7L;              /* HBB: Magic number alert! */
     yscaler = ((ytop - ybot) * 4L) / 7L;
 
 }
@@ -487,13 +494,13 @@
     struct surface_points *this_plot = NULL;
     unsigned int xl, yl;
     int linetypeOffset = 0;
-    double ztemp, temp;
+    /* double ztemp, temp; unused */
     struct text_label *this_label;
     struct arrow_def *this_arrow;
     TBOOLEAN scaling;
     transform_matrix mat;
     int key_count;
-    char ss[MAX_LINE_LEN+1], *s, *e;
+    char *s, *e;
 
     /* Initiate transformation matrix using the global view variables. */
     mat_rot_z(surface_rot_z, trans_mat);
@@ -502,12 +509,14 @@
     mat_scale(surface_scale / 2.0, surface_scale / 2.0, surface_scale / 2.0, mat);
     mat_mult(trans_mat, trans_mat, mat);
 
+#if 0
+    /* HBB 19990609: this is *not* the way to implement 'set view' <z_scale> */
     /* modify min_z/max_z so it will zscale properly. */
     ztemp = (z_max3d - z_min3d) / (2.0 * surface_zscale);
     temp = (z_max3d + z_min3d) / 2.0;
     z_min3d = temp - ztemp;
     z_max3d = temp + ztemp;
-
+#endif /* 0 */
 
     /* The extrema need to be set even when a surface is not being
      * drawn.   Without this, gnuplot used to assume that the X and
@@ -573,7 +582,7 @@
     boundary3d(scaling, plots, pcount);
 
     /* SCALE FACTORS */
-    zscale3d = 2.0 / (ceiling_z - floor_z);
+    zscale3d = 2.0 / (ceiling_z - floor_z) * surface_zscale;
     yscale3d = 2.0 / (y_max3d - y_min3d);
     xscale3d = 2.0 / (x_max3d - x_min3d);
 
@@ -581,10 +590,9 @@
 
     /* PLACE TITLE */
     if (*title.text != 0) {
-	safe_strncpy(ss, title.text, sizeof(ss));
 	write_multiline((unsigned int) ((xleft + xright) / 2 + title.xoffset * t->h_char),
 			(unsigned int) (ytop + (titlelin + title.yoffset) * (t->h_char)),
-			ss, CENTRE, JUST_TOP, 0, title.font);
+			title.text, CENTRE, JUST_TOP, 0, title.font);
     }
     /* PLACE TIMEDATE */
     if (*timelabel.text) {
@@ -619,7 +627,6 @@
 
 
 	map_position(&this_label->place, &x, &y, "label");
-	safe_strncpy(ss, this_label->text, sizeof(ss));
 	if (this_label->rotate && (*t->text_angle) (1)) {
 	    write_multiline(x, y, this_label->text, this_label->pos, CENTRE, 1, this_label->font);
 	    (*t->text_angle) (0);
@@ -675,6 +682,9 @@
 	    xl /= 1000;
 	    xl += xleft;
 #else
+	    /* HBB 19990608: why calculate these again? boundary3d has already 
+	     * done it... */
+	    if (ptitl_cnt > 0) {
 	    /* maximise no cols, limited by label-length */
 	    key_cols = (int) (xright - xleft) / key_col_wth;
 	    key_rows = (int) (ptitl_cnt + key_cols - 1) / key_cols;
@@ -689,6 +699,7 @@
 	     */
 	    xl = xleft + ((xright - xleft) * key_size_left) / (key_cols * (key_size_left + key_size_right));
 	    yl = yoffset * t->ymax + (key_rows) * key_entry_height + (ktitle_lines + 2) * t->v_char;
+	    }
 #endif
 	} else {
 	    if (key_vpos == TTOP) {
@@ -735,7 +746,9 @@
 
     /* KEY TITLE */
     if (key != 0 && strlen(key_title)) {
-	sprintf(ss, "%s\n", key_title);
+	char *ss = gp_alloc(strlen(key_title) + 2, "tmp string ss");
+	strcpy(ss, key_title);
+	strcat(ss, "\n");
 	s = ss;
 	yl -= t->v_char / 2;
 	while ((e = (char *) strchr(s, '\n')) != NULL) {
@@ -757,6 +770,7 @@
 	    yl -= t->v_char;
 	}
 	yl += t->v_char / 2;
+	free(ss);
     }
     key_count = 0;
     yl_ref = yl -= key_entry_height / 2;	/* centralise the keys */
@@ -1618,8 +1632,7 @@
 		y1 -= tic_unity * ticscale * (t->v_tic);
 	    }
 	    /* write_multiline mods it */
-	    safe_strncpy(ss, xlabel.text, sizeof(ss));
-	    write_multiline(x1, y1, ss, CENTRE, JUST_TOP, 0, xlabel.font);
+	    write_multiline(x1, y1, xlabel.text, CENTRE, JUST_TOP, 0, xlabel.font);
 	}
     }
     if (ytics || *ylabel.text) {
@@ -1665,16 +1678,16 @@
 	gen_tics(FIRST_Z_AXIS, &zticdef, work_grid.l_type & (GRID_Z | GRID_MZ),
 		 mztics, mztfreq, ztick_callback);
     }
-    if ((xzeroaxis.l_type >= -2) && !is_log_y && inrange(0, y_min3d, y_max3d)) {
+    if ((yzeroaxis.l_type >= -2) && !is_log_x && inrange(0, x_min3d, x_max3d)) {
 	unsigned int x, y, x1, y1;
-	term_apply_lp_properties(&xzeroaxis);
+	term_apply_lp_properties(&yzeroaxis);
 	map3d_xy(0.0, y_min3d, base_z, &x, &y);		/* line through x=0 */
 	map3d_xy(0.0, y_max3d, base_z, &x1, &y1);
 	draw_clip_line(x, y, x1, y1);
     }
-    if ((yzeroaxis.l_type >= -2) && !is_log_x && inrange(0, x_min3d, x_max3d)) {
+    if ((xzeroaxis.l_type >= -2) && !is_log_y && inrange(0, y_min3d, y_max3d)) {
 	unsigned int x, y, x1, y1;
-	term_apply_lp_properties(&yzeroaxis);
+	term_apply_lp_properties(&xzeroaxis);
 	map3d_xy(x_min3d, 0.0, base_z, &x, &y);		/* line through y=0 */
 	map3d_xy(x_max3d, 0.0, base_z, &x1, &y1);
 	draw_clip_line(x, y, x1, y1);
@@ -1686,8 +1699,7 @@
 	x += zlabel.xoffset * t->h_char;
 	y += zlabel.yoffset * t->v_char;
 
-	safe_strncpy(ss, zlabel.text, sizeof(ss));
-	write_multiline(x, y, ss, CENTRE, CENTRE, 0, zlabel.font);
+	write_multiline(x, y, zlabel.text, CENTRE, CENTRE, 0, zlabel.font);
 
     }
 }
diff -urN gnuplot-3.7/graphics.c gnuplot-3.7.1/graphics.c
--- gnuplot-3.7/graphics.c	Tue Jan 12 14:02:37 1999
+++ gnuplot-3.7.1/graphics.c	Wed Sep 15 16:30:29 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: graphics.c,v 1.138 1998/06/18 14:55:08 ddenholm Exp $";
+static char *RCSid = "$Id: graphics.c,v 1.24.2.2 1999/09/15 15:30:29 lhecking Exp $";
 #endif
 
 /* GNUPLOT - graphics.c */
@@ -593,12 +593,14 @@
 	    top_margin = y2label_textheight;
 
 	top_margin += x2tic_height + x2tic_textheight;
-/* FIXME: what is this additional space reservation for??? */
+	/* x2tic_height and x2tic_textheight are computed as only the
+	 *     relevant heights, but they nonetheless need a blank
+	 *     space above them  */
 	if (top_margin > x2tic_height)
 	    top_margin += (int) (t->v_char);
 
 	ytop -= top_margin;
-	if (ytop == (int) ((ysize + yoffset) * (t->ymax))) {
+	if (ytop == (int) (0.5 + (ysize + yoffset) * (t->ymax))) {
 	    /* make room for the end of rotated ytics or y2tics */
 	    ytop -= (int) ((t->h_char) * 2);
 	}
@@ -646,7 +648,7 @@
 
     /* xlabel */
     if (xlablin) {
-	/* offset is subtracted because if . 0, the margin is smaller */
+	/* offset is subtracted because if > 0, the margin is smaller */
 	xlabel_textheight = (int) ((xlablin - xlabel.yoffset) * (t->v_char));
 	if (!xtics)
 	    xlabel_textheight += 0.5 * t->v_char;
@@ -659,9 +661,8 @@
 	 * DBT 11-18-98 resize plot for vertical timelabels too !
 	 */
 	/* offset is subtracted because if . 0, the margin is smaller */
-	timebot_textheight = (int) ((timelin - timelabel.yoffset + 1.5) * (t->v_char));
-    }
-    else
+	timebot_textheight = (int) ((timelin - timelabel.yoffset) * (t->v_char));
+    } else
 	timebot_textheight = 0;
 
     /* compute ybot from the various components
@@ -671,9 +672,13 @@
 
     if (bmargin < 0) {
 	ybot += xtic_height + xtic_textheight;
-	if (timebot_textheight > 0 || xlabel_textheight > 0)
-	    ybot += (timebot_textheight > xlabel_textheight) ? timebot_textheight : xlabel_textheight;
-	if (ybot == (t->ymax) * yoffset) {
+	if (xlabel_textheight > 0)
+	    ybot += xlabel_textheight;
+	if (timebot_textheight > 0)
+	    ybot += timebot_textheight;
+	/* HBB 19990616: round to nearest integer, required to escape
+	 * floating point inaccuracies */
+	if (ybot == (int)(0.5 + (t->ymax) * yoffset)) {
 	    /* make room for the end of rotated ytics or y2tics */
 	    ybot += (int) ((t->h_char) * 2);
 	}
@@ -845,7 +850,12 @@
 	xleft += (timelabel_textwidth > ylabel_textwidth ? timelabel_textwidth : ylabel_textwidth)
 	    + ytic_width + ytic_textwidth;
 
-	if (xleft == (t->xmax) * xoffset) {
+	/* make sure xleft is wide enough for a negatively
+	 * x-offset horizontal timestamp
+	 */
+	if (!vertical_timelabel && xleft - ytic_width - ytic_textwidth < -(int) (timelabel.xoffset * (t->h_char)))
+	xleft = ytic_width + ytic_textwidth - (int) (timelabel.xoffset * (t->h_char));
+	if (xleft == (int)(0.5 + (t->xmax) * xoffset)) {
 	    /* make room for end of xtic or x2tic label */
 	    xleft += (int) ((t->h_char) * 2);
 	}
@@ -854,11 +864,6 @@
     } else
 	xleft += (int) (lmargin * (t->h_char));
 
-    /* make sure xleft is wide enough for a negatively
-     * x-offset horizontal timestamp
-     */
-    if (!vertical_timelabel && xleft - ytic_width - ytic_textwidth < -(int) (timelabel.xoffset * (t->h_char)))
-	xleft = ytic_width + ytic_textwidth - (int) (timelabel.xoffset * (t->h_char));
     /*  end of xleft calculation }}} */
 
 
@@ -913,7 +918,7 @@
 	    xright -= key_col_wth * key_cols;
 	    key_xl = xright + (int) (t->h_tic);
 	}
-	if (xright == (t->xmax) * (xsize + xoffset)) {
+	if (xright == (int)(0.5 + (t->xmax) * (xsize + xoffset))) {
 	    /* make room for end of xtic or x2tic label */
 	    xright -= (int) ((t->h_char) * 2);
 	}
@@ -929,7 +934,7 @@
 	double current_aspect_ratio;
 
 	if (aspect_ratio < 0 && (max_array[x_axis] - min_array[x_axis]) != 0.0) {
-	    current_aspect_ratio = -aspect_ratio * (max_array[y_axis] - min_array[y_axis]) / (max_array[x_axis] - min_array[x_axis]);
+	    current_aspect_ratio = -aspect_ratio * fabs((max_array[y_axis] - min_array[y_axis]) / (max_array[x_axis] - min_array[x_axis]));
 	} else
 	    current_aspect_ratio = aspect_ratio;
 
@@ -942,8 +947,6 @@
 		/* too tall */
 		ytop = ybot + required * (xright - xleft);
 	    } else {
-		/* HBB: y2label_x wasn't defined yet, and would be
-		 * overwritten later */
 		xright = xleft + (ytop - ybot) / required;
 	    }
 	}
@@ -973,18 +976,14 @@
     if (tmargin < 0 && x2tics & TICS_ON_BORDER && vertical_x2tics) {
 	widest_tic = 0;		/* reset the global variable ... */
 	gen_tics(SECOND_X_AXIS, &x2ticdef, 0, 0, 0.0, widest2d_callback);
-/* HBB: redid this: remove rough guess value first. Among other reasons,
- * I suspected the '-4 lines' of the original code to be in error, as the
- * original calc. of x2tic_textheight uses *5* lines */
 	ytop += x2tic_textheight;
-/* Now compute a new one and use that instead: */
+	/* Now compute a new one and use that instead: */
 	x2tic_textheight = (int) ((t->h_char) * (widest_tic));
 	ytop -= x2tic_textheight;
     }
     if (bmargin < 0 && xtics & TICS_ON_BORDER && vertical_xtics) {
 	widest_tic = 0;		/* reset the global variable ... */
 	gen_tics(FIRST_X_AXIS, &xticdef, 0, 0, 0.0, widest2d_callback);
-/* HBB: same changes as for tmargin/ytop above */
 	ybot -= xtic_textheight;
 	xtic_textheight = (int) ((t->h_char) * widest_tic);
 	ybot += xtic_textheight;
@@ -1002,14 +1001,14 @@
 
     y2label_y = ytop + x2tic_height + x2tic_textheight + y2label_textheight;
 
-    xlabel_y = ybot - xtic_height - xtic_textheight - xlabel_textheight + t->v_char;
+    xlabel_y = ybot - xtic_height - xtic_textheight - xlabel_textheight + xlablin*(t->v_char);
     ylabel_x = xleft - ytic_width - ytic_textwidth;
     if (*ylabel.text && can_rotate)
 	ylabel_x -= ylabel_textwidth;
 
     y2label_x = xright + y2tic_width + y2tic_textwidth;
     if (*y2label.text && can_rotate)
-	y2label_x += y2label_textwidth - t->v_char;
+	y2label_x += y2label_textwidth - y2lablin * t->v_char;
 
     if (vertical_timelabel) {
 	if (timelabel_bottom)
@@ -1019,7 +1018,7 @@
 	}
     } else {
 	if (timelabel_bottom)
-	    time_y = xlabel_y - timebot_textheight + xlabel_textheight;
+	    time_y = ybot - xtic_height - xtic_textheight - xlabel_textheight - timebot_textheight + t->v_char;
 	else if (ylabel_textheight > 0)
 	    time_y = ylabel_y + timetop_textheight;
 	else
@@ -1304,7 +1303,7 @@
     struct text_label *this_label;
     struct arrow_def *this_arrow;
     TBOOLEAN scaling;
-    char ss[MAX_LINE_LEN + 1], *s, *e;
+    char *s, *e;
 
     /* so that macros for x_min etc pick up correct values
      * until this is done properly
@@ -1561,44 +1560,45 @@
 
     x_axis = FIRST_X_AXIS;
     y_axis = FIRST_Y_AXIS;	/* chose scaling */
-    axis_zero[FIRST_X_AXIS] = map_y(0.0);
-    axis_zero[FIRST_Y_AXIS] = map_x(0.0);
+    axis_zero[FIRST_Y_AXIS] = map_y(0.0);
+    axis_zero[FIRST_X_AXIS] = map_x(0.0);
 
-    if (axis_zero[FIRST_X_AXIS] < ybot || is_log_y)
-	axis_zero[FIRST_X_AXIS] = ybot;		/* save for impulse plotting */
-    else if (axis_zero[FIRST_X_AXIS] >= ytop)
-	axis_zero[FIRST_X_AXIS] = ytop;
+    if (axis_zero[FIRST_Y_AXIS] < ybot || is_log_y)
+	axis_zero[FIRST_Y_AXIS] = ybot;		/* save for impulse plotting */
+    else if (axis_zero[FIRST_Y_AXIS] >= ytop)
+	axis_zero[FIRST_Y_AXIS] = ytop;
     else if (xzeroaxis.l_type > -3) {
 	term_apply_lp_properties(&xzeroaxis);
-	(*t->move) (xleft, axis_zero[FIRST_X_AXIS]);
-	(*t->vector) (xright, axis_zero[FIRST_X_AXIS]);
+	(*t->move) (xleft, axis_zero[FIRST_Y_AXIS]);
+	(*t->vector) (xright, axis_zero[FIRST_Y_AXIS]);
     }
     if ((yzeroaxis.l_type > -3) && !is_log_x
-				&& axis_zero[FIRST_Y_AXIS] >= xleft
-				&& axis_zero[FIRST_Y_AXIS] < xright) {
+	&& axis_zero[FIRST_X_AXIS] >= xleft
+	&& axis_zero[FIRST_X_AXIS] < xright) {
 	term_apply_lp_properties(&yzeroaxis);
-	(*t->move) (axis_zero[FIRST_Y_AXIS], ybot);
-	(*t->vector) (axis_zero[FIRST_Y_AXIS], ytop);
+	(*t->move) (axis_zero[FIRST_X_AXIS], ybot);
+	(*t->vector) (axis_zero[FIRST_X_AXIS], ytop);
     }
     x_axis = SECOND_X_AXIS;
     y_axis = SECOND_Y_AXIS;	/* chose scaling */
-    axis_zero[SECOND_X_AXIS] = map_y(0.0);
-    axis_zero[SECOND_Y_AXIS] = map_x(0.0);
+    axis_zero[SECOND_Y_AXIS] = map_y(0.0);
+    axis_zero[SECOND_X_AXIS] = map_x(0.0);
 
-    if (axis_zero[SECOND_X_AXIS] < ybot || is_log_y2)
-	axis_zero[SECOND_X_AXIS] = ybot;	/* save for impulse plotting */
-    else if (axis_zero[SECOND_X_AXIS] >= ytop)
-	axis_zero[SECOND_X_AXIS] = ytop;
+    if (axis_zero[SECOND_Y_AXIS] < ybot || is_log_y2)
+	axis_zero[SECOND_Y_AXIS] = ybot;  /* save for impulse plotting */
+    else if (axis_zero[SECOND_Y_AXIS] >= ytop)
+	axis_zero[SECOND_Y_AXIS] = ytop;
     else if (x2zeroaxis.l_type > -3) {
 	term_apply_lp_properties(&x2zeroaxis);
-	(*t->move) (xleft, axis_zero[SECOND_X_AXIS]);
-	(*t->vector) (xright, axis_zero[SECOND_X_AXIS]);
+	(*t->move) (xleft, axis_zero[SECOND_Y_AXIS]);
+	(*t->vector) (xright, axis_zero[SECOND_Y_AXIS]);
     }
-    if ((y2zeroaxis.l_type > -3) && !is_log_x2 && axis_zero[SECOND_Y_AXIS] >= xleft &&
-	axis_zero[SECOND_Y_AXIS] < xright) {
+    if ((y2zeroaxis.l_type > -3) && !is_log_x2 &&
+	axis_zero[SECOND_X_AXIS] >= xleft &&
+	axis_zero[SECOND_X_AXIS] < xright) {
 	term_apply_lp_properties(&y2zeroaxis);
-	(*t->move) (axis_zero[SECOND_Y_AXIS], ybot);
-	(*t->vector) (axis_zero[SECOND_Y_AXIS], ytop);
+	(*t->move) (axis_zero[SECOND_X_AXIS], ybot);
+	(*t->vector) (axis_zero[SECOND_X_AXIS], ytop);
     }
     /* DRAW PLOT BORDER */
     if (draw_border) {
@@ -1629,68 +1629,66 @@
     }
 /* YLABEL */
     if (*ylabel.text) {
-	strcpy(ss, ylabel.text);
 	/* we worked out x-posn in boundary() */
 	if ((*t->text_angle) (1)) {
 	    unsigned int x = ylabel_x + (t->v_char / 2);
 	    unsigned int y = (ytop + ybot) / 2 + ylabel.yoffset * (t->h_char);
-	    write_multiline(x, y, ss, CENTRE, JUST_TOP, 1, ylabel.font);
+	    write_multiline(x, y, ylabel.text, CENTRE, JUST_TOP, 1, ylabel.font);
 	    (*t->text_angle) (0);
 	} else {
 	    /* really bottom just, but we know number of lines 
 	       so we need to adjust x-posn by one line */
 	    unsigned int x = ylabel_x;
 	    unsigned int y = ylabel_y;
-	    write_multiline(x, y, ss, LEFT, JUST_TOP, 0, ylabel.font);
+	    write_multiline(x, y, ylabel.text, LEFT, JUST_TOP, 0, ylabel.font);
 	}
     }
 /* Y2LABEL */
     if (*y2label.text) {
-	strcpy(ss, y2label.text);
 	/* we worked out coordinates in boundary() */
 	if ((*t->text_angle) (1)) {
 	    unsigned int x = y2label_x + (t->v_char / 2) - 1;
 	    unsigned int y = (ytop + ybot) / 2 + y2label.yoffset * (t->h_char);
-	    write_multiline(x, y, ss, CENTRE, JUST_TOP, 1, y2label.font);
+	    write_multiline(x, y, y2label.text, CENTRE, JUST_TOP, 1, y2label.font);
 	    (*t->text_angle) (0);
 	} else {
 	    /* really bottom just, but we know number of lines */
 	    unsigned int x = y2label_x;
 	    unsigned int y = y2label_y;
-	    write_multiline(x, y, ss, RIGHT, JUST_TOP, 0, y2label.font);
+	    write_multiline(x, y, y2label.text, RIGHT, JUST_TOP, 0, y2label.font);
 	}
     }
 /* XLABEL */
     if (*xlabel.text) {
 	unsigned int x = (xright + xleft) / 2 + xlabel.xoffset * (t->h_char);
 	unsigned int y = xlabel_y - t->v_char / 2;	/* HBB */
-	strcpy(ss, xlabel.text);
-	write_multiline(x, y, ss, CENTRE, JUST_TOP, 0, xlabel.font);
+	write_multiline(x, y, xlabel.text, CENTRE, JUST_TOP, 0, xlabel.font);
     }
 /* PLACE TITLE */
     if (*title.text) {
 	/* we worked out y-coordinate in boundary() */
 	unsigned int x = (xleft + xright) / 2 + title.xoffset * t->h_char;
 	unsigned int y = title_y - t->v_char / 2;
-	strcpy(ss, title.text);
-	write_multiline(x, y, ss, CENTRE, JUST_TOP, 0, title.font);
+	write_multiline(x, y, title.text, CENTRE, JUST_TOP, 0, title.font);
     }
 /* X2LABEL */
     if (*x2label.text) {
 	/* we worked out y-coordinate in boundary() */
 	unsigned int x = (xright + xleft) / 2 + x2label.xoffset * (t->h_char);
 	unsigned int y = x2label_y - t->v_char / 2 - 1;
-	strcpy(ss, x2label.text);
-	write_multiline(x, y, ss, CENTRE, JUST_TOP, 0, x2label.font);
+	write_multiline(x, y, x2label.text, CENTRE, JUST_TOP, 0, x2label.font);
     }
 /* PLACE TIMEDATE */
     if (*timelabel.text) {
 	/* we worked out coordinates in boundary() */
-	char str[MAX_LINE_LEN + 1];
+	char *str;
 	time_t now;
 	unsigned int x = time_x;
 	unsigned int y = time_y;
 	time(&now);
+	/* there is probably now way to find out in advance how many
+	 * chars strftime() writes */
+	str = gp_alloc(MAX_LINE_LEN + 1, "timelabel.text");
 	strftime(str, MAX_LINE_LEN, timelabel.text, localtime(&now));
 
 	if (timelabel_rotate && (*t->text_angle) (1)) {
@@ -1713,12 +1711,11 @@
 	 this_label = this_label->next) {
 	unsigned int x, y;
 	map_position(&this_label->place, &x, &y, "label");
-	strcpy(ss, this_label->text);
 	if (this_label->rotate && (*t->text_angle) (1)) {
-	    write_multiline(x, y, ss, this_label->pos, JUST_TOP, 1, this_label->font);
+	    write_multiline(x, y, this_label->text, this_label->pos, JUST_TOP, 1, this_label->font);
 	    (*t->text_angle) (0);
 	} else {
-	    write_multiline(x, y, ss, this_label->pos, JUST_TOP, 0, this_label->font);
+	    write_multiline(x, y, this_label->text, this_label->pos, JUST_TOP, 0, this_label->font);
 	}
     }
 
@@ -1742,7 +1739,10 @@
 	yl = key_yt;
 
 	if (*key_title) {
-	    sprintf(ss, "%s\n", key_title);
+	    char *ss = gp_alloc(strlen(key_title) + 2, "tmp string ss");
+	    strcpy(ss, key_title);
+	    strcat(ss, "\n");
+
 	    s = ss;
 	    yl -= t->v_char / 2;
 	    while ((e = (char *) strchr(s, '\n')) != NULL) {
@@ -1763,6 +1763,7 @@
 		yl -= t->v_char;
 	    }
 	    yl += t->v_char / 2;
+	    free(ss);
 	}
 	yl_ref = yl -= key_entry_height / 2;	/* centralise the keys */
 	key_count = 0;
@@ -1841,7 +1842,7 @@
 	switch (this_plot->plot_style) {
 	    /*{{{  IMPULSE */
 	case IMPULSES:
-	    plot_impulses(this_plot, axis_zero[y_axis], axis_zero[x_axis]);
+	    plot_impulses(this_plot, axis_zero[x_axis], axis_zero[y_axis]);
 	    break;
 	    /*}}} */
 	    /*{{{  LINES */
@@ -1905,7 +1906,7 @@
 	    /*}}} */
 	    /*{{{  BOXXYERROR */
 	case BOXXYERROR:
-	    plot_boxes(this_plot, axis_zero[x_axis]);
+	    plot_boxes(this_plot, axis_zero[y_axis]);
 	    break;
 	    /*}}} */
 	    /*{{{  BOXERROR (falls through to) */
@@ -1916,7 +1917,7 @@
 	    /*}}} */
 	    /*{{{  BOXES */
 	case BOXES:
-	    plot_boxes(this_plot, axis_zero[x_axis]);
+	    plot_boxes(this_plot, axis_zero[y_axis]);
 	    break;
 	    /*}}} */
 	    /*{{{  VECTOR */
@@ -3667,15 +3668,19 @@
 int angle;			/* assume term has already been set for this */
 char *font;			/* NULL or "" means use default */
 {
-    /* assumes we are free to mangle the text */
     register struct termentry *t = term;
-    char *p;
+    char *p = text;
+
+    if (!p)
+	return;
+
     if (vert != JUST_TOP) {
 	/* count lines and adjust y */
 	int lines = 0;		/* number of linefeeds - one fewer than lines */
-	for (p = text; *p; ++p)
+	while (*p++) {
 	    if (*p == '\n')
 		++lines;
+	}
 	if (angle)
 	    x -= (vert * lines * t->v_char) / 2;
 	else
@@ -3687,7 +3692,7 @@
 
     for (;;) {			/* we will explicitly break out */
 
-	if ((p = strchr(text, '\n')) != NULL)
+	if ((text != NULL) && (p = strchr(text, '\n')) != NULL)
 	    *p = 0;		/* terminate the string */
 
 	if ((*t->justify_text) (hor)) {
@@ -3706,12 +3711,17 @@
 
 	if (!p)
 	    break;
+	else {
+	    /* put it back */
+	    *p = '\n';
+	}
 
 	text = p + 1;
     }				/* unconditional branch back to the for(;;) - just a goto ! */
 
     if (font && *font)
 	(*t->set_font) (default_font);
+
 }
 
 /* display a x-axis ticmark - called by gen_ticks */
@@ -4413,7 +4423,9 @@
 			    gstrftime(label, 24, ticfmt[axis], (double) user);
 			} else if (polar) {
 			    /* if rmin is set, we stored internally with r-rmin */
-#if 0				/* Igor's polar-grid patch */
+/* Igor's polar-grid patch */
+#if 1
+			    /* HBB 990327: reverted to 'pre-Igor' version... */
 			    double r = fabs(user) + (autoscale_r & 1 ? 0 : rmin);
 #else
 			    /* Igor removed fabs to allow -ve labels */
diff -urN gnuplot-3.7/help.c gnuplot-3.7.1/help.c
--- gnuplot-3.7/help.c	Wed Dec  9 15:23:49 1998
+++ gnuplot-3.7.1/help.c	Mon Oct 11 22:24:20 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: help.c,v 1.29 1998/04/14 00:15:36 drd Exp $";
+static char *RCSid = "$Id: help.c,v 1.8.2.2 1999/10/11 21:24:20 lhecking Exp $";
 #endif
 
 /* GNUPLOT - help.c */
@@ -562,30 +562,28 @@
 		    *line = NUL;
 		    pos = 0;
 		}
-		if (pos == PER_LINE) {
+		if (pos >= PER_LINE) {
 		    (void) strcat(line, "\n");
 		    OutLine(line);
 		    *line = NUL;
 		    pos = 0;
 		}
+#define FIRSTCOL	4
+#define COLLENGTH	18
+
 		/* adapted by DvdSchaaf */
-		{
-#define FIRSTCOL	6
-#define COLLENGTH	15
-
-		    if (pos == 0)
-			spacelen = FIRSTCOL;
-		    for (ispacelen = 0;
-			 ispacelen < spacelen; ispacelen++)
-			(void) strcat(line, " ");
-		    /* commented out *
-		       (void) strcat(line, "\t");
-		     */
-		    (void) strncat(line, start, sublen);
-		    spacelen = COLLENGTH - sublen;
-		    if (spacelen <= 0)
-			spacelen = 1;
+		if (pos == 0)
+		    spacelen = FIRSTCOL;
+		for (ispacelen = 0; ispacelen < spacelen; ispacelen++)
+		    (void) strcat(line, " ");
+		(void) strncat(line, start, sublen);
+		spacelen = COLLENGTH - sublen;
+		
+		while (spacelen <= 0) {
+		    spacelen += COLLENGTH;
+			pos++;
 		}
+
 		pos++;
 		prev = start;
 	    }
diff -urN gnuplot-3.7/help.h gnuplot-3.7.1/help.h
--- gnuplot-3.7/help.h	Wed Apr 15 20:22:34 1998
+++ gnuplot-3.7.1/help.h	Wed Apr 15 20:22:34 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: help.h,v 1.9 1998/03/22 22:31:45 drd Exp $
+ * $Id: help.h,v 1.1.1.2 1998/04/15 19:22:34 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/hidden3d.c gnuplot-3.7.1/hidden3d.c
--- gnuplot-3.7/hidden3d.c	Wed Dec  9 15:23:56 1998
+++ gnuplot-3.7.1/hidden3d.c	Thu Aug 19 15:39:28 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: hidden3d.c,v 1.33 1998/06/18 14:55:10 ddenholm Exp $";
+static char *RCSid = "$Id: hidden3d.c,v 1.13.2.1 1999/08/19 14:39:28 lhecking Exp $";
 #endif
 
 /* GNUPLOT - hidden3d.c */
@@ -199,7 +199,7 @@
 /* The functions to map from user 3D space into normalized -1..1 */
 #define map_x3d(x) ((x-min_array[FIRST_X_AXIS])*xscale3d-1.0)
 #define map_y3d(y) ((y-min_array[FIRST_Y_AXIS])*yscale3d-1.0)
-#define map_z3d(z) ((z-base_z)*zscale3d-1.0)
+#define map_z3d(z) ((z-floor_z)*zscale3d-1.0)
 
 extern int suppressMove;
 extern int xright, xleft, ybot, ytop;
@@ -208,7 +208,7 @@
 extern int auto_array[], log_array[];
 extern double base_array[], log_base_array[];
 extern double xscale3d, yscale3d, zscale3d;
-extern double base_z;
+extern double floor_z;
 
 extern int hidden_no_update, hidden_active;
 extern int hidden_line_type_above, hidden_line_type_below;
diff -urN gnuplot-3.7/internal.c gnuplot-3.7.1/internal.c
--- gnuplot-3.7/internal.c	Mon Dec  7 22:10:32 1998
+++ gnuplot-3.7.1/internal.c	Mon Dec  7 22:10:32 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: internal.c,v 1.23 1998/04/14 00:15:44 drd Exp $";
+static char *RCSid = "$Id: internal.c,v 1.7 1998/12/07 22:10:32 lhecking Exp $";
 #endif
 
 /* GNUPLOT - internal.c */
diff -urN gnuplot-3.7/interpol.c gnuplot-3.7.1/interpol.c
--- gnuplot-3.7/interpol.c	Mon Nov 16 13:09:51 1998
+++ gnuplot-3.7.1/interpol.c	Thu Aug 19 15:39:18 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: interpol.c,v 1.29 1998/04/14 00:15:45 drd Exp $";
+static char *RCSid = "$Id: interpol.c,v 1.6.2.1 1999/08/19 14:39:18 lhecking Exp $";
 #endif
 
 /* GNUPLOT - interpol.c */
@@ -251,6 +251,15 @@
  */
 
 
+/* HBB 990205: rewrote the 'bezier' interpolation routine,
+ * to prevent numerical overflow and other undesirable things happening
+ * for large data files (num_data about 1000 or so), where binomial
+ * coefficients would explode, and powers of 'sr' (0 < sr < 1) become
+ * extremely small. Method used: compute logarithms of these
+ * extremely large and small numbers, and only go back to the
+ * real numbers once they've cancelled out each other, leaving
+ * a reasonable-sized one. */
+
 /*
  * cp_binomial() computes the binomial coefficients needed for BEZIER stuff
  *   and stores them into an array which is hooked to sdat.
@@ -268,10 +277,12 @@
 
     n = points - 1;
     e = n / 2;
-    coeff[0] = 1.0;
+    /* HBB 990205: calculate these in 'logarithmic space',
+     * as they become _very_ large, with growing n (4^n) */
+    coeff[0] = 0.0;
 
     for (k = 0; k < e; k++) {
-	coeff[k + 1] = coeff[k] * ((double) (n - k)) / ((double) (k + 1));
+	coeff[k + 1] = coeff[k] + log(((double) (n-k)) / ((double) (k+1)));
     }
 
     for (k = n; k >= e; k--)
@@ -322,6 +333,7 @@
     return (y);
 }
 
+
 static void eval_bezier(cp, first_point, num_points, sr, px, py, c)
 struct curve_points *cp;
 int first_point;		/* where to start in plot->points (to find x-range) */
@@ -344,18 +356,20 @@
 	*px = this_points[n].x;
 	*py = this_points[n].y;
     } else {
+        /* HBB 990205: do calculation in 'logarithmic space',
+         * to avoid over/underflow errors, which would exactly cancel
+         * out each other, anyway, in an exact calculation
+         */
 	unsigned int i;
 	double lx = 0.0, ly = 0.0;
-	double sr_to_the_i = 1.0;
-	double dsr_to_the_di = s_pow(1 - sr, n);
-	double reciprocal_dsr = 1.0 / (1 - sr);
+	double log_dsr_to_the_n = n * log(1 -sr);
+	double log_sr_over_dsr = log(sr) - log(1 - sr);
 
 	for (i = 0; i <= n; i++) {
-	    double u = c[i] * sr_to_the_i * s_pow(1 - sr, n - i);
+            double u = exp(c[i] + log_dsr_to_the_n + i * log_sr_over_dsr);
+
 	    lx += this_points[i].x * u;
 	    ly += this_points[i].y * u;
-	    sr_to_the_i *= sr;
-	    dsr_to_the_di *= reciprocal_dsr;
 	}
 
 	*px = lx;
diff -urN gnuplot-3.7/lasergnu gnuplot-3.7.1/lasergnu
--- gnuplot-3.7/lasergnu	Wed Apr 15 20:16:31 1998
+++ gnuplot-3.7.1/lasergnu	Wed Apr 15 20:16:31 1998
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
-# $Id: lasergnu,v 1.5 1994/01/29 16:27:12 alex Exp $
+# $Id: lasergnu,v 1.1.1.1 1998/04/15 19:16:31 lhecking Exp $
 #
 # Print gnuplot output on an Imagen or Postscript laser printer.
 
diff -urN gnuplot-3.7/m4/msdos.m4 gnuplot-3.7.1/m4/msdos.m4
--- gnuplot-3.7/m4/msdos.m4	Mon Oct 19 20:37:15 1998
+++ gnuplot-3.7.1/m4/msdos.m4	Thu Aug 19 15:20:31 1999
@@ -6,23 +6,30 @@
 
 # serial 1
 
-AC_DEFUN(gp_MSDOS,
+AC_DEFUN(GP_MSDOS,
 [AC_MSG_CHECKING(for MS-DOS/djgpp/libGRX)
 AC_EGREP_CPP(yes,
 [#if __DJGPP__ && __DJGPP__ == 2
   yes
 #endif
-], AC_MSG_RESULT(yes)
-   LIBS="-lpc $LIBS"
-   AC_DEFINE(MSDOS)
-   AC_DEFINE(DOS32)
-   with_linux_vga=no
-   AC_CHECK_LIB(grx20,GrLine,dnl
-      LIBS="-lgrx20 $LIBS"
-      CFLAGS="$CFLAGS -fno-inline-functions"
-      AC_DEFINE(DJSVGA)
-      AC_CHECK_LIB(grx20,GrCustomLine,AC_DEFINE(GRX21))),dnl
-   AC_MSG_RESULT(no)
-   )dnl 
+],AC_MSG_RESULT(yes)
+  LIBS="-lpc $LIBS"
+  AC_DEFINE(MSDOS, 1,
+            [ Define if this is an MSDOS system. ])
+  AC_DEFINE(DOS32, 1,
+            [ Define if this system uses a 32-bit DOS extender (djgpp/emx). ])
+  with_linux_vga=no
+  AC_CHECK_LIB(grx20,GrLine,dnl
+    LIBS="-lgrx20 $LIBS"
+    CFLAGS="$CFLAGS -fno-inline-functions"
+    AC_DEFINE(DJSVGA, 1,
+              [ Define if you want to use libgrx20 with MSDOS/djgpp. ])
+    AC_CHECK_LIB(grx20,GrCustomLine,dnl
+      AC_DEFINE(GRX21, 1,
+                [ Define if you want to use a newer version of libgrx under MSDOS/djgpp. ])dnl
+    )dnl
+  ),dnl
+  AC_MSG_RESULT(no)
+  )dnl 
 ])
 
diff -urN gnuplot-3.7/m4/next.m4 gnuplot-3.7.1/m4/next.m4
--- gnuplot-3.7/m4/next.m4	Mon Oct 19 20:37:22 1998
+++ gnuplot-3.7.1/m4/next.m4	Tue Sep 21 19:49:23 1999
@@ -5,7 +5,7 @@
 
 # serial 1
 
-AC_DEFUN(gp_NEXT,
+AC_DEFUN(GP_NEXT,
 [AC_MSG_CHECKING(for NeXT)
 AC_EGREP_CPP(yes,
 [#if __NeXT__
@@ -13,9 +13,7 @@
 #endif
 ], AC_MSG_RESULT(yes)
    LIBS="$LIBS -lsys_s -lNeXT_s"
-   NEXTOBJS=epsviewe.o
    CFLAGS="$CFLAGS -ObjC",dnl
-   NEXTOBJS=
    AC_MSG_RESULT(no))
 ])
 
diff -urN gnuplot-3.7/m4/path-hdr.m4 gnuplot-3.7.1/m4/path-hdr.m4
--- gnuplot-3.7/m4/path-hdr.m4	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/m4/path-hdr.m4	Thu Aug 19 15:20:18 1999
@@ -0,0 +1,49 @@
+## --------------------------------------------- ##
+## Search several directories for header file.   ##
+## Built around a non-caching and silent version ##
+## of AC_CHECK_HEADER.                           ##
+## From Lars Hecking                             ##
+## --------------------------------------------- ##
+
+# serial 2
+
+dnl GP_PATH_HEADER(HEADER-FILE, SEARCH-DIRS [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
+AC_DEFUN(GP_PATH_HEADER,
+[ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
+changequote(, )dnl
+  ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+changequote([, ])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(ac_cv_header_$ac_safe,
+[gp_save_CPPFLAGS="$CPPFLAGS"
+if test "$2" != yes && test "$2" != no; then
+  gp_h_path=`echo "$2" | sed -e 's%/lib$1\.a$%%'`
+  gp_h_prfx=`echo "$gp_h_path" | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_h_list="$gp_h_prfx $gp_h_prfx/include $gp_h_path"
+else
+  gp_h_list=''
+fi
+for ac_dir in $gp_h_list '' /usr/local/include ; do
+  test x${ac_dir} != x && CPPFLAGS="$gp_save_CPPFLAGS -I${ac_dir}"
+  AC_TRY_CPP([#include <$1>], eval "ac_cv_header_$ac_safe=${ac_dir}",
+    eval "ac_cv_header_$ac_safe=no")
+  CPPFLAGS="$gp_save_CPPFLAGS"
+  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
+    break
+  fi
+done
+])
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != x" && eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != xyes"; then
+    eval "CPPFLAGS=\"$gp_save_CPPFLAGS -I`echo '$ac_cv_header_'$ac_safe`\""
+  fi
+  AC_DEFINE_UNQUOTED($ac_tr_hdr)
+  AC_MSG_RESULT(yes)
+  ifelse([$3], , :, [$3])
+else
+  AC_MSG_RESULT(no)
+ifelse([$4], , , [$4
+])dnl
+fi
+])
+
diff -urN gnuplot-3.7/m4/path-lib.m4 gnuplot-3.7.1/m4/path-lib.m4
--- gnuplot-3.7/m4/path-lib.m4	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/m4/path-lib.m4	Thu Aug 19 15:20:19 1999
@@ -0,0 +1,83 @@
+## ------------------------------ ##
+## Like AC_CHECK_LIB, but quiet,  ##
+## and no caching.                ##
+## From Lars Hecking              ##
+## ------------------------------ ##
+
+# serial 2
+
+dnl AC_CHECK_LIB(LIBRARY, FUNCTION [, OTHER-LIBRARIES])
+AC_DEFUN(GP_CHECK_LIB_QUIET,
+[ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+ac_save_LIBS="$LIBS"
+LIBS="$TERMLIBS $TERMXLIBS -l$1 $3 $LIBS"
+AC_TRY_LINK(dnl
+ifelse([$2], [main], , dnl Avoid conflicting decl of main.
+[/* Override any gcc2 internal prototype to avoid an error.  */
+]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+extern "C"
+#endif
+])dnl
+[/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $2();
+]),
+            [$2()],
+            eval "ac_cv_lib_$ac_lib_var=yes",
+            eval "ac_cv_lib_$ac_lib_var=no")
+LIBS="$ac_save_LIBS"
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+changequote(, )dnl
+  ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+changequote([, ])dnl
+dnl  LIBS="$LIBS -l$1"
+fi
+])
+
+## ------------------------------------------- ##
+## Search several directories for library.     ##
+## NOTE: OTHER_LIBRARIES are NOT automatically ##
+## added to TERMLIBS. This must be done in     ##
+## configure.in!                               ##
+## From Lars Hecking                           ##
+## ------------------------------------------- ##
+
+# serial 2
+
+dnl GP_PATH_LIB(LIBRARY, FUNCTION, SEARCH-DIRS [, OTHER-LIBRARIES])
+AC_DEFUN(GP_PATH_LIB,
+[ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+changequote(, )dnl
+  gp_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+changequote([, ])dnl
+AC_MSG_CHECKING([for $2 in -l$1])
+AC_CACHE_VAL(ac_cv_lib_$ac_lib_var,
+[gp_save_TERMLIBS="$TERMLIBS"
+if test "$3" != yes && test "$3" != no; then
+  gp_l_path=`echo "$3" | sed -e 's%/lib$1\.a$%%'`
+  gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'`
+  gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path"
+fi
+for ac_dir in $gp_l_list '' /usr/local/lib ; do
+  test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS"
+  GP_CHECK_LIB_QUIET($1,$2,$4)
+  TERMLIBS="$gp_save_TERMLIBS"
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    eval "ac_cv_lib_$ac_lib_var=${ac_dir}"
+    break
+  fi
+done
+])
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then
+  if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then
+    eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\""
+  fi
+  TERMLIBS="$TERMLIBS -l$1"
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+])
+
diff -urN gnuplot-3.7/m4/search-hdr.m4 gnuplot-3.7.1/m4/search-hdr.m4
--- gnuplot-3.7/m4/search-hdr.m4	Mon Oct 19 20:37:30 1998
+++ gnuplot-3.7.1/m4/search-hdr.m4	Thu Jan  1 01:00:00 1970
@@ -1,35 +0,0 @@
-## --------------------------------------------- ##
-## Search several directories for header file.   ##
-## Built around a non-caching and silent version ##
-## of AC_CHECK_HEADER.                           ##
-## From Lars Hecking                             ##
-## --------------------------------------------- ##
-
-# serial 1
-
-dnl gp_SEARCH_HEADERDIRS(HEADER-FILE [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
-AC_DEFUN(gp_SEARCH_HEADERDIRS,
-[AC_REQUIRE([gp_SEARCH_LIBDIRS])
-AC_MSG_CHECKING([for $1])
-ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
-gp_save_CPPFLAGS="$CPPFLAGS"
-for ac_dir in '' /usr/local/include $gp_lib_prefix $gp_lib_prefix/include ; do
-  CPPFLAGS="$gp_save_CPPFLAGS `test x${ac_dir} != x && echo -I${ac_dir}`"
-  AC_TRY_CPP([#include <$1>], eval "ac_cv_header_$ac_safe=yes",
-    eval "ac_cv_header_$ac_safe=no")
-  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-    break
-  else
-    CPPFLAGS="${ac_save_CPPFLAGS}"
-  fi
-done
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  ifelse([$2], , :, [$2])
-else
-  AC_MSG_RESULT(no)
-ifelse([$3], , , [$3
-])dnl
-fi
-])
-
diff -urN gnuplot-3.7/m4/search-lib.m4 gnuplot-3.7.1/m4/search-lib.m4
--- gnuplot-3.7/m4/search-lib.m4	Mon Oct 19 20:37:34 1998
+++ gnuplot-3.7.1/m4/search-lib.m4	Thu Jan  1 01:00:00 1970
@@ -1,82 +0,0 @@
-## ------------------------------ ##
-## Like AC_CHECK_LIB, but quiet,  ##
-## and no caching.                ##
-## From Lars Hecking              ##
-## ------------------------------ ##
-
-# serial 1
-
-AC_DEFUN(gp_CHECK_LIB_QUIET,
-[ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-ac_save_LIBS="$LIBS"
-LIBS="$TERMLIBS $TERMXLIBS -l$1 $5 $LIBS"
-AC_TRY_LINK(dnl
-ifelse([$2], [main], , dnl Avoid conflicting decl of main.
-[/* Override any gcc2 internal prototype to avoid an error.  */
-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C"
-#endif
-])dnl
-[/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $2();
-]),
-            [$2()],
-            eval "ac_cv_lib_$ac_lib_var=yes",
-            eval "ac_cv_lib_$ac_lib_var=no")
-LIBS="$ac_save_LIBS"
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  ifelse([$3], ,
-[changequote(, )dnl
-  ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-changequote([, ])dnl
-  LIBS="$LIBS -l$1"
-], [$3])
-else
-  ifelse([$4], , , [$4
-])dnl
-fi
-])
-
-## ------------------------------------------- ##
-## Search several directories for library.     ##
-## NOTE: OTHER_LIBRARIES are NOT automatically ##
-## added to TERMLIBS. This must be done in     ##
-## configure.in!                               ##
-## From Lars Hecking                           ##
-## ------------------------------------------- ##
-
-# serial 1
-
-dnl gp_SEARCH_LIBDIRS(LIBRARY, FUNCTION [, OTHER-LIBRARIES])
-AC_DEFUN(gp_SEARCH_LIBDIRS,
-[AC_MSG_CHECKING([for $2 in -l$1])
-gp_save_TERMLIBS="$TERMLIBS"
-changequote(, )dnl
-  gp_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-changequote([, ])dnl
-dnl The "no" case is just a safety net
-case "$with_$1" in
-  yes|no)
-    gp_lib_list="";;
-  *)
-    gp_lib_path=`echo $with_$1 | sed -e 's%/lib$1\.a$%%'`
-    gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'`
-    gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path"
-esac
-for ac_dir in '' /usr/local/lib $gp_lib_list ; do
-  TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS"
-  gp_CHECK_LIB_QUIET($1,$2,dnl
-    TERMLIBS="$TERMLIBS -l$1"; break, dnl ACTION-IF-FOUND
-    TERMLIBS="$gp_save_TERMLIBS",     dnl ACTION-IF-NOT-FOUND
-    $3)                               dnl OTHER-LIBRARIES
-done
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
diff -urN gnuplot-3.7/m4/select.m4 gnuplot-3.7.1/m4/select.m4
--- gnuplot-3.7/m4/select.m4	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/m4/select.m4	Fri Oct 15 17:02:10 1999
@@ -0,0 +1,86 @@
+dnl testing new version of FUNC_SELECT
+
+AC_DEFUN(AC_FUNC_SELECT,
+[AC_CHECK_FUNCS(select)
+if test "$ac_cv_func_select" = yes; then
+  AC_CHECK_HEADERS(unistd.h sys/types.h sys/time.h sys/select.h sys/socket.h)
+  AC_MSG_CHECKING([argument types of select()])
+  AC_CACHE_VAL(ac_cv_type_fd_set_size_t,dnl
+    [AC_CACHE_VAL(ac_cv_type_fd_set,dnl
+      [for ac_cv_type_fd_set in 'fd_set' 'int' 'void'; do
+        for ac_cv_type_fd_set_size_t in 'int' 'size_t' 'unsigned long' 'unsigned'; do
+	  for ac_type_timeval in 'struct timeval' 'const struct timeval'; do
+            AC_TRY_COMPILE(dnl
+[#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif],
+[#ifdef __STDC__
+extern int select ($ac_cv_type_fd_set_size_t, 
+ $ac_cv_type_fd_set *,	$ac_cv_type_fd_set *, $ac_cv_type_fd_set *,
+ $ac_type_timeval *);
+#else
+extern int select ();
+  $ac_cv_type_fd_set_size_t s;
+  $ac_cv_type_fd_set *p;
+  $ac_type_timeval *t;
+#endif],
+[ac_found=yes ; break 3],ac_found=no)
+          done
+        done
+      done
+    ])dnl AC_CACHE_VAL
+  ])dnl AC_CACHE_VAL
+  if test "$ac_found" = no; then
+    AC_MSG_ERROR([can't determine argument types])
+  fi
+
+  AC_MSG_RESULT([select($ac_cv_type_fd_set_size_t,$ac_cv_type_fd_set *,...)])
+  AC_DEFINE_UNQUOTED(fd_set_size_t, $ac_cv_type_fd_set_size_t,
+                     [ First arg for select(). ])
+  ac_cast=
+  if test "$ac_cv_type_fd_set" != fd_set; then
+    # Arguments 2-4 are not fd_set.  Some weirdo systems use fd_set type for
+    # FD_SET macros, but insist that you cast the argument to select.  I don't
+    # understand why that might be, but it means we cannot define fd_set.
+    AC_EGREP_CPP(dnl
+changequote(<<,>>)dnl
+<<(^|[^a-zA-Z_0-9])fd_set[^a-zA-Z_0-9]>>dnl
+changequote([,]),dnl
+[#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif],dnl
+    # We found fd_set type in a header, need special cast
+    ac_cast="($ac_cv_type_fd_set *)",dnl
+    # No fd_set type; it is safe to define it
+    AC_DEFINE_UNQUOTED(fd_set,$ac_cv_type_fd_set,
+                       [ Define if the type in arguments 2-4 to select() is fd_set. ]))
+  fi
+  AC_DEFINE_UNQUOTED(SELECT_FD_SET_CAST,$ac_cast,
+                     [ Define if the type in arguments 2-4 to select() is fd_set. ])
+fi
+])
+
diff -urN gnuplot-3.7/make_vms.com gnuplot-3.7.1/make_vms.com
--- gnuplot-3.7/make_vms.com	Wed Apr 15 20:16:31 1998
+++ gnuplot-3.7.1/make_vms.com	Fri Oct  1 13:51:54 1999
@@ -1,4 +1,4 @@
-$!         
+$!
 $! GNUPLOT make program for VMS, Vers. 1.2, 1996/07/03
 $! (Rolf Niepraschk, niepraschk@ptb.de)
 $!
@@ -11,53 +11,55 @@
 $!    P2 = special make file (eg. for testing), default is "DESCRIP.MMS"
 $!
 $ SAY = "WRITE SYS$OUTPUT"
-$ IF F$GETSYI("ARCH_TYPE") .NE. 1
-$ THEN
-$   AXP = 1 
-$ ENDIF
+$ AXP = 0
+$ IF F$GETSYI("ARCH_TYPE") .NE. 1 THEN AXP = 1
 $!
-$ P1 = F$EDIT(P1,"UPCASE") 
-$ IF P2 .NES. "" 
-$ THEN D_FILE = P2 
-$ ELSE D_FILE := DESCRIP.MMS
+$ P1 = F$EDIT(P1,"UPCASE")
+$ IF P2 .NES. ""
+$ THEN D_FILE = P2
+$ ELSE D_FILE = "MAKEFILE.VMS"
 $ ENDIF
 $!
-$ COMPILER := DECC
-$!
-$ IF (P1 .EQS. "DECC") .OR. (P1 .EQS. "") 
-$ THEN 
+$ COMPILER = ""
+$ IF P1 .EQS. "DECC" .OR. P1 .EQS. ""
+$ THEN
 $   DECC = 1
-$   COMPILER := DECC
+$   COMPILER = "DECC"
 $ ELSE
-$   IF P1 .EQS. "VAXC" 
-$   THEN 
+$   IF P1 .EQS. "VAXC"
+$   THEN
 $     VAXC = 1
-$     COMPILER := VAXC
-$   ENDIF
-$ ELSE
-$   IF P1 .EQS. "GNUC"
-$   THEN 
-$     GNUC = 1
-$     COMPILER := VAXC 
+$     COMPILER = "VAXC"
+$   ELSE
+$     IF P1 .EQS. "GNUC"
+$     THEN
+$       GNUC = 1
+$       COMPILER = "GNUC"
+$     ENDIF
 $   ENDIF
-$ ELSE
-$   D_FILE = P1
+$ ENDIF
+$ IF COMPILER .EQS. ""
+$ THEN
 $   DECC = 1
+$   COMPILER = "DECC"
+$   D_FILE = P1
 $ ENDIF
 $!
 $ DCL_PROC = "BUILDVMS.COM"
-$ COMMAND = "" 
+$ COMMAND = ""
 $ IF F$TYPE(MMK) .NES. ""
-$   THEN COMMAND = "MMS"
+$   THEN COMMAND = "MMK"
 $ ELSE
 $   IF F$SEARCH("SYS$SYSTEM:MMS.EXE") .NES. "" THEN COMMAND = "MMS"
 $ ENDIF
 $!
-$ IF COMMAND .NES. "" 
-$ THEN 
-$   SAY "Make Gnuplot with ''COMMAND' and ''COMPILER'." 
+$ MACRO = ""
+$ IF AXP THEN MACRO = "/MACRO=__ALPHA__=1"
+$ IF COMMAND .NES. ""
+$ THEN
+$   SAY "Make Gnuplot with ''COMMAND' and ''COMPILER'."
 $   SAY ""
-$   'COMMAND' /DESCRIPTION='D_FILE' /IGNORE=WARNING
+$   'COMMAND' /DESCRIPTION='D_FILE' 'MACRO' /IGNORE=WARNING
 $ ELSE
 $   SAY "Make Gnuplot with DCL procedure ''DCL_PROC'."
 $   SAY ""
diff -urN gnuplot-3.7/makefile.all gnuplot-3.7.1/makefile.all
--- gnuplot-3.7/makefile.all	Thu Jan 14 19:34:16 1999
+++ gnuplot-3.7.1/makefile.all	Wed Oct 27 12:15:10 1999
@@ -1,7 +1,7 @@
 #<<<makefile.all>>>
 ########################################################
 #
-# $Id: makefile.all,v 1.9 1998/05/19 20:55:36 ddenholm Exp $
+# $Id: makefile.all,v 1.28.2.3 1999/10/27 11:15:10 lhecking Exp $
 #
 ########################################################
 #
@@ -27,7 +27,7 @@
 # D as the prefix for docs (eg docs/)
 # L as the prefix for latex tutorial (eg docs/latextut/ or [.docs.latextut])
 # Q as the prefix for old doc files (eg docs/old)
-# S as the prefix for postscript docs (eg docs/ps)
+# S as the prefix for postscript docs (eg docs/psdoc)
 # M as the prefix for demos (eg demo/)
 # N as the prefix for NeXT (eg NeXT/)
 # P as the prefix for OS/2 (eg os2/)
@@ -56,19 +56,19 @@
 	  matrix.h national.h plot.h protos.h setshow.h stdfn.h syscfg.h term.h
 
 CORETERM = $(T)aed.trm $(T)ai.trm $(T)amiga.trm $(T)apollo.trm \
-	   $(T)atariaes.trm $(T)atarivdi.trm $(T)cgi.trm $(T)cgm.trm \
-	   $(T)compact.c $(T)corel.trm $(T)debug.trm $(T)djsvga.trm \
-	   $(T)driver.h $(T)dumb.trm $(T)dxf.trm $(T)dxy.trm $(T)eepic.trm \
-	   $(T)emxvga.trm $(T)epson.trm $(T)excl.trm $(T)fg.trm $(T)fig.trm \
-	   $(T)gif.trm $(T)gnugraph.trm $(T)gpic.trm $(T)gpr.trm \
+	   $(T)atariaes.trm $(T)atarivdi.trm $(T)be.trm $(T)cgi.trm \
+	   $(T)cgm.trm $(T)compact.c $(T)corel.trm $(T)debug.trm \
+	   $(T)djsvga.trm $(T)driver.h $(T)dumb.trm $(T)dxf.trm $(T)dxy.trm \
+	   $(T)eepic.trm $(T)emxvga.trm $(T)epson.trm $(T)excl.trm $(T)fg.trm \
+	   $(T)fig.trm $(T)gif.trm $(T)gnugraph.trm $(T)gpic.trm $(T)gpr.trm \
 	   $(T)grass.trm $(T)hp26.trm $(T)hp2648.trm $(T)hp500c.trm \
 	   $(T)hpgl.trm $(T)hpljii.trm $(T)hppj.trm $(T)imagen.trm \
 	   $(T)impcodes.h $(T)iris4d.trm $(T)kyo.trm $(T)latex.trm \
-	   $(T)linux.trm $(T)mac.trm $(T)metafont.trm $(T)mgr.trm \
-	   $(T)mif.trm $(T)multitos.trm $(T)next.trm $(T)object.h \
-	   $(T)pbm.trm $(T)pc.trm $(T)pm.trm $(T)png.trm $(T)post.trm \
-	   $(T)pslatex.trm $(T)pstricks.trm $(T)qms.trm $(T)regis.trm \
-	   $(T)rgip.trm $(T)sun.trm $(T)t410x.trm $(T)table.trm \
+	   $(T)linux.trm $(T)mac.trm $(T)metafont.trm $(T)metapost.trm \
+	   $(T)mgr.trm $(T)mif.trm $(T)multitos.trm $(T)next.trm $(T)object.h \
+	   $(T)openstep.trm $(T)pbm.trm $(T)pc.trm $(T)pm.trm $(T)png.trm \
+	   $(T)post.trm $(T)pslatex.trm $(T)pstricks.trm $(T)qms.trm \
+	   $(T)regis.trm $(T)rgip.trm $(T)sun.trm $(T)t410x.trm $(T)table.trm \
 	   $(T)tek.trm $(T)texdraw.trm $(T)tgif.trm $(T)tkcanvas.trm \
 	   $(T)tpic.trm $(T)unixpc.trm $(T)unixplot.trm $(T)v384.trm \
 	   $(T)vws.trm $(T)win.trm $(T)x11.trm $(T)xlib.trm
@@ -92,10 +92,10 @@
 	 $(P)gnupmdrv.c $(P)gnupmdrv.def $(P)gnupmdrv.h $(P)gnupmdrv.ipf \
 	 $(P)gnupmdrv.rc $(P)print.c
 
-WINDOWS = $(W)geticon.c $(W)wcommon.h $(W)wgnupl32.def $(W)wgnuplib.c \
-	  $(W)wgnuplib.def $(W)wgnuplib.h $(W)wgnuplib.rc $(W)wgnuplot.def \
-	  $(W)wgnuplot.hpj $(W)wgnuplot.mnu $(W)wgnuplot.rc $(W)wgraph.c \
-	  $(W)winmain.c $(W)wmenu.c $(W)wpause.c $(W)wprinter.c \
+WINDOWS = $(W)pgnuplot.c $(W)geticon.c $(W)wcommon.h $(W)wgnupl32.def \
+	  $(W)wgnuplib.c $(W)wgnuplib.def $(W)wgnuplib.h $(W)wgnuplib.rc \
+	  $(W)wgnuplot.def $(W)wgnuplot.hpj $(W)wgnuplot.mnu $(W)wgnuplot.rc \
+	  $(W)wgraph.c $(W)winmain.c $(W)wmenu.c $(W)wpause.c $(W)wprinter.c \
 	  $(W)wresourc.h $(W)wtext.c $(W)wtext.h
 
 # not C code, but still needed
@@ -119,7 +119,7 @@
 ETC =   0BUGS 0FAQ 0INSTALL 0PORTING 0README ChangeLog CodeStyle Copyright \
 	INSTALL.gnu Makefile.in NEWS PGPKEYS TODO acconfig.h $(ACLOCAL_M4) \
 	amiga.c buildvms.com commitvers $(CONFIG_HEADER_IN) configure \
-	configure.in corgraph.asm corplot.c ctrl87.c ctrl87.h descrip.mms \
+	configure.in corgraph.asm corplot.c ctrl87.c ctrl87.h \
 	djconfig.sh errorfix.sh genopt.com gnuplot.def gnuplot.el gnuplot.opt \
 	gnuplot.prj header.mac hrcgraph.asm install-sh intergra.x11 lasergnu \
 	lineproc.mac linkopt.vms linkopt.ztc make_vms.com makefile.286 \
@@ -128,16 +128,17 @@
 	makefile.msw makefile.mto makefile.nt makefile.os2 makefile.os9 \
 	makefile.st makefile.tc makefile.unx makefile.vms makefile.wc \
 	makefile.win makefile.ztc missing mkinstalldirs os9.c pcgraph.asm \
-	rgipgnu stamp-h.in strftime.c vms.c m4/msdos.m4 m4/next.m4 \
-	m4/search-hdr.m4 m4/search-lib.m4 $(T)README
+	rgipgnu stamp-h.in strftime.c vms.c x11.opt m4/msdos.m4 m4/next.m4 \
+	m4/path-hdr.m4 m4/path-lib.m4 $(T)README
 
 # Documentation and help files
 DOCS1 = $(D)Makefile.in $(D)README $(D)checkdoc.c $(D)doc2gih.c \
 	$(D)doc2hlp.c $(D)doc2hlp.com $(D)doc2html.c $(D)doc2info.c \
 	$(D)doc2ipf.c $(D)doc2ms.c $(D)doc2rnh.c $(D)doc2rtf.c $(D)doc2tex.c \
-	$(D)doc2texi.pl $(D)doc2x.h $(D)gnuplot.1 $(D)lasergnu.1 \
-	$(D)makefile.dst $(D)makefile.ami $(D)termdoc.c $(D)titlepag.ms \
-	$(D)titlepag.tex $(D)toc_entr.sty $(D)xref.c $(D)xref.h
+	$(D)doc2texi.el $(D)doc2texi.pl $(D)doc2x.h $(D)gnuplot.1 \
+	$(D)gnuplot.texi $(D)lasergnu.1 $(D)makefile.dst $(D)makefile.ami \
+	$(D)termdoc.c $(D)titlepag.ms $(D)titlepag.tex $(D)toc_entr.sty \
+	$(D)xref.c $(D)xref.h
 DOCS2 = $(D)gnuplot.doc $(D)gpcard.tex
 DOCS3 = $(L)Makefile.in $(L)eg1.plt \
 	$(L)eg2.plt $(L)eg3.dat $(L)eg3.plt \
diff -urN gnuplot-3.7/makefile.amg gnuplot-3.7.1/makefile.amg
--- gnuplot-3.7/makefile.amg	Wed Dec  2 18:37:11 1998
+++ gnuplot-3.7.1/makefile.amg	Thu Aug 19 15:39:00 1999
@@ -1,29 +1,82 @@
 # Makefile for SAS/C 6.1 or better on the Amiga
 #
-# $Id: makefile.amg,v 1.29 1998/04/14 00:15:50 drd Exp $
+# $Id: makefile.amg,v 1.8.2.1 1999/08/19 14:39:00 lhecking Exp $
 #
+# Makefile for use with SAS/C 6.50 or newer
+#   on AmigaOS 2.0 and above
+#
+# last modification date: 19990204
+#
+
+#
+# ***************** Begin of Configuration section ***************************
 #
 
+# Comment out the definition lines to disable the according features
+# Substitute the path names for the actual path where includes/libs reside
+
+# GD (GIF) device driver
+# requires GD library (not part of gnuplot)
+#GD_DEF = DEF=HAVE_LIBGD
+#GD_INCLUDE = IDIR=gd1.3
+#GD_LIB = gd1.3/gd.lib
+
+# PNG device driver
+# requires PNG and Z libraries (not part of gnuplot)
+#PNG_DEF = def=HAVE_LIBPNG
+#PNG_INCLUDE = IDIR=libpng-1.0.2
+#PNG_LIB = libpng-1.0.2/png.lib
+#Z_INCLUDE = IDIR=zlib-1.1.3
+#Z_LIB = zlib-1.1.3/z.lib
+
 CC = sc
 
-# Remove 'MATH=IEEE' if you don't want to use the better Commodore
-# math-routines. If you do so, you'll have to change 'scmieee.lib'
-# to 'scm.lib' in the gnuplot and bf_test target lines below.
-# I am guessing the syntax here : I want to define GP_INLINE=__inline.
-# If you have SAS/C 6.57 or newer, you may wish to disable warning 317
-# too. Just add it in the COPTS line.
+# cpu type
+# valid values are:
+#  ANY (default; same as 68000) 68010 68020 68030 68040 68060 (new in 6.57)
+CPU = CPU=ANY
+
+# Floating point math type
+# valid values are NOMATH (default) STANDARD FFP 68881 (same as 68882) IEEE
+# Compared to the old version of this makefile, the link commands have
+# been changed so that the MATH option also selects the proper math
+# library to link with
+MATH = MATH=IEEE
+
+# Optimiser flags
 OFLAGS = opt
-DEFS   = def=AMIGA_SC_6_1 def=ANSI_C def=HAVE_SYS_STAT_H def=HAVE_STRNICMP def=HAVE_GETCWD def=PIPES def=GP_INLINE=__inline
-COPTS  = idir=term data=f math=i ign=304+306 #noerrhigh #errrexx
-DEBUG  = # Will be dbg=sf when called with smake -f makefile.amg debug
-CFLAGS = $(COPTS) $(DEFS) $(OFLAGS) $(DEBUG)
-LNDBG  = # Will be addsym when called with smake -f makefile.amg debug
 
-# The directories where gnuplot and gnuplot.gih go:
+# Defines; format is def=SYMBOL[=value]
+DEFS = def=AMIGA_SC_6_1 def=ANSI_C def=HAVE_SYS_STAT_H def=HAVE_STRNICMP def=HAVE_GETCWD def=PIPES def=GP_INLINE=__inline $(GD_DEF) $(PNG_DEF)
 
+# Other options; if you have SAS/C 6.57 or newer, you may wish to disable
+# warning 317
+COPTS = ign=304+306 #noerrhigh #errrexx
+
+# Debug options
+DEBUG = # Will be dbg=sf when called with smake -f makefile.amg debug
+LNDBG = # Will be addsym when called with smake -f makefile.amg debug
+
+# The directories where gnuplot and gnuplot.gih go, respectively
 DEST     = C:
 HELPDEST = S:
 
+#
+# ****************** End of Configuration section ****************************
+# ********** No changes should be necessary beyond this point! ***************
+#
+
+#
+# Miscellaneous setup
+#
+
+# Merge compiler flags
+CFLAGS = $(COPTS) $(CPU) $(MATH) $(OFLAGS) $(DEFS) $(DEBUG) DATA=f
+
+# NOTE: I have disabled the compilation rule for .oo files as described
+# below, because when linking with sc (as opposed to slink), all object
+# files not ending in .o must be prefied with the objname option!
+#
 # To simplify the handling of files that have grown so large that they
 # must be compiled with the code=far option, the rules below have been
 # set up. Now, if a file grows large, you only have to change its
@@ -31,19 +84,29 @@
 # This must be done in the OBJS-variable below and in the corresponding 
 # dependency-rule near the end of the file.
 
+all: gnuplot demo/bf_test
 
 # Normal compilation rule
 .c.o:
 	$(CC) $(CFLAGS) objname=$@ $<
 
 # Compilation rule for large files
-.c.oo:
+#.c.oo:
+#	$(CC) $(CFLAGS) code=f objname=$@ $<
+
+graphics.o: graphics.c plot.h setshow.h
 	$(CC) $(CFLAGS) code=f objname=$@ $<
 
+set.o: set.c plot.h setshow.h
+	$(CC) $(CFLAGS) code=f objname=$@ $<
+
+term.o: term.c term.h plot.h setshow.h bitmap.h $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
+	$(CC) $(CFLAGS) idir=term code=f $(GD_INCLUDE) $(PNG_INCLUDE) $(Z_INCLUDE) objname=$@ $<
+
 OBJS = alloc.o amiga.o binary.o bitmap.o command.o contour.o datafile.o \
-       eval.o fit.o graph3d.o graphics.oo help.o hidden3d.o internal.o \
+       eval.o fit.o graph3d.o graphics.o help.o hidden3d.o internal.o \
        interpol.o matrix.o misc.o parse.o plot.o plot2d.o plot3d.o scanner.o \
-       set.oo show.o specfun.o standard.o stdfn.o term.oo time.o util.o \
+       set.o show.o specfun.o standard.o stdfn.o term.o time.o util.o \
        util3d.o version.o
 
 CSOURCE1 = alloc.c bf_test.c binary.c bitmap.c command.c set.c show.c 
@@ -51,56 +114,87 @@
 CSOURCE3 = misc.c eval.c parse.c plot.c plot2d.c plot3d.c scanner.c \
 	standard.c stdfn.c 
 CSOURCE4 = bitmap.c term.c util.c util3d.c version.c interpol.c fit.c matrix.c
-CSOURCE5 = term/ai.trm term/amiga.trm term/aed.trm term/atariaes.trm \
-	term/atarivdi.trm term/cgi.trm term/corel.trm \
-	term/djsvga.trm term/dumb.trm term/dxf.trm term/dxy.trm \
-	term/debug.trm term/eepic.trm term/epson.trm term/excl.trm \
-	term/fig.trm term/hp26.trm term/hp2648.trm term/hpgl.trm  \
-	term/hpljii.trm term/metafont.trm\
-	term/apollo.trm term/gpr.trm term/hppj.trm term/compact.c 
-CSOURCE6 = term/impcodes.h term/imagen.trm term/next.trm term/object.h \
-	term/iris4d.trm term/kyo.trm term/latex.trm term/mif.trm \
-	term/pbm.trm term/pc.trm 
-CSOURCE7 = term/post.trm term/pstricks.trm term/qms.trm term/regis.trm \
-	term/rgip.trm term/sun.trm\
-	term/t410x.trm term/tek.trm term/texdraw.trm\
-	term/tgif.trm term/tpic.trm \
-	term/unixpc.trm term/unixplot.trm \
-	term/v384.trm term/vws.trm term/x11.trm term/xlib.trm
+CSOURCE5 = term/aed.trm term/ai.trm term/amiga.trm term/apollo.trm \
+	term/atariaes.trm term/atarivdi.trm term/cgi.trm term/cgm.trm \
+	term/compact.c term/corel.trm term/debug.trm term/driver.h \
+	term/djsvga.trm term/dumb.trm term/dxf.trm term/dxy.trm term/eepic.trm \
+	term/emxvga.trm term/epson.trm term/excl.trm term/fg.trm term/fig.trm \
+	term/gif.trm term/gnugraph.trm
+CSOURCE6 = term/gpic.trm term/gpr.trm term/grass.trm term/hp26.trm \
+	term/hp2648.trm term/hp500c.trm term/hpgl.trm term/hpljii.trm \
+	term/hppj.trm term/imagen.trm term/impcodes.h term/iris4d.trm \
+	term/kyo.trm term/latex.trm term/linux.trm term/mac.trm \
+	term/metafont.trm term/mgr.trm term/mif.trm term/multitos.trm \
+	term/next.trm term/object.h term/pbm.trm term/pc.trm
+CSOURCE7 = term/pm.trm term/png.trm term/post.trm term/pslatex.trm \
+	term/pstricks.trm term/qms.trm term/regis.trm term/rgip.trm \
+	term/sun.trm term/t410x.trm term/table.trm term/tek.trm \
+	term/texdraw.trm term/tgif.trm term/tkcanvas.trm term/tpic.trm \
+	term/unixpc.trm term/unixplot.trm term/v384.trm term/vws.trm \
+	term/win.trm term/x11.trm term/xlib.trm
 CSOURCE8 = contour.c specfun.c amiga.c
 CORETERM = $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
 
-
-all: gnuplot demo/bf_test
+#gnuplot: $(OBJS)
+#	slink from lib:c.o $(OBJS) to gnuplot\
+#	lib $(GD_LIB) $(PNG_LIB) $(Z_LIB) lib:scmieee.lib lib:scnb.lib $(LNDBG) verbose
 
 gnuplot: $(OBJS)
-	slink from lib:c.o $(OBJS) to gnuplot\
-	lib lib:scmieee.lib lib:scnb.lib $(LNDBG)
+	$(CC) <WITH <
+$(CFLAGS)
+LINK TO $@
+FROM $(OBJS) $(PNG_LIB) $(Z_LIB) $(GD_LIB) $(LNDBG)
+<
+
+#demo/bf_test: bf_test.o binary.o alloc.o
+#	slink from lib:c.o bf_test.o binary.o alloc.o to demo/bf_test\
+#	lib lib:scmieee.lib lib:scnb.lib
+#	@echo "*N*NRun bf_test in demo subdirectory to make binary demo files*N"
 
 demo/bf_test: bf_test.o binary.o alloc.o
-	slink from lib:c.o bf_test.o binary.o alloc.o to demo/bf_test\
-	lib lib:scmieee.lib lib:scnb.lib
+	$(CC) $(CFLAGS) LINK TO $@ bf_test.o binary.o alloc.o
 	@echo "*N*NRun bf_test in demo subdirectory to make binary demo files*N"
 
 docs: docs/gnuplot.doc docs/doc2gih docs/doc2tex docs/doc2ms docs/checkdoc
 	docs/doc2gih <docs/gnuplot.doc >docs/gnuplot.gih
 
 docs/doc2gih: docs/doc2gih.c docs/termdoc.c
-	$(CC) $(CFLAGS) idir= link to docs/doc2gih docs/doc2gih.c docs/termdoc.c
+	$(CC) $(CFLAGS) idir= LINK TO docs/doc2gih FROM docs/doc2gih.c docs/termdoc.c
+
+docs/doc2html: docs/doc2html.c docs/allterm.h docs/termdoc.c
+	$(CC) $(CFLAGS) def=ALL_TERM_DOC idir= LINK TO docs/doc2html FROM docs/doc2html.c docs/termdoc.c
 
 docs/doc2tex: docs/doc2tex.c docs/allterm.h docs/termdoc.c
-	$(CC) $(CFLAGS) def=ALL_TERM_DOC idir= link to docs/doc2tex docs/doc2tex.c docs/termdoc.c
+	$(CC) $(CFLAGS) def=ALL_TERM_DOC idir= LINK TO docs/doc2tex FROM docs/doc2tex.c docs/termdoc.c
 
 docs/doc2ms: docs/doc2ms.c docs/allterm.h docs/termdoc.c
-	$(CC) $(CFLAGS) def=ALL_TERM_DOC idir= link to docs/doc2ms docs/doc2ms.c docs/termdoc.c
+	$(CC) $(CFLAGS) def=ALL_TERM_DOC idir= LINK TO docs/doc2ms FROM docs/doc2ms.c docs/termdoc.c
 
 docs/checkdoc: docs/checkdoc.c docs/allterm.h docs/termdoc.c 
-	$(CC) $(CFLAGS) def=ALL_TERM_DOC idir= link to docs/checkdoc docs/checkdoc.c docs/termdoc.c
+	$(CC) $(CFLAGS) def=ALL_TERM_DOC idir= LINK TO docs/checkdoc FROM docs/checkdoc.c docs/termdoc.c
 
 docs/allterm.h: $(CORETERM)
 	join term/\#?.trm as docs/allterm.h
 
+clean:
+	@-delete $(OBJS) bf_test.o quiet
+	@-delete docs/\#?.o docs/\#?.lnk quiet
+
+veryclean: clean
+	@-delete demo/binary[1-3] fitdemo/fit.log quiet
+	@-delete bf_test demo/fit.log gnuplot docs/gnuplot.gih quiet
+	@-delete docs/doc2gih docs/doc2tex docs/doc2ms docs/checkdoc quiet
+
+install: gnuplot docs/gnuplot.gih
+	copy docs/gnuplot.gih $(HELPDEST)
+	copy gnuplot $(DEST)
+
+debug:
+	smake -f makefile.amg DEBUG=dbg=sf LNDBG=addsym OFLAGS= all
 
+#
+# Dependencies; do not edit!
+#
 alloc.o: alloc.c plot.h
 amiga.o: amiga.c
 bf_test.o: bf_test.c
@@ -112,7 +206,6 @@
 eval.o: eval.c plot.h
 fit.o: fit.c fit.h matrix.h plot.h
 graph3d.o: graph3d.c plot.h setshow.h
-graphics.oo: graphics.c plot.h setshow.h
 help.o: help.c plot.h help.h
 hidden3d.o: hidden3d.c plot.h setshow.h
 internal.o: internal.c plot.h
@@ -124,30 +217,11 @@
 plot2d.o: plot2d.c plot.h setshow.h fit.h binary.h help.h
 plot3d.o: plot3d.c plot.h setshow.h binary.h help.h
 scanner.o: scanner.c plot.h
-set.oo: set.c plot.h setshow.h
 show.o: show.c plot.h setshow.h
 specfun.o: specfun.c plot.h
 standard.o: standard.c plot.h
 stdfn.o: stdfn.c stdfn.h
-term.oo: term.c term.h plot.h setshow.h bitmap.h $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
 time.o: time.c plot.h setshow.h
 util.o: util.c plot.h
 util3d.o: util3d.c plot.h setshow.h
 version.o: version.c
-
-
-clean:
-	@-delete $(OBJS) bf_test.o binary.o quiet
-	@-delete docs/\#?.o docs/\#?.lnk quiet
-
-veryclean: clean
-	@-delete demo/binary[1-3] fitdemo/fit.log quiet
-	@-delete bf_test demo/fit.log gnuplot docs/gnuplot.gih quiet
-	@-delete docs/doc2gih docs/doc2tex docs/doc2ms docs/checkdoc quiet
-
-install: gnuplot docs/gnuplot.gih
-	copy docs/gnuplot.gih $(HELPDEST)
-	copy gnuplot $(DEST)
-
-debug:
-	smake -f makefile.amg DEBUG=dbg=sf LNDBG=addsym OFLAGS= all
diff -urN gnuplot-3.7/makefile.ami gnuplot-3.7.1/makefile.ami
--- gnuplot-3.7/makefile.ami	Fri Sep 25 16:22:15 1998
+++ gnuplot-3.7.1/makefile.ami	Fri Sep 25 16:22:15 1998
@@ -1,5 +1,5 @@
 #
-# $Id: makefile.ami,v 1.16 1998/04/14 00:15:50 drd Exp $
+# $Id: makefile.ami,v 1.5 1998/09/25 15:22:15 lhecking Exp $
 #
 #
 #
diff -urN gnuplot-3.7/makefile.cyg gnuplot-3.7.1/makefile.cyg
--- gnuplot-3.7/makefile.cyg	Wed Jan 13 21:49:24 1999
+++ gnuplot-3.7.1/makefile.cyg	Tue Aug 24 15:14:13 1999
@@ -19,7 +19,7 @@
 
 CC = gcc
 LD = gcc
-WINCFLAGS = -O2 -mno-cygwin $(WIN32FLAGS) -I$(WIN32INC) -I$(TOP) -D_Windows -D__WIN32__ -DWIN32 -DHAVE_STRNICMP -DREADLINE=1 -DNO_GIH -DGP_INLINE=inline -DHAVE_SLEEP -DANSI_C -DHAVE_GETCWD -DNEAR= -DHAVE_LIBPNG -DHAVE_LIBGD -DNO_SETVBUF -DCYGWIN
+WINCFLAGS = -O2 -mno-cygwin $(WIN32FLAGS) -I$(TOP) -I$(WIN32INC) -D_Windows -D__WIN32__ -DWIN32 -DHAVE_STRNICMP -DREADLINE=1 -DNO_GIH -DGP_INLINE=inline -DHAVE_SLEEP -DANSI_C -DHAVE_GETCWD -DNEAR= -DHAVE_LIBPNG -DHAVE_LIBGD -DNO_SETVBUF -DCYGWIN
 WINLDFLAGS = -s -mwindows -mno-cygwin -L/usr/local/lib  # -v # -Wl,--verbose
 CFLAGS = -g -O2 -I$(TOP) -DNO_GIH -DHAVE_STRNICMP -DREADLINE -DHAVE_SLEEP -DHAVE_GETCWD -DNEAR= -DWIN32
 LDFLAGS = -g #-v # -Wl,--verbose
diff -urN gnuplot-3.7/makefile.msc gnuplot-3.7.1/makefile.msc
--- gnuplot-3.7/makefile.msc	Fri Oct  9 15:31:24 1998
+++ gnuplot-3.7.1/makefile.msc	Fri Oct  9 15:31:24 1998
@@ -1,5 +1,5 @@
 #
-# $Id: makefile.msc,v 1.17 1998/04/14 00:15:52 drd Exp $
+# $Id: makefile.msc,v 1.5 1998/10/09 14:31:24 lhecking Exp $
 #
 # Make file for use with Microsoft C  Version 5.10
 # and Microsoft Program Maintenance Utility  Version 4.07
diff -urN gnuplot-3.7/makefile.msw gnuplot-3.7.1/makefile.msw
--- gnuplot-3.7/makefile.msw	Fri Oct  9 15:31:26 1998
+++ gnuplot-3.7.1/makefile.msw	Fri Oct  9 15:31:26 1998
@@ -1,5 +1,5 @@
 #
-# $Id: makefile.msw,v 1.15 1998/04/14 00:15:53 drd Exp $
+# $Id: makefile.msw,v 1.5 1998/10/09 14:31:26 lhecking Exp $
 #
 # Make file for Microsoft C  Version 7.0 Windows Version
 # and Microsoft Program Maintenance Utility  Version 1.20
diff -urN gnuplot-3.7/makefile.os2 gnuplot-3.7.1/makefile.os2
--- gnuplot-3.7/makefile.os2	Sun Dec  6 21:55:07 1998
+++ gnuplot-3.7.1/makefile.os2	Thu Oct 28 11:14:55 1999
@@ -1,10 +1,10 @@
 #
-# $Id: makefile.os2,v 1.27 1998/04/14 00:15:54 drd Exp $
+# $Id: makefile.os2,v 1.13.2.2 1999/10/28 10:14:55 lhecking Exp $
 #
-# Makefile for use with emx (and above) and GNUMake
+# Makefile for use with emx and GNUMake
 #   on OS/2 3.0 and above (might also work for OS/2 2.x)
 #
-# last modification date: 19981205
+# last modification date: 19991027
 #
 
 # We depend on using cmd.exe (or a compatible one)
@@ -118,7 +118,7 @@
 EMXSPECIFIC = -ffloat-store -DREADLINE -DHAVE_STRNICMP -DPIPES -DHAVE_STRERROR -DHAVE_SYS_SELECT_H -DHAVE_SYS_STAT_H
 LIBS = 
 ifdef GNU_RL
-  EMXSPECIFIC += -DGNU_READLINE
+  EMXSPECIFIC += -DHAVE_LIBREADLINE
   LIBS += -lreadline -ltermcap
 endif
 
@@ -235,7 +235,7 @@
 X11LIBS = -lX11 -lsocket -Zcrtdll
 # X11 includes
 X11INCLUDES = -I$(X11ROOT)/xfree86/include
-X11FLAGS= -D__ST_MT_ERRNO -Zmtd -Zsysv-signals
+X11FLAGS= -Zmtd -Zsysv-signals
 
 gnuplot_x11.exe: gplt_x11.o stdfn.o
 	$(CC) $(LFLAGS) $(X11FLAGS) $(EMXSPECIFIC) -o $@ $^ $(X11LIBS)
@@ -250,7 +250,7 @@
 # (and don't care about the strange way it's implemented ...)
 gnuplot.dvi: gnuplot.tex
 	copy gnuplot.tex $(DOCDIR)\gnuplot_2.tex
-	cd $(DOCDIR) & latex2e gnuplot_2.tex
+	cd $(DOCDIR) & latex gnuplot_2.tex & latex gnuplot_2.tex
 	move $(DOCDIR)\gnuplot_2.dvi gnuplot.dvi
 	del $(DOCDIR)\gnuplot_2*
 gnuplot.tex:  $(DOCDIR)\gnuplot.doc doc2tex.exe
diff -urN gnuplot-3.7/makefile.os9 gnuplot-3.7.1/makefile.os9
--- gnuplot-3.7/makefile.os9	Sun Dec  6 21:56:25 1998
+++ gnuplot-3.7.1/makefile.os9	Sun Dec  6 21:56:25 1998
@@ -1,6 +1,6 @@
 ############################################################
 #
-# $Id: makefile.os9,v 1.4 1998/04/14 00:15:55 drd Exp $
+# $Id: makefile.os9,v 1.8 1998/12/06 21:56:25 lhecking Exp $
 #
 # GNUPLOT 3.7 makefile (X11 support) for OS-9 and Ultra C
 #   by Martijn Schipper 18-6-1996
diff -urN gnuplot-3.7/makefile.st gnuplot-3.7.1/makefile.st
--- gnuplot-3.7/makefile.st	Fri Oct  9 15:31:33 1998
+++ gnuplot-3.7.1/makefile.st	Fri Oct  9 15:31:33 1998
@@ -1,5 +1,5 @@
 #
-# $Id: makefile.st,v 1.19 1998/04/14 00:15:56 drd Exp $
+# $Id: makefile.st,v 1.5 1998/10/09 14:31:33 lhecking Exp $
 #
 
 #
diff -urN gnuplot-3.7/makefile.unx gnuplot-3.7.1/makefile.unx
--- gnuplot-3.7/makefile.unx	Mon Dec  7 22:10:09 1998
+++ gnuplot-3.7.1/makefile.unx	Thu Aug 19 15:38:45 1999
@@ -1,5 +1,5 @@
 #
-# $Id: makefile.unx,v 1.92 1998/04/14 00:15:57 drd Exp $
+# $Id: makefile.unx,v 1.6.2.1 1999/08/19 14:38:45 lhecking Exp $
 #
 #
 ############################################################
@@ -63,9 +63,9 @@
 #   gnuplot prompts have been noted when this feature is selected
 #   on IBM RS/6000 AIX, and compile errors are encountered on
 #   Sequent Dynix 3 and Convex OS 9.0. If seems to work with ConvexOS 10.1.
-# GNU_READLINE
+# HAVE_LIBREADLINE
 #   If you want to use the more complex gnu version of readline, you can
-#   define GNU_READLINE as well as READLINE and add the appropriate library
+#   define HAVE_LIBREADLINE as well as READLINE and add the appropriate library
 #   file(s) to LIBS below.
 # NOCWDRC:
 #   If NOCWDRC is defined, then any .gnuplot in the current directory
diff -urN gnuplot-3.7/makefile.vms gnuplot-3.7.1/makefile.vms
--- gnuplot-3.7/makefile.vms	Fri Oct  9 15:31:37 1998
+++ gnuplot-3.7.1/makefile.vms	Wed Oct 20 15:04:13 1999
@@ -1,29 +1,53 @@
 #
-# $Id: makefile.vms,v 1.26 1998/04/14 00:15:59 drd Exp $
+# $Id: makefile.vms,v 1.4.2.2 1999/10/20 14:04:13 lhecking Exp $
 #
+# GNUPLOT Makefile for VMS
 #
-# GNUPLOT Makefile
-# for VMS
-# 
 # use with the MAKE that was posted by Tony Ivanov (tony@gvgpvd.GVG.TEK.COM)
 # in comp.os.vms on 5 December 1988
 #
+# Modified 23 June 1999 to work with MMK; it should also work with MMS.
+# John.Hasstedt@sunysb.edu.
+#
+# You can define a macro on the command line to specify the compiler, either
+# VAXC or GNUC; if you do not specify either, it uses DECC.  If you are
+# compiling on Alpha, you should also define __ALPHA__ (MMK does this for you,
+# for MMS, use MMS/DESCRIP=MAKEFILE.VMS/MACRO=__ALPHA__).
 
 ########### COMPILE OPTIONS ###########
 
-
-# select these lines for DECC
-#
-# WHICHRTL=DECCRTL
-# PREFIXALL=/prefix=all
-#
-# select these lines for VAXC
-
+.IFDEF VAXC
+CC=CC
 WHICHRTL=VAXCRTL
 CRTL_SHARE=,sys$$disk:[]linkopt.vms/opt
-
-# uncomment the following line for gnu cc
-# EXTRALIB=,gnu_cc:[000000]gcclib/lib
+PREFIXALL=
+CRTL_SHARE=
+EXTRADEFS=
+EXTRAOBJ=
+EXTRALIB=
+.ELSE
+.IFDEF GNUC
+CC=GCC
+WHICHRTL=VAXCRTL
+CRTL_SHARE=,sys$$disk:[]linkopt.vms/opt
+PREFIXALL=
+CRTL_SHARE=
+EXTRADEFS=
+EXTRAOBJ=
+EXTRALIB=,gnu_cc:[000000]gcclib/lib
+.ELSE  # DECC
+CC=CC
+WHICHRTL=DECCRTL
+PREFIXALL=/prefix=all
+CRTL_SHARE=
+.IFDEF __ALPHA__
+EXTRADEFS=,HAVE_SLEEP,HAVE_GETCWD,HAVE_LGAMMA,HAVE_UNISTD_H
+.ELSE
+EXTRADEFS=,HAVE_SLEEP,HAVE_GETCWD,HAVE_UNISTD_H
+EXTRAOBJ=
+EXTRALIB=
+.ENDIF
+.ENDIF
 
 #maybe ABJ and AXE if that's your local convention for alpha
 #(that's how I build vax and axp programs in same directory)
@@ -33,64 +57,80 @@
 # NOOP  NO Optimiser
 # take out X11 if you dont want windows support
 # pipes compiles with popen emulation (from VMS perl-5 port)
-CFLAGS = /NOOP/define=(NO_GIH,X11,PIPES,$(WHICHRTL)) $(PREFIXALL)
-
+CFLAGS = /define=(NO_GIH,X11,PIPES$(EXTRADEFS),$(WHICHRTL)) $(PREFIXALL)
 TERMFLAGS = /include=[.term]
 
 
 ############## okay, that's enough fiddling ###############
 
-OBJS1 = alloc.$O,binary.$O,bitmap.$O,command.$O,contour.$O,datafile.$O,eval.$O,
-OBJS2 = fit.$O,graphics.$O,graph3d.$O,hidden3d.$O,internal.$O,interpol.$O,
-OBJS3 = matrix.$O,misc.$O,parse.$O,plot.$O,plot2d.$O,plot3d.$O,scanner.$O,set.$O,
-OBJS4 = show.$O,specfun.$O,standard.$O,stdfn.$O,term.$O,time.$O,util.$O,util3d.$O,version.$O,vms.$O
+OBJS1 = alloc.$(O),binary.$(O),bitmap.$(O),command.$(O),contour.$(O),datafile.$(O),eval.$(O),
+OBJS2 = fit.$(O),graphics.$(O),graph3d.$(O),help.$(O),hidden3d.$(O),internal.$(O),interpol.$(O),
+OBJS3 = matrix.$(O),misc.$(O),parse.$(O),plot.$(O),plot2d.$(O),plot3d.$(O),scanner.$(O),set.$(O),
+OBJS4 = show.$(O),specfun.$(O),standard.$(O),stdfn.$(O),term.$(O),time.$(O),util.$(O),util3d.$(O),version.$(O),vms.$(O)
 OBJS = $(OBJS1)$(OBJS2)$(OBJS3)$(OBJS4)$(EXTRAOBJ)
 
-CSOURCE1 = command.c set.c show.c 
-CSOURCE2 = help.c graphics.c graph3d.c internal.c 
+CSOURCE1 = command.c set.c show.c
+CSOURCE2 = help.c graphics.c graph3d.c internal.c
 CSOURCE3 = misc.c eval.c parse.c plot.c plot2d.c plot3d.c scanner.c standard.c stdfn.c
 CSOURCE4 = bitmap.c term.c time.c util.c version.c interpol.c fit.c matrix.c
 CSOURCE5 = [.term]aed.trm [.term]cgi.trm [.term]dumb.trm [.term]dxf.trm [.term]dxy.trm \
 	[.term]eepic.trm [.term]epson.trm [.term]fig.trm [.term]hp26.trm \
-	[.term]hp2648.trm [.term]hpgl.trm [.term]hpljii.trm 
+	[.term]hp2648.trm [.term]hpgl.trm [.term]hpljii.trm
 CSOURCE6 = [.term]impcodes.h [.term]imagen.trm [.term]object.h \
 	[.term]iris4d.trm [.term]kyo.trm [.term]latex.trm [.term]pbm.trm  \
-	[.term]pc.trm 
+	[.term]pc.trm
 CSOURCE7 = [.term]post.trm [.term]qms.trm [.term]regis.trm [.term]sun.trm \
 	[.term]t410x.trm [.term]tek.trm [.term]unixpc.trm [.term]unixplot.trm \
 	[.term]v384.trm [.term]x11.trm gplt_x11.c
 CSOURCE8 = contour.c specfun.c interpol.c vms.c
 
-all :   gnuplot.$X gnuplot.hlp gnuplot.hlb
+all :   gnuplot.$(X) gnuplot_x11.$(X) gnuplot.hlp gnuplot.hlb [.demo]binary1.
+
+gnuplot.$(X) : $(OBJS) $(EXTRAOBJ)
+	link /exe=gnuplot.$(X) vms.$(O),gnuplot.opt/opt$(EXTRAOBJ)$(EXTRALIB)$(CRTL_SHARE)
 
-gnuplot.$X : $(OBJS) $(EXTRAOBJ)
-	link /exe=gnuplot.$X vms.$O gnuplot.opt/opt $(EXTRAOBJ) $(EXTRALIB) $(CRTL_SHARE)
+gnuplot_x11.$(X) : gplt_x11.$(O) stdfn.$(O)
+	link /exe=gnuplot_x11.$(X) gplt_x11.$(O),stdfn.$(O),x11.opt/option$(CRTL_SHARE)
 
-gnuplot.hlp : doc2hlp.$X [.docs]gnuplot.doc [.docs]doc2hlp.com
-	$$@[.docs]doc2hlp.com
+gplt_x11.o : gplt_x11.c
+	$(CC) $(CFLAGS) $(X11FLAGS)
+
+[.demo]binary1. [.demo]binary2. [.demo]binary3. : bf_test.$(X)
+	set default [.demo]
+	run [-]bf_test.$(X)
+	set default [-]
+       
+bf_test.$(X) : bf_test.$(O) binary.$(O) alloc.$(O)
+	link /exe=bf_test.exe bf_test.$(O),binary.$(O),alloc.$(O)
+
+gnuplot.hlp : doc2hlp.$(X) [.docs]gnuplot.doc
+	define/user sys$input [.docs]gnuplot.doc
+	define/user sys$output []gnuplot.hlp
+	run doc2hlp
 
 gnuplot.hlb : gnuplot.hlp
 	library/create/help gnuplot.hlb gnuplot.hlp
 
-doc2hlp.$X: [.docs]doc2hlp.c [.docs]termdoc.c
-	$(CC) /include=([.docs],[],[.term]) [.docs]doc2hlp.c [.docs]termdoc.c
-	link /exe=doc2hlp.$X doc2hlp termdoc $(CTRL_SHARE)
+doc2hlp.$(X) : [.docs]doc2hlp.c [.docs]termdoc.c
+	$(CC) /include=([.docs],[],[.term]) [.docs]doc2hlp.c,[.docs]termdoc.c
+	link /exe=doc2hlp.$(X) doc2hlp,termdoc$(CRTL_SHARE)
 
-term.$O: term.h term.c $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
-	$(CC) $(CFLAGS) $(TERMFLAGS) term.c /object=term.$O
+term.$(O) : term.h term.c $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
+	$(CC) $(CFLAGS) $(TERMFLAGS) term.c /object=term.$(O)
 
-$(OBJS): plot.h
+$(OBJS) : plot.h
 
-command.$O help.$O misc.$O: help.h
+command.$(O) help.$(O) misc.$(O) : help.h
 
-command.$O graphics.$O graph3d.$O misc.$O plot.$O set.$O show.$O term.O interpol.$O: setshow.h
+command.$(O) graphics.$(O) graph3d.$(O) misc.$(O) plot.$(O) set.$(O) show.$(O) term.O interpol.$(O) : setshow.h
 
-command.$O fit.$O matrix.$O: fit.h
+command.$(O) fit.$(O) matrix.$(O) : fit.h
 
-fit.$O matrix.$O: matrix.h
+fit.$(O) matrix.$(O) : matrix.h
 
-bitmap.$O term.$O: bitmap.h
+bitmap.$(O) term.$(O) : bitmap.h
 
 clean :
 	purge/log
-	del/log *.$O;*
+	delete/log *.$(O);*
+	delete/log [.demo]binary1.;*,binary2.;*,binary3.;*
diff -urN gnuplot-3.7/makefile.win gnuplot-3.7.1/makefile.win
--- gnuplot-3.7/makefile.win	Mon Dec 14 18:43:26 1998
+++ gnuplot-3.7.1/makefile.win	Tue Oct 19 14:32:17 1999
@@ -1,36 +1,67 @@
 # make file for Borland C++ 3.1 Windows version
-# and Win32 using Borland C++ 4 (4.52 is known to work)
-# CAVEAT: may not work correctly with BC 5 due to changes in flags
+# and Win32 using Borland C++ 4 (or 5? --- 4.52 is known to work)
+# or Borland C++ Builder 1 (newer versions may work as well)
+#
+# This makefile may need some editing before it can be used. Check
+# BCC installation path, the WIN32 and RUNTIME_LIB flags, in particular.
+#
 # The compile and link includes debug flags.  Take them out if you
 # do not want them included  (-y -v -M, /m /s /v /l)
+#
+# New 991003: WIN32=1 build makes the helpers (doc2rtf, bf_test) as Win32
+#             console applications, instead of plain DOS programs. This
+#             way, it also works with those compilers missing a DOS option.
 
 # where to place wgnuplot.hlp helpfile
 HELPFILE = wgnuplot.hlp
+
 # location of Borland C compiler
-TC = d:\bc45
+TC = d:\bc31
+
+# location of TLINK.EXE and BCC.EXE
+BIN = $(TC)\bin\\
+
+#The full path name of the help compiler. For BC++:
+HC = $(BIN)\hc
+# this comes with C++ Builder 1.0 (but doesn't seem to work):
+#HC = $(TC)\help\tools\hcw /c /e
+# or you can use the 'help workshop' available directly from MS:
+#HC = h:\mssdk\bin\hcw /c/e
+
 # WIN32=1 for Win32s or Win32 (--> '95 or NT)
 # new: allow '-DWIN32=1' on make command line to take effect:
 !if "$(WIN32)"==""
 WIN32=0
 !endif
 
+# Uncomment _this_ for BC++ 4.52 (or others that give linker errors for
+# the 'errno' variable)... :
+RUNTIME_LIBRARY=cw32.lib
+
+# ... or this for more modern ones (like C++Builder 1.0) -- it's the
+# properly multithreading one:
+#RUNTIME_LIBRARY=cw32mt.lib
+
 !if $(WIN32)
-# name of C compiler
-# bcc32a is the pentium-scheduling compiler in BC 4.52
-!if $(PENTIUM)
-CC = bcc32a
-PROCESSOR_OPT = -5
-!else
+
+# 32bit Windows compilation.
 CC = bcc32
 PROCESSOR_OPT =
-!endif
-CCAUX = bcc
+DEFINE_HELPFILE = -DHELPFILE=\"$(HELPFILE)\"
+
+# For BC++ 4.52, you may try this version with Pentium scheduling
+# optimization. NB: bcc32a in 4.52 increased in bugginess quite
+# a bit more than in program speed :-(
+#CC = bcc32a
+#PROCESSOR_OPT = -5
+
 !else
+
+# 16bit compilation:
 CC = bcc
-CCAUX = bcc
+DEFINE_HELPFILE = -DHELPFILE="$(HELPFILE)"
+
 !endif
-# location of TLINK.EXE and BCC.EXE
-BIN = $(TC)\bin\\
 
 # -c means don't link
 # -ml means use large model (large code, large data)
@@ -46,7 +77,7 @@
 #    section of the linker call.
 !if $(WIN32)
 CFLAGS = -c -W -M -G -y -v -w-rvl -w-use -w-par -w-aus -w-pro $(PROCESSOR_OPT) -I$(TC)\include -Iwin -DREADLINE=1 -DHAVE_STRNICMP -DWIN32 -DHAVE_STRERROR -DNO_GIH -DNOGAMMA -DWIN32_LEAN_AND_MEAN -DANSI_C -DHAVE_GETCWD
-CAUXFLAGS = -ml -w-par -w-use -w-aus -f -N -M -y -v -d -I$(TC)\include -DHAVE_STRNICMP -DANSI_C
+CAUXFLAGS = -tWC -w-par -w-use -w-aus -f -N -M -y -v -d -I$(TC)\include -DWIN32 -DWINDOWS_NO_GUI -DHAVE_STRNICMP -DANSI_C
 !else
 CFLAGS = -c -W -ml -w-par -w-use -w-aus -f -h -N -M -y -v -d -Ff=32 -I$(TC)\include -Iwin -DREADLINE=1 -zEGPFAR_DATA -DHAVE_STRNICMP -DMSDOS=1 -DNO_GIH -DANSI_C -DHAVE_GETCWD -DNDEBUG
 CAUXFLAGS = -ml -w-par -w-use -w-aus -f -N -M -y -v -d -I$(TC)\include -DMSDOS=1 -DHAVE_STRNICMP -DANSI_C
@@ -119,7 +150,7 @@
 fit matrix datafile alloc util3d hidden3d time +
 ,wgnupl32,wgnupl32, +
 $(TC)\lib\import32 +
-$(TC)\lib\cw32, +
+$(TC)\lib\$(RUNTIME_LIBRARY), +
 win\wgnupl32.def, wgnupl32.res
 !
 
@@ -138,7 +169,7 @@
 bitmap.obj: bitmap.c bitmap.h plot.h
 
 command.obj: command.c plot.h setshow.h fit.h
-	$(BIN)$(CC) -DHELPFILE=\"$(HELPFILE)\" @&&!
+        $(BIN)$(CC) $(DEFINE_HELPFILE) @&&!
 $(CFLAGS)
 ! command.c
 
@@ -181,7 +212,7 @@
 set.obj: set.c plot.h setshow.h
 
 show.obj: show.c plot.h setshow.h
-	$(BIN)$(CC) -DHELPFILE=\"$(HELPFILE)\" @&&!
+        $(BIN)$(CC) $(DEFINE_HELPFILE) @&&!
 $(CFLAGS)
 ! show.c
 
@@ -205,7 +236,7 @@
 version.obj: version.c
 
 winmain.obj: win\winmain.c win\wgnuplib.h win\wtext.h plot.h
-	$(BIN)$(CC) -DHELPFILE=\"$(HELPFILE)\" @&&!
+        $(BIN)$(CC) $(DEFINE_HELPFILE) @&&!
 $(CFLAGS)
 ! win\winmain.c
 
@@ -254,13 +285,13 @@
 	
 # convert gnuplot.doc to gnuplot.rtf
 $(HELPFILE): win\gnuplot.rtf
-	$(BIN)hc win\wgnuplot.hpj 
+	$(HC) win\wgnuplot.hpj
 
 win\gnuplot.rtf: doc2rtf.exe docs\gnuplot.doc win\wgnuplot.hpj
 	doc2rtf docs\gnuplot.doc win\gnuplot.rtf
 
 doc2rtf.exe: docs\doc2rtf.c docs\termdoc.c docs\xref.c $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
-	$(BIN)$(CCAUX) -edoc2rtf.exe @&&!
+	$(BIN)$(CC) -edoc2rtf.exe @&&!
 -D_Windows
 -w-pro
 $(CAUXFLAGS)
@@ -269,7 +300,7 @@
 
 # make binary demo files
 demo\bf_test.exe: bf_test.c dbinary.obj dalloc.obj
-	$(BIN)$(CCAUX) -edemo\bf_test.exe @&&!
+	$(BIN)$(CC) -edemo\bf_test.exe @&&!
 $(CAUXFLAGS)
 -L$(TC)\lib
 ! bf_test.c dbinary.obj dalloc.obj
@@ -278,18 +309,19 @@
 	cd ..
 
 dalloc.obj: alloc.c
-	$(BIN)$(CCAUX) -c @&&!
+	$(BIN)$(CC) -c @&&!
 $(CAUXFLAGS)
 ! -odalloc.obj alloc.c
 
 dbinary.obj: binary.c
-	$(BIN)$(CCAUX) -c @&&!
+	$(BIN)$(CC) -c @&&!
 $(CAUXFLAGS)
 ! -odbinary.obj binary.c
 
 # clean up temporary files
 clean:
 	del *.obj
+	del win\*.obj
 	del wgnuplot.map
 	del win\wgnuplot.res
 	del wgnupl32.map
@@ -300,6 +332,8 @@
 	del win\wgnuplib.res
 	del wgnuplib.map
 	del wgnuplot.lib
+	del bf_test.map
+	del demo\bf_test.map
 	del demo\bf_test.exe
 	
 realclean: veryclean
@@ -307,6 +341,7 @@
 veryclean: clean
 	del wgnuplot.exe
 	del wgnuplot.hlp
+	del win\wgnuplot.hlp
 	-attrib -h wgnuplot.gid
 	del wgnuplot.gid
 	del wgnuplot.mnu
@@ -315,3 +350,5 @@
 	del demo\binary1
 	del demo\binary2
 	del demo\binary3
+	del demo\fit.log
+	del demo\soundfit.par
diff -urN gnuplot-3.7/matrix.c gnuplot-3.7.1/matrix.c
--- gnuplot-3.7/matrix.c	Thu Nov 19 10:40:31 1998
+++ gnuplot-3.7.1/matrix.c	Thu Nov 19 10:40:31 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: matrix.c,v 1.15 1998/04/14 00:16:01 drd Exp $";
+static char *RCSid = "$Id: matrix.c,v 1.12 1998/11/19 10:40:31 lhecking Exp $";
 #endif
 
 /*
diff -urN gnuplot-3.7/matrix.h gnuplot-3.7.1/matrix.h
--- gnuplot-3.7/matrix.h	Tue Jun 30 17:42:24 1998
+++ gnuplot-3.7.1/matrix.h	Tue Jun 30 17:42:24 1998
@@ -1,4 +1,4 @@
-/* $Id: matrix.h,v 1.4 1998/04/14 00:16:01 drd Exp $ */
+/* $Id: matrix.h,v 1.8 1998/06/30 16:42:24 lhecking Exp $ */
 
 /*
  *	Header file: public functions in matrix.c
diff -urN gnuplot-3.7/misc.c gnuplot-3.7.1/misc.c
--- gnuplot-3.7/misc.c	Thu Dec 10 18:33:22 1998
+++ gnuplot-3.7.1/misc.c	Wed Sep 29 18:17:27 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: misc.c,v 1.79 1998/04/14 00:16:02 drd Exp $";
+static char *RCSid = "$Id: misc.c,v 1.15.2.2 1999/09/29 17:17:27 lhecking Exp $";
 #endif
 
 /* GNUPLOT - misc.c */
@@ -68,7 +68,7 @@
   }\
   putc('"', fp);\
  } else {\
-  fprintf(fp,"%g",x);\
+  fprintf(fp,"%#g",x);\
 }} while(0)
 
 
@@ -449,7 +449,7 @@
     struct text_label *this_label;
     struct arrow_def *this_arrow;
     struct linestyle_def *this_linestyle;
-    char str[MAX_LINE_LEN + 1];
+    char str[MAX_LINE_LEN+1];
 
     /* opinions are split as to whether we save term and outfile
      * as a compromise, we output them as comments !
@@ -502,20 +502,13 @@
 		dgrid3d_col_fineness,
 		dgrid3d_norm_value);
 
-    fprintf(fp, "\
-set dummy %s,%s\n\
-set format x \"%s\"\n\
-set format y \"%s\"\n\
-set format x2 \"%s\"\n\
-set format y2 \"%s\"\n\
-set format z \"%s\"\n\
-set angles %s\n",
-	    dummy_var[0], dummy_var[1],
-	    conv_text(str, xformat),
-	    conv_text(str, yformat),
-	    conv_text(str, x2format),
-	    conv_text(str, y2format),
-	    conv_text(str, zformat),
+    fprintf(fp, "set dummy %s,%s\n",dummy_var[0], dummy_var[1]);
+    fprintf(fp, "set format x \"%s\"\n", conv_text(str, xformat));
+    fprintf(fp, "set format y \"%s\"\n", conv_text(str, yformat));
+    fprintf(fp, "set format x2 \"%s\"\n", conv_text(str, x2format));
+    fprintf(fp, "set format y2 \"%s\"\n", conv_text(str, y2format));
+    fprintf(fp, "set format z \"%s\"\n", conv_text(str, zformat));
+    fprintf(fp, "set angles %s\n",
 	    (angles_format == ANGLES_RADIANS) ? "radians" : "degrees");
 
     if (work_grid.l_type == 0)
@@ -1154,7 +1147,8 @@
 		}
 		screen_ok = FALSE;	/* make sure command line is
 					   echoed on error */
-		do_line();
+		if (do_line())
+		    stop = TRUE;
 	    }
 	}
     }
diff -urN gnuplot-3.7/mkinstalldirs gnuplot-3.7.1/mkinstalldirs
--- gnuplot-3.7/mkinstalldirs	Tue Aug 18 17:29:26 1998
+++ gnuplot-3.7.1/mkinstalldirs	Tue Aug 18 17:29:26 1998
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.10 1996/05/03 07:37:52 friedman Exp $
+# $Id: mkinstalldirs,v 1.2 1998/08/18 16:29:26 lhecking Exp $
 
 errstatus=0
 
diff -urN gnuplot-3.7/national.h gnuplot-3.7.1/national.h
--- gnuplot-3.7/national.h	Wed Jul  8 21:46:46 1998
+++ gnuplot-3.7.1/national.h	Wed Jul  8 21:46:46 1998
@@ -1,4 +1,4 @@
-/* $Id: national.h,v 1.4 1998/03/22 22:31:53 drd Exp $ */
+/* $Id: national.h,v 1.2 1998/07/08 20:46:46 lhecking Exp $ */
 
 /* GNUPLOT - national.h */
 
diff -urN gnuplot-3.7/os2/dialogs.c gnuplot-3.7.1/os2/dialogs.c
--- gnuplot-3.7/os2/dialogs.c	Wed Apr 15 20:23:34 1998
+++ gnuplot-3.7.1/os2/dialogs.c	Wed Apr 15 20:23:34 1998
@@ -1,5 +1,5 @@
 #ifdef INCRCSDATA
-static char RCSid[]="$Id: dialogs.c,v 1.9 1998/03/22 22:34:20 drd Exp $" ;
+static char RCSid[]="$Id: dialogs.c,v 1.1.1.2 1998/04/15 19:23:34 lhecking Exp $" ;
 #endif
 
 /****************************************************************************
diff -urN gnuplot-3.7/os2/gclient.c gnuplot-3.7.1/os2/gclient.c
--- gnuplot-3.7/os2/gclient.c	Thu Dec 17 22:10:28 1998
+++ gnuplot-3.7.1/os2/gclient.c	Thu Dec 17 22:10:28 1998
@@ -1,5 +1,5 @@
 #ifdef INCRCSDATA
-static char RCSid[]="$Id: gclient.c,v 1.15 1998/03/22 22:34:21 drd Exp $" ;
+static char RCSid[]="$Id: gclient.c,v 1.7 1998/12/17 22:10:28 lhecking Exp $" ;
 #endif
 
 /****************************************************************************
diff -urN gnuplot-3.7/os2/gnupmdrv.c gnuplot-3.7.1/os2/gnupmdrv.c
--- gnuplot-3.7/os2/gnupmdrv.c	Sat Oct  3 21:14:29 1998
+++ gnuplot-3.7.1/os2/gnupmdrv.c	Sat Oct  3 21:14:29 1998
@@ -1,5 +1,5 @@
 #ifdef INCRCSDATA
-static char RCSid[]="$Id: gnupmdrv.c,v 1.10 1998/03/22 22:34:23 drd Exp $" ;
+static char RCSid[]="$Id: gnupmdrv.c,v 1.2 1998/10/03 20:14:29 lhecking Exp $" ;
 #endif
 
 /****************************************************************************
diff -urN gnuplot-3.7/os2/gnupmdrv.h gnuplot-3.7.1/os2/gnupmdrv.h
--- gnuplot-3.7/os2/gnupmdrv.h	Wed Apr 15 20:23:39 1998
+++ gnuplot-3.7.1/os2/gnupmdrv.h	Wed Apr 15 20:23:39 1998
@@ -1,6 +1,6 @@
 /* gnushell header file */
 /*
-** static char RCSid[]="$Id: gnupmdrv.h,v 1.8 1998/03/22 22:34:23 drd Exp $" ;
+** static char RCSid[]="$Id: gnupmdrv.h,v 1.1.1.2 1998/04/15 19:23:39 lhecking Exp $" ;
 */
 
 /* PM driver for GNUPLOT */
diff -urN gnuplot-3.7/os2/gnupmdrv.rc gnuplot-3.7.1/os2/gnupmdrv.rc
--- gnuplot-3.7/os2/gnupmdrv.rc	Wed Apr 15 20:16:38 1998
+++ gnuplot-3.7.1/os2/gnupmdrv.rc	Wed Apr 15 20:16:38 1998
@@ -107,7 +107,7 @@
     BEGIN
         CTEXT           "GnuplotPM", -1, 8, 65, 128, 8
         CTEXT           "Gnuplot display for OS/2", -1, 8, 50, 128, 8
-        CTEXT           "$Revision: 1.5 $", -1, 8, 35, 128, 8
+        CTEXT           "$Revision: 1.1.1.1 $", -1, 8, 35, 128, 8
         DEFPUSHBUTTON   "OK", DID_OK, 56, 10, 32, 14, WS_GROUP
     END
 END
diff -urN gnuplot-3.7/os2/print.c gnuplot-3.7.1/os2/print.c
--- gnuplot-3.7/os2/print.c	Thu Dec 17 22:10:44 1998
+++ gnuplot-3.7.1/os2/print.c	Thu Dec 17 22:10:44 1998
@@ -1,5 +1,5 @@
 #ifdef INCRCSDATA
-static char RCSid[]="$Id: print.c,v 1.10 1998/03/22 22:34:24 drd Exp $" ;
+static char RCSid[]="$Id: print.c,v 1.3 1998/12/17 22:10:44 lhecking Exp $" ;
 #endif
 
 /****************************************************************************
diff -urN gnuplot-3.7/os9.c gnuplot-3.7.1/os9.c
--- gnuplot-3.7/os9.c	Wed Apr 15 20:22:52 1998
+++ gnuplot-3.7.1/os9.c	Wed Apr 15 20:22:52 1998
@@ -1,4 +1,4 @@
-/* $Id: os9.c,v 1.2 1998/03/22 22:31:54 drd Exp $ */
+/* $Id: os9.c,v 1.1.1.2 1998/04/15 19:22:52 lhecking Exp $ */
 
 /* GNUPLOT - os9.c */
 
diff -urN gnuplot-3.7/parse.c gnuplot-3.7.1/parse.c
--- gnuplot-3.7/parse.c	Thu Nov 19 10:41:13 1998
+++ gnuplot-3.7.1/parse.c	Thu Nov 19 10:41:13 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: parse.c,v 1.62 1998/06/18 14:55:13 ddenholm Exp $";
+static char *RCSid = "$Id: parse.c,v 1.9 1998/11/19 10:41:13 lhecking Exp $";
 #endif
 
 /* GNUPLOT - parse.c */
diff -urN gnuplot-3.7/plot.c gnuplot-3.7.1/plot.c
--- gnuplot-3.7/plot.c	Wed Dec  9 15:24:14 1998
+++ gnuplot-3.7.1/plot.c	Thu Sep 23 14:26:36 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: plot.c,v 1.87 1998/04/14 00:16:05 drd Exp $";
+static char *RCSid = "$Id: plot.c,v 1.18.2.2 1999/09/23 13:26:36 lhecking Exp $";
 #endif
 
 /* GNUPLOT - plot.c */
@@ -84,7 +84,7 @@
 
 char *infile_name = NULL;	/* name of command file; NULL if terminal */
 
-#ifdef GNU_READLINE
+#ifdef HAVE_LIBREADLINE
 extern char *rl_readline_name;
 extern int rl_complete_with_tilde_expansion;
 #endif
@@ -216,6 +216,8 @@
 struct udvt_entry *first_udv = &udv_pi;
 struct udft_entry *first_udf = NULL;
 
+static int exit_status = EXIT_SUCCESS;
+
 #ifdef OS2
 # define INCL_DOS
 # define INCL_REXXSAA
@@ -256,6 +258,54 @@
 #endif
 }
 
+#ifdef LINUXVGA
+/* utility functions to ensure that setuid gnuplot
+ * assumes root privileges only for those parts
+ * of the code which require root rights.
+ *
+ * By "Dr. Werner Fink" <werner@suse.de>
+ */
+static uid_t euid, ruid;
+static gid_t egid, rgid;
+static int asked_privi = 0;
+
+void
+drop_privilege()
+{
+    if (!asked_privi) {
+	euid = geteuid();
+	egid = getegid();
+	ruid = getuid();
+	rgid = getgid();
+	asked_privi = 1;
+    }
+    if (setegid(rgid) == -1)
+	(void) fprintf(stderr, "setegid(%d): %s\n",
+		       (int) rgid, strerror(errno));
+    if (seteuid(ruid) == -1)
+	(void) fprintf(stderr, "seteuid(%d): %s\n",
+		       (int) ruid, strerror(errno));
+}
+
+void
+take_privilege()
+{
+    if (!asked_privi) {
+	euid = geteuid();
+	egid = getegid();
+	ruid = getuid();
+	rgid = getgid();
+	asked_privi = 1;
+    }
+    if (setegid(egid) == -1)
+	(void) fprintf(stderr, "setegid(%d): %s\n",
+		       (int) egid, strerror(errno));
+    if (seteuid(euid) == -1)
+	(void) fprintf(stderr, "seteuid(%d): %s\n",
+		       (int) euid, strerror(errno));
+}
+#endif /* LINUXVGA */
+
 
 /* a wrapper for longjmp so we can keep everything local */
 void bail_to_command_line()
@@ -329,7 +379,7 @@
     unsigned int status[2] = { 1, 0 };
 #endif
 
-#ifdef GNU_READLINE
+#ifdef HAVE_LIBREADLINE
     rl_readline_name = argv[0];
     rl_complete_with_tilde_expansion = 1;
 #endif
@@ -417,6 +467,9 @@
 	    fprintf(stderr, "\nTerminal type set to '%s'\n", term->name);
     } else {
 	/* come back here from int_error() */
+	if (interactive == FALSE)
+	    exit_status = EXIT_FAILURE;
+
 #ifdef AMIGA_SC_6_1
 	(void) rawcon(0);
 #endif
@@ -472,7 +525,7 @@
 
 		while (!com_line());
 
-		/* interactive = FALSE; /* should this be here? */
+		/* interactive = FALSE; */ /* should this be here? */
 
 	    } else
 		load_file(fopen(*argv, "r"), *argv, FALSE);
@@ -499,7 +552,7 @@
     if (aesid > -1)
 	atexit(appl_exit);
 #endif
-    return (IO_SUCCESS);
+    return (exit_status);
 }
 
 #if (defined(ATARI) || defined(MTOS)) && defined(__PUREC__)
diff -urN gnuplot-3.7/plot.h gnuplot-3.7.1/plot.h
--- gnuplot-3.7/plot.h	Tue Dec 22 19:42:28 1998
+++ gnuplot-3.7.1/plot.h	Tue Oct 19 14:32:17 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: plot.h,v 1.120 1998/04/14 00:16:06 drd Exp $
+ * $Id: plot.h,v 1.19.2.1 1999/10/19 13:32:17 lhecking Exp $
  *
  */
 
@@ -735,7 +735,7 @@
 extern char dummy_var[MAX_NUM_VAR][MAX_ID_LEN+1];	/* from setshow.c */
 
 /* Windows needs to redefine stdin/stdout functions */
-#ifdef _Windows
+#if defined(_Windows) && !defined(WINDOWS_NO_GUI)
 # include "win/wtext.h"
 #endif
 
diff -urN gnuplot-3.7/plot2d.c gnuplot-3.7.1/plot2d.c
--- gnuplot-3.7/plot2d.c	Wed Dec  9 15:24:20 1998
+++ gnuplot-3.7.1/plot2d.c	Mon Oct 11 13:18:56 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: plot2d.c,v 1.53 1998/06/18 14:55:14 ddenholm Exp $";
+static char *RCSid = "$Id: plot2d.c,v 1.16.2.4 1999/10/11 12:18:56 lhecking Exp $";
 #endif
 
 /* GNUPLOT - plot2d.c */
@@ -288,7 +288,8 @@
  * it will later be moved passed title/with/linetype/pointtype
  */
 {
-    register int i /* num. points ! */ , j, col;
+    int i /* num. points ! */ , j;
+    int max_cols, min_cols;	/* allowed range of column numbers */
     double v[NCOL];
     int storetoken = this_plot->token;
 
@@ -297,38 +298,51 @@
     switch (this_plot->plot_style) {	/* set maximum columns to scan */
     case XYERRORBARS:
     case BOXXYERROR:
-	col = 7;
+	max_cols = 7;
+	min_cols = 4;
 	break;
 
-    case BOXERROR:
     case FINANCEBARS:
     case CANDLESTICKS:
-	col = 5;
+	min_cols = max_cols = 5;
+	break;
+
+    case BOXERROR:
+	max_cols = 5;
+	min_cols = 4;
+	break;
+
+    case VECTOR:
+	min_cols = max_cols = 4;
 	break;
 
     case XERRORBARS:
     case YERRORBARS:
-    case VECTOR:
-	col = 4;
+	max_cols = 4;
+	min_cols = 3;
 	break;
 
     case BOXES:
-	col = 4;
-	break;
+	min_cols = 2;
+	max_cols = 4;
 
     default:
-	col = 2;
+	min_cols = 1;
+	max_cols = 2;
     }
 
     if (this_plot->plot_smooth == ACSPLINES)
-	col = 3;
+	max_cols = 3;
+
+    if (df_no_use_specs > max_cols)
+	int_error("Too many using specs for this style", NO_CARET);
 
-    if (df_no_use_specs > col)
-	fputs("warning : too many using specs for this style\n", stderr);
+    if (df_no_use_specs >0 && df_no_use_specs < min_cols)
+	int_error("Not enough columns for this style", NO_CARET);
 
     i = 0;
-    while ((j = df_readline(v, col)) != DF_EOF) {
-	/* j <= col */
+    while ((j = df_readline(v, max_cols)) != DF_EOF) {
+	/* j <= max_cols */
 
 	if (i >= this_plot->p_max) {
 	    /*
@@ -1194,6 +1208,8 @@
     if (plot_num == 0 || first_plot == NULL) {
 	int_error("no functions or data to plot", c_token);
     }
+
+
     if (uses_axis[FIRST_X_AXIS]) {
 	if (max_array[FIRST_X_AXIS] == -VERYLARGE ||
 	    min_array[FIRST_X_AXIS] == VERYLARGE)
@@ -1211,8 +1227,9 @@
 	    min_array[SECOND_X_AXIS] = min_array[FIRST_X_AXIS];
 	if (auto_array[SECOND_X_AXIS] & 2)
 	    max_array[SECOND_X_AXIS] = max_array[FIRST_X_AXIS];
+	if (! auto_array[SECOND_X_AXIS])
+	    FIXUP_RANGE_FOR_LOG(SECOND_X_AXIS, x2);
     }
-
     if (!uses_axis[FIRST_X_AXIS]) {
 	assert(uses_axis[SECOND_X_AXIS]);
 	if (auto_array[FIRST_X_AXIS] & 1)
@@ -1220,13 +1237,15 @@
 	if (auto_array[FIRST_X_AXIS] & 2)
 	    max_array[FIRST_X_AXIS] = max_array[SECOND_X_AXIS];
     }
+
+
     if (uses_axis[FIRST_Y_AXIS]) {
 	if (max_array[FIRST_Y_AXIS] == -VERYLARGE ||
 	    min_array[FIRST_Y_AXIS] == VERYLARGE)
 	    int_error("all points undefined!", NO_CARET);
 	fixup_range(FIRST_Y_AXIS, "y");
 	FIXUP_RANGE_FOR_LOG(FIRST_Y_AXIS, y);
-    }				/* else we want to copy y2 range, but need to fix it up first */
+    }
     if (uses_axis[SECOND_Y_AXIS]) {
 	if (max_array[SECOND_Y_AXIS] == -VERYLARGE ||
 	    min_array[SECOND_Y_AXIS] == VERYLARGE)
@@ -1234,13 +1253,17 @@
 	fixup_range(SECOND_Y_AXIS, "y2");
 	FIXUP_RANGE_FOR_LOG(SECOND_Y_AXIS, y2);
     } else {
+	/* else we want to copy y2 range */
 	assert(uses_axis[FIRST_Y_AXIS]);
 	if (auto_array[SECOND_Y_AXIS] & 1)
 	    min_array[SECOND_Y_AXIS] = min_array[FIRST_Y_AXIS];
 	if (auto_array[SECOND_Y_AXIS] & 2)
 	    max_array[SECOND_Y_AXIS] = max_array[FIRST_Y_AXIS];
+	/* Log() fixup is only necessary if the range was *not* copied from
+	 * the (already logarithmized) yrange */
+	if (! auto_array[SECOND_Y_AXIS])
+	    FIXUP_RANGE_FOR_LOG(SECOND_Y_AXIS, y2);
     }
-
     if (!uses_axis[FIRST_Y_AXIS]) {
 	assert(uses_axis[SECOND_Y_AXIS]);
 	if (auto_array[FIRST_Y_AXIS] & 1)
@@ -1248,6 +1271,7 @@
 	if (auto_array[FIRST_Y_AXIS] & 2)
 	    max_array[FIRST_Y_AXIS] = max_array[SECOND_Y_AXIS];
     }
+
 #define WRITEBACK(axis,min,max) \
 if(range_flags[axis]&RANGE_WRITEBACK) \
   {if (auto_array[axis]&1) min = min_array[axis]; \
@@ -1258,7 +1282,8 @@
 	WRITEBACK(FIRST_Y_AXIS, ymin, ymax)
 	WRITEBACK(SECOND_X_AXIS, x2min, x2max)
 	WRITEBACK(SECOND_Y_AXIS, y2min, y2max)
-	if (strcmp(term->name, "table") == 0)
+
+    if (strcmp(term->name, "table") == 0)
 	print_table(first_plot, plot_num);
     else {
 	START_LEAK_CHECK();	/* check for memory leaks in this routine */
diff -urN gnuplot-3.7/plot3d.c gnuplot-3.7.1/plot3d.c
--- gnuplot-3.7/plot3d.c	Thu Dec 10 18:30:52 1998
+++ gnuplot-3.7.1/plot3d.c	Thu Dec 10 18:30:52 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: plot3d.c,v 1.36 1998/06/18 14:55:14 ddenholm Exp $";
+static char *RCSid = "$Id: plot3d.c,v 1.16 1998/12/10 18:30:52 lhecking Exp $";
 #endif
 
 /* GNUPLOT - plot3d.c */
diff -urN gnuplot-3.7/protos.h gnuplot-3.7.1/protos.h
--- gnuplot-3.7/protos.h	Wed Jan  6 15:50:29 1999
+++ gnuplot-3.7.1/protos.h	Fri Oct  1 11:37:23 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: protos.h,v 1.56 1998/04/14 00:16:11 drd Exp $
+ * $Id: protos.h,v 1.13.2.2 1999/10/01 10:37:23 lhecking Exp $
  *
  */
 
@@ -209,13 +209,13 @@
 
 /* Prototypes from file "readline.c" */
 
-#ifndef GNU_READLINE
+#ifndef HAVE_LIBREADLINE
 char *readline __PROTO((char *prompt));
 void add_history __PROTO((char *line));
 #else
 extern char *readline();
 extern void add_history();
-#endif /* GNU_READLINE */
+#endif /* HAVE_LIBREADLINE */
 
 #if defined(ATARI) || defined(MTOS)
 char tos_getch();
@@ -248,6 +248,7 @@
 void term_apply_lp_properties __PROTO((struct lp_style_type *lp));
 void term_check_multiplot_okay __PROTO((TBOOLEAN));
 
+GP_INLINE int term_count __PROTO((void));
 void list_terms __PROTO((void));
 struct termentry *set_term __PROTO((int));
 struct termentry *change_term __PROTO((char *name, int length));
diff -urN gnuplot-3.7/readline.c gnuplot-3.7.1/readline.c
--- gnuplot-3.7/readline.c	Tue Nov  3 12:53:59 1998
+++ gnuplot-3.7.1/readline.c	Thu Aug 19 15:38:07 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: readline.c,v 1.69 1998/04/14 00:16:12 drd Exp $";
+static char *RCSid = "$Id: readline.c,v 1.9.2.1 1999/08/19 14:38:07 lhecking Exp $";
 #endif
 
 /* GNUPLOT - readline.c */
@@ -52,7 +52,7 @@
 /* get prototype for alloc and gpfaralloc */
 #include "plot.h"
 
-#if defined(READLINE) && !defined(GNU_READLINE)
+#if defined(READLINE) && !defined(HAVE_LIBREADLINE)
 
 /* a small portable version of GNU's readline
  * this is not the BASH or GNU EMACS version of READLINE due to Copyleft 
@@ -1101,4 +1101,4 @@
 }
 
 
-#endif /* READLINE && not GNU_READLINE */
+#endif /* READLINE && not HAVE_LIBREADLINE */
diff -urN gnuplot-3.7/scanner.c gnuplot-3.7.1/scanner.c
--- gnuplot-3.7/scanner.c	Wed Nov  4 14:49:57 1998
+++ gnuplot-3.7.1/scanner.c	Wed Nov  4 14:49:57 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: scanner.c,v 1.56 1998/06/18 14:55:16 ddenholm Exp $";
+static char *RCSid = "$Id: scanner.c,v 1.10 1998/11/04 14:49:57 lhecking Exp $";
 #endif
 
 /* GNUPLOT - scanner.c */
diff -urN gnuplot-3.7/set.c gnuplot-3.7.1/set.c
--- gnuplot-3.7/set.c	Mon Dec  7 22:09:12 1998
+++ gnuplot-3.7.1/set.c	Thu Aug 19 15:36:35 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: set.c,v 1.68 1998/06/22 12:24:54 ddenholm Exp $";
+static char *RCSid = "$Id: set.c,v 1.21.2.1 1999/08/19 14:36:35 lhecking Exp $";
 #endif
 
 /* GNUPLOT - set.c */
@@ -661,6 +661,12 @@
 	} else if (equals(c_token, "y")) {
 	    autoscale_y = FALSE;
 	    c_token++;
+	} else if (equals(c_token, "x2")) {
+	    autoscale_x2 = FALSE;
+	    c_token++;
+	} else if (equals(c_token, "y2")) {
+	      autoscale_y2 = FALSE;
+	      c_token++;
 	} else if (equals(c_token, "z")) {
 	    autoscale_z = FALSE;
 	    c_token++;
diff -urN gnuplot-3.7/setshow.h gnuplot-3.7.1/setshow.h
--- gnuplot-3.7/setshow.h	Sat Oct  3 21:17:47 1998
+++ gnuplot-3.7.1/setshow.h	Sat Oct  3 21:17:47 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: setshow.h,v 1.39 1998/04/14 00:16:18 drd Exp $
+ * $Id: setshow.h,v 1.3 1998/10/03 20:17:47 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/show.c gnuplot-3.7.1/show.c
--- gnuplot-3.7/show.c	Wed Dec 16 19:49:18 1998
+++ gnuplot-3.7.1/show.c	Wed Sep 29 18:17:26 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: show.c,v 1.50 1998/06/18 14:55:18 ddenholm Exp $";
+static char *RCSid = "$Id: show.c,v 1.23.2.2 1999/09/29 17:17:26 lhecking Exp $";
 #endif
 
 /* GNUPLOT - show.c */
@@ -141,7 +141,7 @@
   }\
   putc('"', stderr);\
  } else {\
-  fprintf(stderr,"%g",x);\
+  fprintf(stderr,"%#g",x);\
 }} while(0)
 
 
@@ -1337,6 +1337,12 @@
     fprintf(stderr, "y: %s%s%s, ", (autoscale_y) ? "ON" : "OFF",
 	    (autoscale_y == 1) ? " (min)" : "",
 	    (autoscale_y == 2) ? " (max)" : "");
+    fprintf(stderr, "x2: %s%s%s, ", (autoscale_x2) ? "ON" : "OFF",
+	    (autoscale_x2 == 1) ? " (min)" : "",
+	    (autoscale_x2 == 2) ? " (max)" : "");
+    fprintf(stderr, "y2: %s%s%s, ", (autoscale_y2) ? "ON" : "OFF",
+	    (autoscale_y2 == 1) ? " (min)" : "",
+	    (autoscale_y2 == 2) ? " (max)" : "");
     fprintf(stderr, "z: %s%s%s\n", (autoscale_z) ? "ON" : "OFF",
 	    (autoscale_z == 1) ? " (min)" : "",
 	    (autoscale_z == 2) ? " (max)" : "");
@@ -1430,18 +1436,13 @@
 
 static void show_format()
 {
-    char str[5][MAX_LINE_LEN + 1];
+    char str[MAX_LINE_LEN+1];
 
-    fprintf(stderr, "\ttic format is x-axis: \"%s\"\
-, y-axis: \"%s\"\
-, z-axis: \"%s\"\
-, x2-axis: \"%s\"\
-, y2-axis: \"%s\"\n",
-	    conv_text(str[0], xformat),
-	    conv_text(str[1], yformat),
-	    conv_text(str[2], zformat),
-	    conv_text(str[3], x2format),
-	    conv_text(str[4], y2format));
+    fprintf(stderr, "\ttic format is x-axis: \"%s\"", conv_text(str, xformat));
+    fprintf(stderr, ", y-axis: \"%s\"", conv_text(str, yformat));
+    fprintf(stderr, ", z-axis: \"%s\"", conv_text(str, zformat));
+    fprintf(stderr, ", x2-axis: \"%s\"", conv_text(str, x2format));
+    fprintf(stderr, ", y2-axis: \"%s\"\n", conv_text(str, y2format));
 }
 
 #define SHOW_LOG(FLAG, BASE, TEXT) \
@@ -1526,7 +1527,7 @@
 %s\n\
 %s\tType `help` to access the on-line reference manual\n\
 %s\tThe gnuplot FAQ is available from\n\
-%s\t\t<%s>\n\
+%s\t<%s>\n\
 %s\n\
 %s\tSend comments and requests for help to <%s>\n\
 %s\tSend bugs, suggestions and mods to <%s>\n\
@@ -1590,10 +1591,10 @@
 	    "-READLINE  "
 #endif
 	    ,gnu_rdline =
-#ifdef GNU_READLINE
-	    "+GNU_READLINE  "
+#ifdef HAVE_LIBREADLINE
+	    "+LIBREADLINE  "
 #else
-	    "-GNU_READLINE  "
+	    "-LIBREADLINE  "
 #endif
 	    ,libgd =
 #ifdef HAVE_LIBGD
diff -urN gnuplot-3.7/specfun.c gnuplot-3.7.1/specfun.c
--- gnuplot-3.7/specfun.c	Thu Dec 10 18:30:35 1998
+++ gnuplot-3.7.1/specfun.c	Thu Dec 10 18:30:35 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: specfun.c,v 1.21 1998/04/14 00:16:20 drd Exp $";
+static char *RCSid = "$Id: specfun.c,v 1.8 1998/12/10 18:30:35 lhecking Exp $";
 #endif
 
 
diff -urN gnuplot-3.7/standard.c gnuplot-3.7.1/standard.c
--- gnuplot-3.7/standard.c	Mon Dec  7 22:09:07 1998
+++ gnuplot-3.7.1/standard.c	Mon Dec  7 22:09:07 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: standard.c,v 1.24 1998/04/14 00:16:21 drd Exp $";
+static char *RCSid = "$Id: standard.c,v 1.5 1998/12/07 22:09:07 lhecking Exp $";
 #endif
 
 /* GNUPLOT - standard.c */
diff -urN gnuplot-3.7/stdfn.c gnuplot-3.7.1/stdfn.c
--- gnuplot-3.7/stdfn.c	Fri Nov 20 12:17:18 1998
+++ gnuplot-3.7.1/stdfn.c	Fri Nov 20 12:17:18 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: stdfn.c,v 1.1 1998/05/19 18:05:02 ddenholm Exp $";
+static char *RCSid = "$Id: stdfn.c,v 1.7 1998/11/20 12:17:18 lhecking Exp $";
 #endif
 
 
diff -urN gnuplot-3.7/stdfn.h gnuplot-3.7.1/stdfn.h
--- gnuplot-3.7/stdfn.h	Thu Dec  3 22:22:14 1998
+++ gnuplot-3.7.1/stdfn.h	Fri Oct 15 17:04:51 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: stdfn.h,v 1.23 1998/06/18 14:55:18 ddenholm Exp $
+ * $Id: stdfn.h,v 1.17.2.1 1999/10/15 16:04:51 lhecking Exp $
  *
  */
 
@@ -255,25 +255,13 @@
 #endif
 
 /* Argument types for select() */
-#ifdef SELECT_TYPE_ARG1
-# define gp_nfds_t SELECT_TYPE_ARG1
-#else
-# define gp_nfds_t int
-#endif /* 1 */
-#ifdef SELECT_TYPE_ARG234
-# define gp_fd_set_p SELECT_TYPE_ARG234
-#else
-# ifndef __EMX__
-#  define gp_fd_set_p (int *)
-# else
-#  define gp_fd_set_p (fd_set *)
-# endif
-#endif /* 234 */
-#ifdef SELECT_TYPE_ARG5
-# define gp_timeval_p SELECT_TYPE_ARG5
-#else
-# define gp_timeval_p (struct timeval *)
-#endif /* 5 */
+/* These may need some work ... */
+#ifndef fd_set_size_t
+# define fd_set_size_t size_t
+#endif
+#ifndef SELECT_FD_SET_CAST
+# define SELECT_FD_SET_CAST
+#endif
 
 #ifndef GP_GETCWD
 # if defined(HAVE_GETCWD)
diff -urN gnuplot-3.7/strftime.c gnuplot-3.7.1/strftime.c
--- gnuplot-3.7/strftime.c	Mon Dec  7 22:08:49 1998
+++ gnuplot-3.7.1/strftime.c	Mon Dec  7 22:08:49 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid="$Id: strftime.c,v 1.6 1998/04/14 00:16:24 drd Exp $";
+static char *RCSid="$Id: strftime.c,v 1.6 1998/12/07 22:08:49 lhecking Exp $";
 #endif
 
 /* GNUPLOT - strftime.c */
diff -urN gnuplot-3.7/syscfg.h gnuplot-3.7.1/syscfg.h
--- gnuplot-3.7/syscfg.h	Thu Dec 17 22:08:50 1998
+++ gnuplot-3.7.1/syscfg.h	Sat Oct 16 16:09:54 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: syscfg.h,v 1.9.2.3 1999/10/16 15:09:54 lhecking Exp $
  *
  */
 
@@ -47,13 +47,12 @@
 #endif
 
 #include "ansichek.h"
-#include "stdfn.h"
 
 /*
  * Define operating system dependent constants [default value]:
  *
  * OS:       [" "] Name of OS plus trailing space
- * HELPFILE: ["docs/gnuplot.gih"] Location of helpfile - overriden by Makefile
+ * HELPFILE: ["docs/gnuplot.gih"] Location of helpfile - overridden by Makefile
  * HOME:     ["HOME"] Name of environment variable which points to
  *           the directory where gnuplot's config file is found.
  * PLOTRC:   [".gnuplot"] Name of the gnuplot startup file.
@@ -84,11 +83,11 @@
 #endif /* Amiga */
 
 #ifdef ATARI
-# define OS "TOS "
-# define HOME  "GNUPLOT"
-# define PLOTRC "gnuplot.ini"
-# define SHELL "gulam.prg"
-# define DIRSEP1 '\\'
+# define OS      "TOS "
+# define HOME     "GNUPLOT"
+# define PLOTRC   "gnuplot.ini"
+# define SHELL    "gulam.prg"
+# define DIRSEP1  '\\'
 # ifdef MTOS
 #  define DIRSEP2 '/'
 # endif
@@ -99,49 +98,52 @@
 #endif /* Atari */
 
 #ifdef DOS386
-# define OS "DOS 386 "
+# define OS       "DOS 386 "
 # define HELPFILE "gnuplot.gih"
-# define HOME  "GNUPLOT"
-# define PLOTRC "gnuplot.ini"
-# define DIRSEP1 '\\'
+# define HOME     "GNUPLOT"
+# define PLOTRC   "gnuplot.ini"
+# define SHELL    "\\command.com"
+# define DIRSEP1  '\\'
 #endif /* DOS386 */
 
-#ifdef linux
+#if defined(linux) || defined(__linux)
 # define OS "Linux "
 #endif /* Linux */
 
-#if defined(__NeXT__) && !defined(NEXT)
-# define NEXT
+#if defined(__NeXT__) || defined(NEXT)
+# ifndef NEXT
+#  define NEXT
+# endif
 #endif /* NeXT */
 
 #ifdef OS2
-# define OS "OS/2 "
+# define OS       "OS/2 "
 # define HELPFILE "gnuplot.gih"
-# define HOME  "GNUPLOT"
-# define PLOTRC "gnuplot.ini"
-# define SHELL "c:\\os2\\cmd.exe"
-# define DIRSEP1 '\\'
-# define GP_GETCWD(path,len) _getcwd2 (path, len)
+# define HOME     "GNUPLOT"
+# define PLOTRC   "gnuplot.ini"
+# define SHELL    "c:\\os2\\cmd.exe"
+# define DIRSEP1  '\\'
 #endif /* OS/2 */
 
 #ifdef OSK
-# define OS "OS-9 "
+# define OS    "OS-9 "
 # define SHELL "/dd/cmds/shell"
 #endif /* OS-9 */
 
 #if defined(vms) || defined(VMS)
+# define OS "VMS "
 # ifndef VMS
 #  define VMS
 # endif
-# define OS "VMS "
-# define HOME "sys$login:"
+# define HOME   "sys$login:"
 # define PLOTRC "gnuplot.ini"
 # ifdef NO_GIH
    /* for show version long */
 #  define HELPFILE "GNUPLOT$HELP"
 # endif
 # if !defined(VAXCRTL) && !defined(DECCRTL)
-#  error Please /define either VAXCRTL or DECCRTL
+#  define VAXCRTL VAXCRTL_AND_DECCRTL_UNDEFINED
+#  define DECCRTL VAXCRTL_AND_DECCRTL_UNDEFINED
 # endif
 /* avoid some IMPLICITFUNC warnings */
 # ifdef __DECC
@@ -162,13 +164,14 @@
  */
 #  define S_IFIFO  _S_IFIFO
 # else
+#  define OS "MS-Windows "
 #  ifndef WIN16
 #   define WIN16
 #  endif
-#  define OS "MS-Windows "
 # endif /* WIN32 */
-# define HOME  "GNUPLOT"
-# define PLOTRC "gnuplot.ini"
+# define HOME    "GNUPLOT"
+# define PLOTRC  "gnuplot.ini"
+# define SHELL   "\\command.com"
 # define DIRSEP1 '\\'
 #endif /* _WINDOWS */
 
@@ -176,22 +179,25 @@
 # if !defined(DOS32) && !defined(DOS16)
 #  define DOS16
 # endif
+/* should this be here ? */
 # ifdef MTOS
 #  define OS "TOS & MiNT & MULTITOS & Magic - "
 # endif /* MTOS */
+# define OS       "MS-DOS "
 # undef HELPFILE
 # define HELPFILE "gnuplot.gih"
-# define HOME "GNUPLOT"
-# define PLOTRC "gnuplot.ini"
-# define OS "MS-DOS "
-# define DIRSEP1 '\\'
+# define HOME     "GNUPLOT"
+# define PLOTRC   "gnuplot.ini"
+# define SHELL    "\\command.com"
+# define DIRSEP1  '\\'
 # ifdef __DJGPP__
 #  define DIRSEP2 '/'
 # endif
 #endif /* MSDOS */
 
 /* Note: may not catch all IBM AIX compilers or SCO compilers */
-#if defined(__unix__)|| defined(unix) || defined(_AIX) || defined(SCO)
+/* cc on NetBSD doesn't define unix anymore :-/ */
+#if defined(unix)|| defined(__unix) || defined(_AIX) || defined(__NetBSD__) || defined(SCO)
 # ifndef unix
 #  define unix
 # endif
@@ -210,7 +216,7 @@
 
 #ifndef HELPFILE
 # define HELPFILE "docs/gnuplot.gih"
-#endif /* !HELPFILE */
+#endif
 
 #ifndef HOME
 # define HOME "HOME"
@@ -233,7 +239,9 @@
 #endif
 
 #ifndef FAQ_LOCATION
-# define FAQ_LOCATION "http://www.uni-karlsruhe.de/~ig25/gnuplot-faq/"
+/* # define FAQ_LOCATION "http://www.uni-karlsruhe.de/~ig25/gnuplot-faq/" */
+/* #define FAQ_LOCATION "http://www-ihe.etec.uni-karlsruhe.de/mitarbeiter/vonhagen/gnuplot-faq.html" */
+#define FAQ_LOCATION "http://www.ucc.ie/gnuplot/gnuplot-faq.html"
 #endif
 
 #ifndef CONTACT
@@ -305,7 +313,14 @@
 
 
 /* Misc platforms */
-#if defined(apollo) || defined(alliant)
+#ifdef apollo
+# ifndef APOLLO
+#  define APOLLO
+# endif
+# define GPR
+#endif
+
+#if defined(APOLLO) || defined(alliant)
 # define NO_LIMITS_H
 #endif
 
@@ -314,6 +329,11 @@
 # define NO_STRCHR
 #endif
 
+#ifdef unixpc
+# ifndef UNIXPC
+#  define UNIXPC
+# endif
+#endif
 
 /* Autoconf related stuff
  * Transform autoconf defines to gnuplot coding standards
diff -urN gnuplot-3.7/term/aed.trm gnuplot-3.7.1/term/aed.trm
--- gnuplot-3.7/term/aed.trm	Wed Nov 25 21:03:15 1998
+++ gnuplot-3.7.1/term/aed.trm	Wed Nov 25 21:03:15 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: aed.trm,v 1.13 1998/04/14 00:17:27 drd Exp $
+ * $Id: aed.trm,v 1.7 1998/11/25 21:03:15 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/ai.trm gnuplot-3.7.1/term/ai.trm
--- gnuplot-3.7/term/ai.trm	Wed Jan 13 21:49:44 1999
+++ gnuplot-3.7.1/term/ai.trm	Wed Jan 13 21:49:44 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: ai.trm,v 1.18 1998/04/14 00:17:28 drd Exp $
+ * $Id: ai.trm,v 1.9 1999/01/13 21:49:44 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/amiga.trm gnuplot-3.7.1/term/amiga.trm
--- gnuplot-3.7/term/amiga.trm	Thu Dec 17 22:07:52 1998
+++ gnuplot-3.7.1/term/amiga.trm	Thu Dec 17 22:07:52 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga.trm,v 1.18 1998/04/14 00:17:29 drd Exp $
+ * $Id: amiga.trm,v 1.8 1998/12/17 22:07:52 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/apollo.trm gnuplot-3.7.1/term/apollo.trm
--- gnuplot-3.7/term/apollo.trm	Thu Jan 14 19:34:40 1999
+++ gnuplot-3.7.1/term/apollo.trm	Thu Jan 14 19:34:40 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: apollo.trm,v 1.13 1998/04/14 00:17:30 drd Exp $
+ * $Id: apollo.trm,v 1.9 1999/01/14 19:34:40 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/atariaes.trm gnuplot-3.7.1/term/atariaes.trm
--- gnuplot-3.7/term/atariaes.trm	Mon Dec 14 18:38:13 1998
+++ gnuplot-3.7.1/term/atariaes.trm	Mon Dec 14 18:38:13 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: atariaes.trm,v 1.9 1998/06/18 14:59:17 ddenholm Exp $
+ * $Id: atariaes.trm,v 1.9 1998/12/14 18:38:13 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/atarivdi.trm gnuplot-3.7.1/term/atarivdi.trm
--- gnuplot-3.7/term/atarivdi.trm	Mon Dec 14 18:38:17 1998
+++ gnuplot-3.7.1/term/atarivdi.trm	Mon Dec 14 18:38:17 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: atarivdi.trm,v 1.7 1998/06/18 14:59:18 ddenholm Exp $
+ * $Id: atarivdi.trm,v 1.10 1998/12/14 18:38:17 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/be.trm gnuplot-3.7.1/term/be.trm
--- gnuplot-3.7/term/be.trm	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/term/be.trm	Fri Aug 20 13:09:46 1999
@@ -0,0 +1,698 @@
+/*
+ * $Id: be.trm,v 1.6.2.1 1999/08/20 12:09:46 lhecking Exp $
+ *
+ */
+
+/*[
+ * Copyright 1986 - 1993, 1998   Thomas Williams, Colin Kelley
+ *
+ * Permission to use, copy, and distribute this software and its
+ * documentation for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.
+ *
+ * Permission to modify the software is granted, but not the right to
+ * distribute the complete modified source code.  Modifications are to
+ * be distributed as patches to the released version.  Permission to
+ * distribute binaries produced by compiling modified sources is granted,
+ * provided you
+ *   1. distribute the corresponding source modifications from the
+ *    released version in the form of a patch file along with the binaries,
+ *   2. add special version identification to distinguish your version
+ *    in addition to the base release version number,
+ *   3. provide your name and address as the primary contact for the
+ *    support of your modified version, and
+ *   4. retain our contact information in regard to use of the base
+ *    software.
+ * Permission to distribute the released version of the source code along
+ * with corresponding source modifications in the form of a patch file is
+ * granted with same provisions 2 through 4 for binary distributions.
+ *
+ * This software is provided "as is" without express or implied warranty
+ * to the extent permitted by applicable law.
+]*/
+
+/*
+ * This file is included by ../term.c.
+ *
+ * be.trm  --- inboard terminal driver for BE
+ *
+ * AUTHOR
+ *   Xavier Pianet
+ *
+ */
+
+#include "driver.h"
+
+#ifdef TERM_REGISTER
+register_term(be)
+#endif
+
+#ifdef TERM_PROTO
+int BE_args __PROTO((int argc, char *argv[]));
+TERM_PUBLIC void BE_options __PROTO((void));
+TERM_PUBLIC void BE_init __PROTO((void));
+TERM_PUBLIC void BE_graphics __PROTO((void));
+TERM_PUBLIC void BE_text __PROTO((void));
+TERM_PUBLIC void BE_reset __PROTO((void));
+TERM_PUBLIC void BE_move __PROTO((unsigned int x, unsigned int y));
+TERM_PUBLIC void BE_vector __PROTO((unsigned int x, unsigned int y));
+TERM_PUBLIC void BE_linewidth __PROTO((double lw));
+TERM_PUBLIC void BE_pointsize __PROTO((double ps));
+TERM_PUBLIC void BE_linetype __PROTO((int lt));
+TERM_PUBLIC void BE_put_text __PROTO((unsigned int x, unsigned int y, const char str[]));
+TERM_PUBLIC int BE_justify_text __PROTO((enum JUSTIFY mode));
+TERM_PUBLIC void BE_point __PROTO((unsigned int x, unsigned int y, int number));
+TERM_PUBLIC void BE_fillbox __PROTO((int style, unsigned int x, unsigned y, unsigned int width, unsigned int height));
+#define BE_XMAX 4096
+#define BE_YMAX 4096
+
+/* approximations for typical font/screen sizes */
+#define BE_VCHAR (BE_YMAX/25)
+#define BE_HCHAR (BE_XMAX/100)
+#define BE_VTIC (BE_YMAX/100)
+#define BE_HTIC (BE_XMAX/150)
+#endif
+
+
+#ifndef TERM_PROTO_ONLY
+
+#ifdef TERM_BODY
+
+/* non-zero if '-display' found on command line */
+int BE_Display = 0;
+
+static void BE_atexit __PROTO((void));
+
+typedef enum { hasNoArg, hasArg } OptionArg;
+
+static struct beopt {
+    const char *option;	/* Name of option */
+    OptionArg arg;	/* Whether option has argument */
+}  BE_opts[] =
+{
+   { "-mono", hasNoArg }, { "-gray", hasNoArg }, { "-clear", hasNoArg },
+   { "-pointsize", hasArg },
+   { "-iconic", hasNoArg }, { "-rv", hasNoArg },
+   { "-reverse", hasNoArg }, { "+rv", hasNoArg },
+   { "-synchronous", hasNoArg },
+   { "-display", hasArg }, { "-geometry", hasArg }, { "-bg", hasArg },
+   { "-background", hasArg }, { "-bd", hasArg },
+   { "-bordercolor", hasArg }, { "-bw", hasArg },
+   { "-borderwidth", hasArg }, { "-fg", hasArg },
+   { "-foreground", hasArg }, { "-fn", hasArg }, { "-font", hasArg },
+   { "-name", hasArg },
+   { "-title", hasArg },
+//   { "-xnllanguage", hasArg }, { "-xrm", hasArg },
+   { "-raise", hasNoArg }, { "-noraise", hasNoArg },
+   { "-persist", hasNoArg }
+};
+
+#define BE_nopts (sizeof(BE_opts) / sizeof(BE_opts[0]))
+
+static FILE *BE_ipc;
+
+static char **xargv = (char **)NULL;
+static char *optvec[2*BE_nopts+1];
+
+static char BE_command[] = "gnuplot_be";
+
+/*   BE_args - scan gnuplot command line for standard Toolkit options (to be done)
+ * called from plot.c so must not be TERM_PUBLIC (which may be static)
+ */
+
+int
+BE_args(argc, argv)
+int argc;
+char *argv[];
+{
+    int nbe = 0, i = 0, n;
+
+    xargv = (char **) gp_alloc (argc*sizeof(char *), "<xargv>");
+
+    if (!xargv) {
+	fputs ("not enough memory to copy argv - quitting\n", stderr);
+	exit (EXIT_FAILURE);
+    }
+
+    /* We make a copy of the argument vector because
+     * argv is modified later. */
+    memcpy (xargv, argv, argc*sizeof(char *));
+    optvec[i++] = BE_command;
+
+    while (++argv, --argc > 0) {
+	for (n = 0; n < BE_nopts; n++) {
+	    if (strcmp(*argv, BE_opts[n].option) == 0) {
+		optvec[i++] = *xargv;
+		if (strcmp(*argv, "-display") == 0)
+		    BE_Display++;
+		if (BE_opts[n].arg == hasArg) {
+		    if (--argc <= 0)
+			return nbe;
+		    optvec[i++] = *++xargv, ++argv;
+		    nbe++;
+		}
+		nbe++;
+		break;
+	    }
+	}
+	if (n == BE_nopts)
+	    break;
+    }
+    return nbe;
+}
+
+
+static unsigned int BE_plot_number;
+
+TERM_PUBLIC void
+BE_options()
+{
+    if (almost_equals(c_token, "res$et")) {
+	BE_atexit ();	/* tell gnuplot_be to shut down */
+	++c_token;
+    }
+    if (!END_OF_COMMAND) {
+	struct value a;
+	BE_plot_number = (int) real(const_express(&a));
+	/* let gnuplot_be check range */
+    }
+    sprintf(term_options, "%d", BE_plot_number);
+}
+
+/* we do not want to have to duplicate all the code, so we
+ * do most of it with macros.
+ * PRINT0(format), PRINT1(format, p1), PRINT2(format, p1, p2) etc
+ * also  FLUSH0(format), etc, which do an additional flush
+ */
+
+
+/*
+ *   The Be terminal driver uses popen() pipe IPC
+ */
+static void
+BE_atexit ()
+{
+    if (BE_ipc) {
+	fputs("R\n", BE_ipc);
+	fclose(BE_ipc);
+	/* dont wait(), since they might be -persist */
+	BE_ipc = NULL;
+    }
+}
+
+TERM_PUBLIC void
+BE_init()
+{
+    if (!BE_ipc) {
+	/* first time through or after a reset */
+	int fdes[2];
+	pipe(fdes);
+	if (fork() == 0) {
+	    /* child */
+	    close(fdes[1]);
+	    dup2(fdes[0], 0);	/* stdin from pipe */
+	    execvp(BE_command, optvec);
+	    /* if we get here, something went wrong */
+	    perror("exec failed");
+	    exit(1);
+	}
+	/* parent */
+	close(fdes[0]);		/* read end of pipe */
+	BE_ipc = fdopen(fdes[1], "w");
+    } {
+	static int been_here = 0;
+	if (!been_here) {
+	    atexit(BE_atexit);
+	    been_here = 1;
+	}
+    }
+}
+
+TERM_PUBLIC void
+BE_reset()
+{
+    /* leave the pipe alone, until exit or  set term be reset */
+}
+
+#define PRINT0(fmt)		  			fprintf(BE_ipc, fmt)
+#define PRINT1(fmt,p1)	   			fprintf(BE_ipc, fmt,p1)
+#define PRINT2(fmt,p1,p2)			fprintf(BE_ipc, fmt,p1,p2)
+#define PRINT3(fmt,p1,p2,p3) 		fprintf(BE_ipc, fmt,p1,p2,p3)
+#define PRINT4(fmt,p1,p2,p3,p4) 	fprintf(BE_ipc, fmt,p1,p2,p3,p4)
+#define PRINT5(fmt,p1,p2,p3,p4,p5)	fprintf(BE_ipc, fmt,p1,p2,p3,p4,p5)
+
+#define FFLUSH()			 fflush(BE_ipc)
+
+#define BEFORE_GRAPHICS		/* nowt */
+#define AFTER_TEXT		/* nowt */
+
+
+/* common stuff, using macros defined above */
+
+
+TERM_PUBLIC void
+BE_graphics()
+{
+    BEFORE_GRAPHICS;		/* kludge for crippled select */
+    PRINT1("G%d\n", BE_plot_number);	/* for VMS sake, keep as separate prints */
+}
+
+TERM_PUBLIC void
+BE_text()
+{
+    PRINT0("E\n");
+    FFLUSH();
+    AFTER_TEXT;			/* kludge for crippled select */
+}
+
+
+TERM_PUBLIC void
+BE_move(x, y)
+unsigned int x, y;
+{
+    PRINT2("M%04d%04d\n", x, y);
+}
+
+TERM_PUBLIC void
+BE_vector(x, y)
+unsigned int x, y;
+{
+    PRINT2("V%04d%04d\n", x, y);
+}
+
+TERM_PUBLIC void
+BE_pointsize(ps)
+double ps;
+{
+    PRINT2("P7%04d%04d\n",	/* size of point symbols */
+	   (int) (term->h_tic * ps * 0.5), (int) (term->v_tic * ps * 0.5));
+}
+
+TERM_PUBLIC void
+BE_linewidth(lw)
+double lw;
+{
+    PRINT1("W%04d\n", (int) lw);
+}
+
+TERM_PUBLIC void
+BE_linetype(lt)
+int lt;
+{
+    PRINT1("L%04d\n", lt);
+}
+
+TERM_PUBLIC void
+BE_put_text(x, y, str)
+unsigned int x, y;
+const char str[];
+{
+    /* badly outrange labels can overflow into text field */
+    if (x < 10000 && y < 10000) {
+	PRINT3("T%04d%04d%s\n", x, y, str);
+    }
+}
+
+TERM_PUBLIC int
+BE_justify_text(mode)
+enum JUSTIFY mode;
+{
+    PRINT1("J%04d\n", mode);
+    return (TRUE);
+}
+
+TERM_PUBLIC void
+BE_point(x, y, number)
+unsigned int x, y;
+int number;
+{
+    if (number >= 0)
+	number %= POINT_TYPES;
+    number += 1;
+    PRINT3("P%01d%04d%04d\n", number, x, y);
+}
+
+TERM_PUBLIC void
+BE_fillbox(style, x, y, w, h)
+int style;
+unsigned int x, y, w, h;
+{
+    PRINT5("F%04d%04u%04u%04u%04u\n", style, x, y, w, h);
+}
+
+#endif /* TERM_BODY */
+
+#ifdef TERM_TABLE
+
+TERM_TABLE_START(be_driver)
+    "be", "BeOS Window System",
+    BE_XMAX, BE_YMAX, BE_VCHAR, BE_HCHAR,
+    BE_VTIC, BE_HTIC, BE_options, BE_init, BE_reset,
+    BE_text, null_scale, BE_graphics, BE_move, BE_vector,
+    BE_linetype, BE_put_text, null_text_angle,
+    BE_justify_text, BE_point, do_arrow, set_font_null,
+    BE_pointsize, TERM_CAN_MULTIPLOT,
+    BE_text /* suspend can use same routine */ , 0 /* resume */ ,
+    BE_fillbox, BE_linewidth
+TERM_TABLE_END(be_driver)
+
+#undef LAST_TERM
+#define LAST_TERM be_driver
+
+TERM_TABLE_START(BE_driver)
+    "BE", "BE Window System (identical to be)",
+    BE_XMAX, BE_YMAX, BE_VCHAR, BE_HCHAR,
+    BE_VTIC, BE_HTIC, BE_options, BE_init, BE_reset,
+    BE_text, null_scale, BE_graphics, BE_move, BE_vector,
+    BE_linetype, BE_put_text, null_text_angle,
+    BE_justify_text, BE_point, do_arrow, set_font_null,
+    BE_pointsize, TERM_CAN_MULTIPLOT,
+    BE_text /* suspend can use same routine */ , 0 /* resume */ ,
+    BE_fillbox, BE_linewidth
+TERM_TABLE_END(BE_driver)
+
+#undef LAST_TERM
+#define LAST_TERM be_driver
+
+#endif /* TERM_TABLE */
+#endif /* TERM_PROTO_ONLY */
+
+
+#ifdef TERM_HELP
+START_HELP(be)
+"1 be",
+"?commands set terminal be",
+"?set terminal be",
+"?set term be",
+"?terminal be",
+"?term be",
+"?be",
+"?BE",
+" `gnuplot` provides the `be` terminal type for use with X servers.  This",
+" terminal type is set automatically at startup if the `DISPLAY` environment",
+" variable is set, if the `TERM` environment variable is set to `xterm`, or",
+" if the `-display` command line option is used.",
+"",
+" Syntax:",
+"           set terminal be {reset} {<n>}",
+"",
+" Multiple plot windows are supported: `set terminal be <n>` directs the",
+" output to plot window number n.  If n>0, the terminal number will be",
+" appended to the window title and the icon will be labeled `gplt <n>`.",
+" The active window may distinguished by a change in cursor (from default",
+" to crosshair.)",
+"",
+" Plot windows remain open even when the `gnuplot` driver is changed to a",
+" different device.  A plot window can be closed by pressing the letter q",
+" while that window has input focus, or by choosing `close` from a window",
+" manager menu.  All plot windows can be closed by specifying `reset`, which",
+" actually terminates the subprocess which maintains the windows (unless",
+" `-persist` was specified).",
+"",
+" Plot windows will automatically be closed at the end of the session",
+" unless the `-persist` option was given.",
+"",
+" The size or aspect ratio of a plot may be changed by resizing the `gnuplot`",
+" window.",
+"",
+" Linewidths and pointsizes may be changed from within `gnuplot` with",
+" `set linestyle`.",
+"",
+" For terminal type `be`, `gnuplot` accepts (when initialized) the standard",
+" X Toolkit options and resources such as geometry, font, and name from the",
+" command line arguments or a configuration file.  See the X(1) man page",
+" (or its equivalent) for a description of such options.",
+"",
+" A number of other `gnuplot` options are available for the `be` terminal.",
+" These may be specified either as command-line options when `gnuplot` is",
+" invoked or as resources in the configuration file \"/.Xdefaults\".  They are",
+" set upon initialization and cannot be altered during a `gnuplot` session.",
+"2 command-line_options",
+"?commands set terminal be command-line-options",
+"?set terminal be command-line-options",
+"?set term be command-line-options",
+"?be command-line-options",
+"?command-line-options",
+" In addition to the X Toolkit options, the following options may be specified",
+" on the command line when starting `gnuplot` or as resources in your",
+" \".Xdefaults\" file:",
+"@start table - first is interactive cleartext form",
+"  `-clear`   requests that the window be cleared momentarily before a",
+"                         new plot is displayed.",
+"  `-gray`        requests grayscale rendering on grayscale or color displays.",
+"                         (Grayscale displays receive monochrome rendering by default.)",
+"  `-mono`        forces monochrome rendering on color displays.",
+"  `-persist` plot windows survive after main gnuplot program exits",
+"  `-raise`   raise plot window after each plot",
+"  `-noraise` do not raise plot window after each plot",
+"  `-tvtwm`   requests that geometry specifications for position of the",
+"                         window be made relative to the currently displayed portion",
+"                         of the virtual root.",
+"#\\begin{tabular}{|cl|} \\hline",
+"#`-mono`  & forces monochrome rendering on color displays.\\\\",
+"#`-gray`  & requests grayscale rendering on grayscale or color displays.\\\\",
+"#                 & (Grayscale displays receive monochrome rendering by default.) \\\\",
+"#`-clear` & requests that the window be cleared momentarily before a\\\\",
+"#                 & new plot is displayed. \\\\",
+"#`-tvtwm` & requests that geometry specifications for position of the\\\\",
+"#                 & window be made relative to the currently displayed portion\\\\",
+"#                 & of the virtual root. \\\\",
+"#`-raise` & raise plot window after each plot. \\\\",
+"#`-noraise` & do not raise plot window after each plot. \\\\",
+"#`-persist`&plot windows survive after main gnuplot program exits. \\\\",
+"%c l .",
+"%`-mono`@forces monochrome rendering on color displays.",
+"%`-gray`@requests grayscale rendering on grayscale or color displays.",
+"%           @(Grayscale displays receive monochrome rendering by default.)",
+"%`-clear`@requests that the window be cleared momentarily before a",
+"%                @new plot is displayed.",
+"%`-tvtwm`@requests that geometry specifications for position of the",
+"%                @window be made relative to the currently displayed portion",
+"%                @of the virtual root.",
+"%`-raise`@raise plot window after each plot",
+"%`-noraise`@do not raise plot window after each plot",
+"%`-persist`@plot windows survive after main gnuplot program exits",
+"@end table",
+" The options are shown above in their command-line syntax.  When entered as",
+" resources in \".Xdefaults\", they require a different syntax.",
+"",
+" Example:",
+"           gnuplot*gray: on",
+"",
+" `gnuplot` also provides a command line option (`-pointsize <v>`) and a",
+" resource, `gnuplot*pointsize: <v>`, to control the size of points plotted",
+" with the `points` plotting style.  The value `v` is a real number (greater",
+" than 0 and less than or equal to ten) used as a scaling factor for point",
+" sizes.  For example, `-pointsize 2` uses points twice the default size, and",
+" `-pointsize 0.5` uses points half the normal size.",
+"2 monochome_options",
+"?commands set terminal be monochrome_options",
+"?set terminal be monochrome_options",
+"?set term be monochrome_options",
+"?be monochrome_options",
+"?monochrome_options",
+" For monochrome displays, `gnuplot` does not honor foreground or background",
+" colors.  The default is black-on-white.  `-rv` or `gnuplot*reverseVideo: on`",
+" requests white-on-black.",
+"",
+"2 color_resources",
+"?commands set terminal be color_resources",
+"?set terminal be color_resources",
+"?set term be color_resources",
+"?be color_resources",
+"?color_resources",
+" For color displays, `gnuplot` honors the following resources (shown here",
+" with their default values) or the greyscale resources.  The values may be",
+" color names as listed in the BE rgb.txt file on your system, hexadecimal",
+" RGB color specifications (see BE documentation), or a color name followed",
+" by a comma and an `intensity` value from 0 to 1.  For example, `blue, 0.5`",
+" means a half intensity blue.",
+"@start table - first is interactive cleartext form",
+"  gnuplot*background:  white",
+"  gnuplot*textColor:   black",
+"  gnuplot*borderColor: black",
+"  gnuplot*axisColor:   black",
+"  gnuplot*line1Color:  red",
+"  gnuplot*line2Color:  green",
+"  gnuplot*line3Color:  blue",
+"  gnuplot*line4Color:  magenta",
+"  gnuplot*line5Color:  cyan",
+"  gnuplot*line6Color:  sienna",
+"  gnuplot*line7Color:  orange",
+"  gnuplot*line8Color:  coral",
+"#\\begin{tabular}{|cl|} \\hline",
+"#&gnuplot*background: white\\\\",
+"#&gnuplot*textColor: black\\\\",
+"#&gnuplot*borderColor: black\\\\",
+"#&gnuplot*axisColor: black\\\\",
+"#&gnuplot*line1Color: red\\\\",
+"#&gnuplot*line2Color: green\\\\",
+"#&gnuplot*line3Color: blue\\\\",
+"#&gnuplot*line4Color: magenta\\\\",
+"#&gnuplot*line5Color: cyan\\\\",
+"#&gnuplot*line6Color: sienna\\\\",
+"#&gnuplot*line7Color: orange\\\\",
+"#&gnuplot*line8Color: coral\\\\",
+"%c l .",
+"%@gnuplot*background: white",
+"%@gnuplot*textColor: black",
+"%@gnuplot*borderColor: black",
+"%@gnuplot*axisColor: black",
+"%@gnuplot*line1Color: red",
+"%@gnuplot*line2Color: green",
+"%@gnuplot*line3Color: blue",
+"%@gnuplot*line4Color: magenta",
+"%@gnuplot*line5Color: cyan",
+"%@gnuplot*line6Color: sienna",
+"%@gnuplot*line7Color: orange",
+"%@gnuplot*line8Color: coral",
+"@end table",
+"",
+" The command-line syntax for these is, for example,",
+"",
+" Example:",
+"           gnuplot -background coral",
+"",
+"2 grayscale_resources",
+"?commands set terminal be grayscale_resources",
+"?set terminal be grayscale_resources",
+"?set term be grayscale_resources",
+"?be grayscale_resources",
+"?grayscale_resources",
+" When `-gray` is selected, `gnuplot` honors the following resources for",
+" grayscale or color displays (shown here with their default values).  Note",
+" that the default background is black.",
+"@start table - first is interactive cleartext form",
+"  gnuplot*background: black",
+"  gnuplot*textGray:   white",
+"  gnuplot*borderGray: gray50",
+"  gnuplot*axisGray:   gray50",
+"  gnuplot*line1Gray:  gray100",
+"  gnuplot*line2Gray:  gray60",
+"  gnuplot*line3Gray:  gray80",
+"  gnuplot*line4Gray:  gray40",
+"  gnuplot*line5Gray:  gray90",
+"  gnuplot*line6Gray:  gray50",
+"  gnuplot*line7Gray:  gray70",
+"  gnuplot*line8Gray:  gray30",
+"#\\begin{tabular}{|cl|} \\hline",
+"#&gnuplot*background: black\\\\",
+"#&gnuplot*textGray: white\\\\",
+"#&gnuplot*borderGray: gray50\\\\",
+"#&gnuplot*axisGray: gray50\\\\",
+"#&gnuplot*line1Gray: gray100\\\\",
+"#&gnuplot*line2Gray: gray60\\\\",
+"#&gnuplot*line3Gray: gray80\\\\",
+"#&gnuplot*line4Gray: gray40\\\\",
+"#&gnuplot*line5Gray: gray90\\\\",
+"#&gnuplot*line6Gray: gray50\\\\",
+"#&gnuplot*line7Gray: gray70\\\\",
+"#&gnuplot*line8Gray: gray30\\\\",
+"%c l .",
+"%@gnuplot*background: black",
+"%@gnuplot*textGray: white",
+"%@gnuplot*borderGray: gray50",
+"%@gnuplot*axisGray: gray50",
+"%@gnuplot*line1Gray: gray100",
+"%@gnuplot*line2Gray: gray60",
+"%@gnuplot*line3Gray: gray80",
+"%@gnuplot*line4Gray: gray40",
+"%@gnuplot*line5Gray: gray90",
+"%@gnuplot*line6Gray: gray50",
+"%@gnuplot*line7Gray: gray70",
+"%@gnuplot*line8Gray: gray30",
+"@end table",
+"",
+"2 line_resources",
+"?commands set terminal be line_resources",
+"?set terminal be line_resources",
+"?set term be line_resources",
+"?be line_resources",
+"?line_resources",
+" `gnuplot` honors the following resources for setting the width (in pixels) of",
+" plot lines (shown here with their default values.)  0 or 1 means a minimal",
+" width line of 1 pixel width.  A value of 2 or 3 may improve the appearance of",
+" some plots.",
+"@start table - first is interactive cleartext form",
+"  gnuplot*borderWidth: 2",
+"  gnuplot*axisWidth:   0",
+"  gnuplot*line1Width:  0",
+"  gnuplot*line2Width:  0",
+"  gnuplot*line3Width:  0",
+"  gnuplot*line4Width:  0",
+"  gnuplot*line5Width:  0",
+"  gnuplot*line6Width:  0",
+"  gnuplot*line7Width:  0",
+"  gnuplot*line8Width:  0",
+"#\\begin{tabular}{|cl|} \\hline",
+"#&gnuplot*borderWidth: 2\\\\",
+"#&gnuplot*axisWidth: 0\\\\",
+"#&gnuplot*line1Width: 0\\\\",
+"#&gnuplot*line2Width: 0\\\\",
+"#&gnuplot*line3Width: 0\\\\",
+"#&gnuplot*line4Width: 0\\\\",
+"#&gnuplot*line5Width: 0\\\\",
+"#&gnuplot*line6Width: 0\\\\",
+"#&gnuplot*line7Width: 0\\\\",
+"#&gnuplot*line8Width: 0\\\\",
+"%c l .",
+"%@gnuplot*borderWidth: 2",
+"%@gnuplot*axisWidth: 0",
+"%@gnuplot*line1Width: 0",
+"%@gnuplot*line2Width: 0",
+"%@gnuplot*line3Width: 0",
+"%@gnuplot*line4Width: 0",
+"%@gnuplot*line5Width: 0",
+"%@gnuplot*line6Width: 0",
+"%@gnuplot*line7Width: 0",
+"%@gnuplot*line8Width: 0",
+"@end table",
+"",
+" `gnuplot` honors the following resources for setting the dash style used for",
+" plotting lines.  0 means a solid line.  A two-digit number `jk` (`j` and `k`",
+" are >= 1  and <= 9) means a dashed line with a repeated pattern of `j` pixels",
+" on followed by `k` pixels off.  For example, '16' is a \"dotted\" line with one",
+" pixel on followed by six pixels off.  More elaborate on/off patterns can be",
+" specified with a four-digit value.  For example, '4441' is four on, four off,",
+" four on, one off.  The default values shown below are for monochrome displays",
+" or monochrome rendering on color or grayscale displays.  For color displays,",
+" the default for each is 0 (solid line) except for `axisDashes` which defaults",
+" to a '16' dotted line.",
+"@start table - first is interactive cleartext form",
+"  gnuplot*borderDashes:   0",
+"  gnuplot*axisDashes:        16",
+"  gnuplot*line1Dashes:        0",
+"  gnuplot*line2Dashes:   42",
+"  gnuplot*line3Dashes:   13",
+"  gnuplot*line4Dashes:   44",
+"  gnuplot*line5Dashes:   15",
+"  gnuplot*line6Dashes: 4441",
+"  gnuplot*line7Dashes:   42",
+"  gnuplot*line8Dashes:   13",
+"#\\begin{tabular}{|cl|} \\hline",
+"#&gnuplot*borderDashes: 0\\\\",
+"#&gnuplot*axisDashes: 16\\\\",
+"#&gnuplot*line1Dashes: 0\\\\",
+"#&gnuplot*line2Dashes: 42\\\\",
+"#&gnuplot*line3Dashes: 13\\\\",
+"#&gnuplot*line4Dashes: 44\\\\",
+"#&gnuplot*line5Dashes: 15\\\\",
+"#&gnuplot*line6Dashes: 4441\\\\",
+"#&gnuplot*line7Dashes: 42\\\\",
+"#&gnuplot*line8Dashes: 13\\\\",
+"%c l .",
+"%@gnuplot*borderDashes: 0",
+"%@gnuplot*axisDashes: 16",
+"%@gnuplot*line1Dashes: 0",
+"%@gnuplot*line2Dashes: 42",
+"%@gnuplot*line3Dashes: 13",
+"%@gnuplot*line4Dashes: 44",
+"%@gnuplot*line5Dashes: 15",
+"%@gnuplot*line6Dashes: 4441",
+"%@gnuplot*line7Dashes: 42",
+"%@gnuplot*line8Dashes: 13",
+"@end table"
+END_HELP(be)
+#endif /* TERM_HELP */
diff -urN gnuplot-3.7/term/cgi.trm gnuplot-3.7.1/term/cgi.trm
--- gnuplot-3.7/term/cgi.trm	Wed Nov 25 21:03:25 1998
+++ gnuplot-3.7.1/term/cgi.trm	Wed Nov 25 21:03:25 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: cgi.trm,v 1.12 1998/04/14 00:17:32 drd Exp $
+ * $Id: cgi.trm,v 1.7 1998/11/25 21:03:25 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/cgm.trm gnuplot-3.7.1/term/cgm.trm
--- gnuplot-3.7/term/cgm.trm	Mon Dec 14 18:38:22 1998
+++ gnuplot-3.7.1/term/cgm.trm	Thu Aug 19 15:18:43 1999
@@ -1,5 +1,5 @@
 /* Hey Emacs this is -*- C -*-
- * $Id: cgm.trm,v 1.16 1998/06/18 14:59:18 ddenholm Exp $
+ * $Id: cgm.trm,v 1.16.2.1 1999/08/19 14:18:43 lhecking Exp $
  */
 
 /* GNUPLOT - cgm.trm */
@@ -184,6 +184,8 @@
 static void CGM_write_mixed_record __PROTO((int class, int cgm_id,
 					    int numint, int *int_data,
 					    int numchar, char *char_data));
+static void CGM_write_byte_record __PROTO((int class, int cgm_id, int length,
+					   char *data));
 
 
 
@@ -216,7 +218,8 @@
     };
 */
     {
-	CGM_COLORS,
+/*	CGM_COLORS,	*/
+	0, 255, 255, 255,
 	0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 255, 255, 255, 0, 255, 0, 255, 0, 255, 255
 /*    black    red     green    blue      yellow    magenta     cyan  */
     };
@@ -226,7 +229,7 @@
     static int marker_size_specification_mode_data[] = { 0 };
     static int vdc_extent_data[] = { 0, 0, 0, 0 };
     static int vdc_integer_precision_data[] = { 16 };
-    static int transparency_data[] = { 0 }; /* text background: 1=transparent */
+    static int transparency_data[] = { 1 }; /* text background: 1=transparent */
     static int clip_indicator_data[] = { 0 };
 /*  static int line_color_data[] = { 1 }; */
     static int line_type_data[] = { 1 };
@@ -306,7 +309,7 @@
     CGM_write_int_record(1, 11, sizeof(elements_list_data) / CGM_ADJ,
 			 elements_list_data);
     if (cgm_winword6_mode == FALSE)
-	CGM_write_char_record(1, 13, strlen(cgm_font_data), cgm_font_data);
+	CGM_write_byte_record(1, 13, strlen(cgm_font_data), cgm_font_data);
 
     /* picture description (classes 2 and 3) */
     CGM_write_char_record(0, 3, 8, "PICTURE1");
@@ -440,7 +443,7 @@
 {
     int new_linewidth;
 
-    assert(width >= 1.);
+    assert(width >= 0);
     new_linewidth = width * cgm_linewidth_pt * CGM_PT;
     if (new_linewidth == cgm_linewidth)
 	return;
@@ -521,25 +524,49 @@
 int class, cgm_id, numbytes;
 char *data;
 {
-    int pad, padded_length;
+    int i, pad, length;
     static unsigned char flag = 0xff;
+    static unsigned char paddata = 0;
     char short_len;
 
     pad = 0;
-    padded_length = numbytes + 1;
+    length = numbytes + 1;
     if (numbytes >= 255)
-	padded_length += 2;	/* long string */
-    if (padded_length & 1)
-	padded_length += pad = 1;	/* needs pad */
-    CGM_write_code(class, cgm_id, padded_length);
-    short_len = numbytes;
+	length += 2;	/* long string */
+    if (length & 1)
+	pad = 1;	/* needs pad */
+    CGM_write_code(class, cgm_id, length);
     if (numbytes < 255)
+    {
+        short_len = (char)numbytes;
 	fwrite(&short_len, 1, 1, gpoutfile);	/* write true length */
-    else {
-	fwrite(&flag, 1, 1, gpoutfile);
+    } else {
+        fwrite(&flag, 1, 1, gpoutfile);
 	CGM_write_int(numbytes);
     }
-    fwrite(data, 1, numbytes + pad, gpoutfile);		/* write string */
+
+    if (data)
+        fwrite(data, 1, numbytes, gpoutfile);          /* write string */
+    else
+	for (i=0; i<numbytes+pad; i++)
+	    fputc('\0', gpoutfile);                     /* write null bytes */
+
+    if(pad)
+      fwrite(&paddata, 1, 1, gpoutfile);
+}
+
+static void CGM_write_byte_record(class, cgm_id, numbytes, data)
+int class, cgm_id, numbytes;
+char *data;
+{
+    int pad;
+    static unsigned char paddata = 0;
+
+    pad = numbytes & 1;
+    CGM_write_code(class, cgm_id, numbytes);
+    fwrite(data, 1, numbytes, gpoutfile);		/* write string */
+    if(pad)
+      fwrite(&paddata, 1, 1, gpoutfile);
 }
 
 static void CGM_write_int_record(class, cgm_id, numbytes, data)
@@ -558,30 +585,33 @@
 int class, cgm_id, numint, *int_data, numchar;
 char *char_data;
 {
-    int i, pad, padded_length;
+    int i, pad, length;
+    static unsigned char paddata = 0;
     static unsigned char flag = 0xff;
     char short_len;
 
     pad = 0;
-    padded_length = numchar + 1;
+    length = numchar + 1;
     if (numchar >= 255)
-	padded_length += 2;	/* long string */
-    if (padded_length & 1)
-	padded_length += pad = 1;	/* needs pad */
+	length += 2;	/* long string */
+    if (length & 1)
+	pad = 1;	/* needs pad */
 
-    CGM_write_code(class, cgm_id, numint * 2 + padded_length);
+    CGM_write_code(class, cgm_id, numint * 2 + length);
 
     for (i = 0; i < numint; i++)
 	CGM_write_int(int_data[i]);	/* write integers */
 
-    short_len = numchar;
-    if (numchar < 255)
+    if (numchar < 255) {
+        short_len = (char)numchar;
 	fwrite(&short_len, 1, 1, gpoutfile);	/* write string length */
-    else {
+    } else {
 	fwrite(&flag, 1, 1, gpoutfile);
 	CGM_write_int(numchar);
     }
-    fwrite(char_data, 1, numchar + pad, gpoutfile);	/* write string */
+    fwrite(char_data, 1, numchar, gpoutfile);	/* write string */
+    if(pad)
+      fwrite(&paddata, 1, 1, gpoutfile);
 }
 
 /*
diff -urN gnuplot-3.7/term/compact.c gnuplot-3.7.1/term/compact.c
--- gnuplot-3.7/term/compact.c	Wed Nov 25 21:05:04 1998
+++ gnuplot-3.7.1/term/compact.c	Wed Nov 25 21:05:04 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: compact.c,v 1.2 1998/11/25 21:05:04 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/corel.trm gnuplot-3.7.1/term/corel.trm
--- gnuplot-3.7/term/corel.trm	Mon Dec 14 18:38:27 1998
+++ gnuplot-3.7.1/term/corel.trm	Mon Dec 14 18:38:27 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: corel.trm,v 1.12 1998/04/14 00:17:35 drd Exp $
+ * $Id: corel.trm,v 1.8 1998/12/14 18:38:27 lhecking Exp $
  */
 
 /*
diff -urN gnuplot-3.7/term/debug.trm gnuplot-3.7.1/term/debug.trm
--- gnuplot-3.7/term/debug.trm	Thu Nov 26 19:04:03 1998
+++ gnuplot-3.7.1/term/debug.trm	Thu Nov 26 19:04:03 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: debug.trm,v 1.11 1998/04/14 00:17:35 drd Exp $
+ * $Id: debug.trm,v 1.7 1998/11/26 19:04:03 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/djsvga.trm gnuplot-3.7.1/term/djsvga.trm
--- gnuplot-3.7/term/djsvga.trm	Mon Dec 21 22:23:31 1998
+++ gnuplot-3.7.1/term/djsvga.trm	Mon Dec 21 22:23:31 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: djsvga.trm,v 1.17 1998/04/14 00:17:36 drd Exp $
+ * $Id: djsvga.trm,v 1.10 1998/12/21 22:23:31 lhecking Exp $
  */
 
 /* GNUPLOT - djsvga.trm */
diff -urN gnuplot-3.7/term/driver.h gnuplot-3.7.1/term/driver.h
--- gnuplot-3.7/term/driver.h	Wed Nov 25 21:05:34 1998
+++ gnuplot-3.7.1/term/driver.h	Wed Sep 29 14:50:04 1999
@@ -1,6 +1,6 @@
-/* $Id: driver.h,v 1.9 1998/06/18 14:59:19 ddenholm Exp $ */
+/* $Id: driver.h,v 1.8.2.1 1999/09/29 13:50:04 lhecking Exp $ */
 
-/* GNUPLOT - driver.h  $Id: driver.h,v 1.9 1998/06/18 14:59:19 ddenholm Exp $ */
+/* GNUPLOT - driver.h  $Id: driver.h,v 1.8.2.1 1999/09/29 13:50:04 lhecking Exp $ */
 
 /*[
  * Copyright 1986 - 1993, 1998   Thomas Williams, Colin Kelley
@@ -42,7 +42,7 @@
 #define fputc putc
 #endif
 
-/* functions provided by in term.c */
+/* functions provided by term.c */
 
 void do_point __PROTO((unsigned int x, unsigned int y, int number));
 void line_and_point __PROTO((unsigned int x, unsigned int y, int number));
diff -urN gnuplot-3.7/term/dumb.trm gnuplot-3.7.1/term/dumb.trm
--- gnuplot-3.7/term/dumb.trm	Mon Dec 14 18:38:38 1998
+++ gnuplot-3.7.1/term/dumb.trm	Mon Dec 14 18:38:38 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: dumb.trm,v 1.24 1998/04/14 00:17:37 drd Exp $
+ * $Id: dumb.trm,v 1.6 1998/12/14 18:38:38 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/dxf.trm gnuplot-3.7.1/term/dxf.trm
--- gnuplot-3.7/term/dxf.trm	Mon Dec 14 18:38:43 1998
+++ gnuplot-3.7.1/term/dxf.trm	Mon Dec 14 18:38:43 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: dxf.trm,v 1.15 1998/04/14 00:17:37 drd Exp $
+ * $Id: dxf.trm,v 1.7 1998/12/14 18:38:43 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/dxy.trm gnuplot-3.7.1/term/dxy.trm
--- gnuplot-3.7/term/dxy.trm	Wed Nov 25 21:05:49 1998
+++ gnuplot-3.7.1/term/dxy.trm	Wed Nov 25 21:05:49 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: dxy.trm,v 1.13 1998/04/14 00:17:38 drd Exp $
+ * $Id: dxy.trm,v 1.6 1998/11/25 21:05:49 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/eepic.trm gnuplot-3.7.1/term/eepic.trm
--- gnuplot-3.7/term/eepic.trm	Mon Dec 14 18:38:47 1998
+++ gnuplot-3.7.1/term/eepic.trm	Mon Dec 14 18:38:47 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: eepic.trm,v 1.18 1998/04/14 00:17:39 drd Exp $
+ * $Id: eepic.trm,v 1.8 1998/12/14 18:38:47 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/emxvga.trm gnuplot-3.7.1/term/emxvga.trm
--- gnuplot-3.7/term/emxvga.trm	Mon Dec 14 18:38:51 1998
+++ gnuplot-3.7.1/term/emxvga.trm	Mon Dec 14 18:38:51 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: emxvga.trm,v 1.16 1998/04/14 00:17:40 drd Exp $
+ * $Id: emxvga.trm,v 1.6 1998/12/14 18:38:51 lhecking Exp $
  */
 
 /* GNUPLOT - emxvga.trm */
diff -urN gnuplot-3.7/term/epson.trm gnuplot-3.7.1/term/epson.trm
--- gnuplot-3.7/term/epson.trm	Mon Dec 14 18:38:55 1998
+++ gnuplot-3.7.1/term/epson.trm	Mon Dec 14 18:38:55 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: epson.trm,v 1.19 1998/04/14 00:17:41 drd Exp $
+ * $Id: epson.trm,v 1.8 1998/12/14 18:38:55 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/excl.trm gnuplot-3.7.1/term/excl.trm
--- gnuplot-3.7/term/excl.trm	Mon Dec 14 18:38:59 1998
+++ gnuplot-3.7.1/term/excl.trm	Mon Dec 14 18:38:59 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: excl.trm,v 1.9 1998/04/14 00:17:41 drd Exp $
+ * $Id: excl.trm,v 1.9 1998/12/14 18:38:59 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/fg.trm gnuplot-3.7.1/term/fg.trm
--- gnuplot-3.7/term/fg.trm	Mon Dec 14 18:39:04 1998
+++ gnuplot-3.7.1/term/fg.trm	Mon Dec 14 18:39:04 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: fg.trm,v 1.5 1998/12/14 18:39:04 lhecking Exp $
  */
 
 /* GNUPLOT - fg.trm */
diff -urN gnuplot-3.7/term/fig.trm gnuplot-3.7.1/term/fig.trm
--- gnuplot-3.7/term/fig.trm	Mon Dec 14 18:39:08 1998
+++ gnuplot-3.7.1/term/fig.trm	Sun Aug 22 19:52:28 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: fig.trm,v 1.57 1998/06/18 14:59:20 ddenholm Exp $
+ * $Id: fig.trm,v 1.10.2.1 1999/08/22 18:52:28 lhecking Exp $
  */
 
 /* GNUPLOT - fig.trm */
@@ -620,7 +620,7 @@
     y -= term->v_char / 2;	/* assuming vertical center justified */
 
     fprintf(gpoutfile, "%d %d %d %d %d %d %6.3f %6.3f %d %6.3f %6.3f %d %d %s\\001\n",
-	    O_TEXT, FIG_justify, FIG_color, 0, FIG_DEFAULT,
+	    OBJ_TEXT, FIG_justify, FIG_color, 0, FIG_DEFAULT,
 	    FIG_ROMAN_FONT, (float) FIG_font_s,
 	    FIG_angle, SPECIAL_TEXT, (float) term->v_char,
 	    (float) term->h_char * strlen(str),
diff -urN gnuplot-3.7/term/gif.trm gnuplot-3.7.1/term/gif.trm
--- gnuplot-3.7/term/gif.trm	Wed Dec 16 19:48:03 1998
+++ gnuplot-3.7.1/term/gif.trm	Wed Sep 29 14:53:53 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: gif.trm,v 1.12.2.3 1999/09/29 13:53:53 lhecking Exp $
  */
 
 /* GNUPLOT -- gif.trm */
@@ -53,7 +53,7 @@
  *
  * size (in pixels)
  *
- * font (small,medium,large)
+ * font (tiny,small,medium,large,giant)
  *
  * xrrggbb - sets the next color.  x is the literal character 'x',
  * rrggbb are the red green and blue components in hex.  For example
@@ -69,7 +69,8 @@
  *  Alex Woo <woo@playfair.stanford.edu>
  *
  * CONTRIBUTORS
- *  Alfred Reibenschuh <alfred.reibenschuh@cait.co.at> or <fredo@blackbox.at>
+ *  Alfred Reibenschuh <alfred.reibenschuh@it-austria.com> or <fredo@blackbox.at>
+ *  Ben Laurie <ben@algroup.co.uk>
  *
  * send your comments or suggestions to:
  *  info-gnuplot@cs.dartmouth.edu
@@ -83,8 +84,9 @@
  *
  * find out about gd from http://www.boutell.com/gd/
  *
- * [Update: as of version 1.3, gd does not use any more UNISYS licensed
- *  code. The gnuplot team may decide to include this version some day.]
+ * Gd library versions before 1.3, and gd library 1.5 are subject to
+ * the Unisys license. Use at your own risk. From version 1.6 on, gd
+ * library creates png files instead of gif.
  *
  */
 
@@ -107,17 +109,20 @@
 TERM_PUBLIC void GIF_reset __PROTO((void));
 
 #include "gd.h"
+
 extern gdFontPtr gdFontSmall;	/* 6x12 */
 extern gdFontPtr gdFontLarge;	/* 8x16 */
 extern gdFontPtr gdFontMediumBold;	/* 7x13 */
+extern gdFontPtr gdFontGiant;  /* 9x15 */
+extern gdFontPtr gdFontTiny;  /* 5x8 */
 
 
 #define GREG_XMAX 640
 #define GREG_YMAX 480
 
 
-int GIF_XMAX = GREG_XMAX;
-int GIF_YMAX = GREG_YMAX;
+static int GIF_XMAX = GREG_XMAX;
+static int GIF_YMAX = GREG_YMAX;
 
 
 #define GIF_FONT_SMALL 1
@@ -161,111 +166,6 @@
 #define GIF_USE_TRANSPARENT 1
 #define GIF_USE_INTERLACE   2
 
-static unsigned int gif_color_rgbs[] =
-{
-    0xffffff,			/* background: white         */
-    0x000000,			/*    borders: black         */
-    0x404040,			/* x & y axes: grey          */
-    0xff0000,			/*   color 01: red           */
-    0x00c000,			/*   color 02: dark green    */
-    0x0080ff,			/*   color 03: dark blue     */
-    0xc000ff,			/*   color 04: dark magenta  */
-    0xc0ff40,			/*   color 05: yellow        */
-    0xc04000,			/*   color 06: orange        */
-    0x40ff80,			/*   color 07: sea green     */
-    0x2020c0,			/*   color 08: royal blue    */
-    0x8000c0,			/*   color 09: dark violet   */
-    /* please note: these colors are optimized for web216 compatibility */
-    0x006080,			/* DeepSkyBlue4 */
-    0x008000,			/* green4 */
-    0x008040,			/* SpringGreen4 */
-    0x008080,			/* dark cyan, turquoise4 */
-    0x00c060,			/* SpringGreen3 */
-    0x00c0c0,			/* cyan3, turquoise3 */
-    0x00ff00,			/* green */
-    0x208020,			/* forest green */
-    0x306080,			/* SteelBlue4 */
-    0x404040,			/* grey25-31 */
-    0x408000,			/* chartreuse4 */
-    0x000080,			/* dark blue, navy blue */
-    0x806000,			/* DarkGoldenrod4 */
-    0x806010,			/* goldenrod4 */
-    0x806060,			/* pink4 */
-    0x806080,			/* plum4 */
-    0x0000c0,			/* medium blue */
-    0x0000ff,			/* blue */
-    0x006000,			/* dark green */
-    0x40c080,			/* SeaGreen3 */
-    0x60a0c0,			/* SkyBlue3 */
-    0x60c000,			/* chartreuse3 */
-    0x60c0a0,			/* medium aquamarine */
-    0x800000,			/* dark red */
-    0x800080,			/* dark magenta */
-    0x602080,			/* DarkOrchid4 */
-    0x606060,			/* dim grey */
-    0x00ffff,			/* cyan1, turquoise1 */
-    0x202020,			/* grey13-18 */
-    0x204040,			/* dark slate grey */
-    0x204080,			/* RoyalBlue4 */
-    0x608020,			/* olive drab */
-    0x608060,			/* DarkSeaGreen4 */
-    0x608080,			/* LightBlue4, PaleTurquoise4 */
-    0x808040,			/* LightGoldenrod4, khaki4 */
-    0x808080,			/* grey51-56 */
-    0xa0a0a0,			/* dark grey, grey63-68 */
-    0xa0d0e0,			/* light blue */
-    0xc02020,			/* firebrick3 */
-    0xc06000,			/* DarkOrange3 */
-    0x80c0e0,			/* sky blue */
-    0xc060c0,			/* orchid3 */
-    0xc08000,			/* orange3 */
-    0xc08060,			/* LightSalmon3 */
-    0xff4000,			/* orange red */
-    0xff4040,			/* brown1, tomato */
-    0x80c0ff,			/* light sky blue */
-    0xff8060,			/* salmon */
-    0xff8080,			/* light coral */
-    0xc0a000,			/* gold3 */
-    0xc0c0c0,			/* grey76-81, honeydew3, ivory3, snow3 */
-    0xc0ffc0,			/* DarkSeaGreen1 */
-    0xff0000,			/* red */
-    0xff00ff,			/* magenta */
-    0xff80a0,			/* PaleVioletRed1 */
-    0xff80ff,			/* orchid1 */
-    0xc0c0a0,			/* LemonChiffon3 */
-    0xff6060,			/* IndianRed1 */
-    0xff8000,			/* dark orange */
-    0xffa000,			/* orange */
-    0x80e0e0,			/* CadetBlue2, DarkSlateGray2 */
-    0xa0e0e0,			/* pale turquoise */
-    0xa0ff20,			/* green yellow */
-    0xc00000,			/* red3 */
-    0xc000c0,			/* magenta3 */
-    0xa02020,			/* brown */
-    0xa020ff,			/* purple */
-    0x802000,			/* OrangeRed4 */
-    0x802020,			/* brown4 */
-    0x804000,			/* DarkOrange4 */
-    0x804020,			/* sienna4 */
-    0x804080,			/* orchid4 */
-    0x8060c0,			/* MediumPurple3 */
-    0x8060ff,			/* SlateBlue1 */
-    0x808000,			/* yellow4 */
-    0xa080ff,			/* MediumPurple1 */
-    0xc06080,			/* PaleVioletRed3 */
-    0xc0c000,			/* yellow3 */
-    0xff8040,			/* sienna1 */
-    0xffa040,			/* tan1 */
-    0xffa060,			/* sandy brown */
-    0xffa070,			/* light salmon */
-    0xffc020,			/* goldenrod1 */
-    0xffc0c0,			/* RosyBrown1, pink */
-    0xffff00,			/* yellow */
-    0xffff80,			/* khaki1 */
-    0xffffc0			/* lemon chiffon */
-};
-#define GIF_N_DEFAULT_COLORS (sizeof(gif_color_rgbs)/sizeof(gif_color_rgbs[0]))
-
 /*
  * _options()  Called when terminal type is selected.  
  * This procedure should parse options on the command line.  A list of the 
@@ -273,9 +173,14 @@
  * suitable for use with the set term command.  term_options[] is used by 
  * the save command.  Use options_null() if no options are available. 
  */
-TERM_PUBLIC void GIF_options()
+TERM_PUBLIC void
+GIF_options()
 {
+    struct value s;
     int gif_font, i;
+    char *string;
+    unsigned long color;
+    
     term_options[0] = NUL;
     gif_state.n_colors = 0;
     gif_state.flags = 0;
@@ -289,6 +194,12 @@
 	} else if (almost_equals(c_token, "i$nterlace")) {
 	    gif_state.flags |= GIF_USE_INTERLACE;
 	    ++c_token;
+	} else if (almost_equals(c_token, "ti$ny")) {
+	    GIF_font=gdFontTiny;
+	    gif_font = 0;
+	    term->v_char = (unsigned int)(8);
+	    term->h_char = (unsigned int)(5);
+	    ++c_token;
 	} else if (almost_equals(c_token, "s$mall")) {
 	    GIF_font = gdFontSmall;
 	    gif_font = 1;
@@ -307,8 +218,13 @@
 	    term->v_char = (unsigned int) (16);
 	    term->h_char = (unsigned int) (8);
 	    ++c_token;
+	} else if (almost_equals(c_token, "l$arge")) {
+	    GIF_font=gdFontGiant;
+	    gif_font = 4;
+	    term->v_char = (unsigned int)(15);
+	    term->h_char = (unsigned int)(9);
+	    ++c_token;
 	} else if (almost_equals(c_token, "si$ze")) {
-	    struct value s;
 	    c_token++;
 	    if (END_OF_COMMAND) {
 		GIF_XMAX = GREG_XMAX;
@@ -326,13 +242,12 @@
 		    term->xmax = GIF_XMAX;
 		}
 	    }
-	} else {		/* not "size" */
-	    char *string = input_line + token[c_token].start_index;
-	    unsigned long color;
+	} else {                /* not "size" */
+	    string = input_line + token[c_token].start_index;
 	    if (sscanf(string, "x%lx", &color) != 1) {
-		int_error("invalid color spec, must be xRRGGBB", c_token);
+		int_error("invalid color spec, must be xRRGGBB",c_token);
 	    } else if (gif_state.n_colors == GIF_MAX_COLORS) {
-		int_warn("too many colors, ingoring", c_token);
+		int_warn("too many colors, ingoring",c_token);
 		++c_token;
 	    } else {
 		gif_state.rgb_table[gif_state.n_colors++] = color;
@@ -351,6 +266,9 @@
 	strcat(term_options, "interlace ");
     }
     switch (gif_font) {
+    case 0:
+	strcat(term_options,"tiny ");
+	break;
     case 1:
 	strcat(term_options, "small ");
 	break;
@@ -360,6 +278,9 @@
     case 3:
 	strcat(term_options, "large ");
 	break;
+    case 4:
+	strcat(term_options,"giant ");
+	break;
     }
     sprintf(term_options + strlen(term_options),
 	    "size %d,%d ", GIF_XMAX, GIF_YMAX);
@@ -376,7 +297,8 @@
  * should set up things that only need to be set once, like handshaking and
  * character sets etc...
  */
-TERM_PUBLIC void GIF_init()
+TERM_PUBLIC void
+GIF_init()
 {
     gif_state.linetype = 0;
 }
@@ -386,7 +308,8 @@
  * the terminal type changed.  This procedure should reset the device, 
  * possibly flushing a buffer somewhere or generating a form feed.
  */
-TERM_PUBLIC void GIF_reset()
+TERM_PUBLIC void
+GIF_reset()
 {
 }
 
@@ -396,7 +319,8 @@
  * be used as terminals (like plotters) will probably be in graphics mode 
  * always and therefore won't need this.
  */
-TERM_PUBLIC void GIF_graphics()
+TERM_PUBLIC void
+GIF_graphics()
 {
     int i;
     unsigned int rgb;
@@ -404,13 +328,16 @@
     gif_state.color = 0;
     gif_state.image = gdImageCreate((int) (xsize * GIF_XMAX),
 				    (int) (ysize * GIF_YMAX));
-    gif_state.height = (int) (ysize * GIF_YMAX);
+    gif_state.height = (int) (ysize * GIF_YMAX - 1);
     gif_state.charw = term->h_char;	/* gif_state.font->w; */
     gif_state.charh = term->v_char;	/* gif_state.font->h; */
-    for (i = gif_state.n_colors; i < GIF_N_DEFAULT_COLORS; i++)
-	gif_state.rgb_table[i] = gif_color_rgbs[i];
-    if (gif_state.n_colors < GIF_N_DEFAULT_COLORS)
-	gif_state.n_colors = GIF_N_DEFAULT_COLORS;
+    for (i = gif_state.n_colors; i < WEB_N_COLORS; i++)
+	gif_state.rgb_table[i] = 
+		(web_color_rgbs[i].r << 16) |
+		(web_color_rgbs[i].g << 8) |
+		web_color_rgbs[i].b;
+    if (gif_state.n_colors < WEB_N_COLORS)
+	gif_state.n_colors = WEB_N_COLORS;
     for (i = 0; i < gif_state.n_colors; i++) {
 	rgb = gif_state.rgb_table[i];
 	gif_state.color_table[i] =
@@ -430,7 +357,8 @@
  * that commands can be seen as they're typed.  Again, this will probably
  * do nothing if the device can't be used as a terminal.
  */
-TERM_PUBLIC void GIF_text()
+TERM_PUBLIC void
+GIF_text()
 {
     if (gif_state.flags & GIF_USE_INTERLACE)
 	gdImageInterlace(gif_state.image, 1);
@@ -441,7 +369,8 @@
 /* _move(x,y)  Called at the start of a line.  The cursor should move to the
  * (x,y) position without drawing.
  */
-TERM_PUBLIC void GIF_move(unsigned int x, unsigned int y)
+TERM_PUBLIC void
+GIF_move(unsigned int x, unsigned int y)
 {
     gif_state.x = x;
     gif_state.y = y;
@@ -451,7 +380,8 @@
  * from the last (x,y) position given by _move() or _vector() to this new (x,y)
  * position.
  */
-TERM_PUBLIC void GIF_vector(unsigned int x, unsigned int y)
+TERM_PUBLIC void
+GIF_vector(unsigned int x, unsigned int y)
 {
     int gif_linetype_dotted[5];
 
@@ -484,7 +414,8 @@
  * it should map it to one of the available line types.
  * Most drivers provide 9 different linetypes (lt is 0 to 8).
  */
-TERM_PUBLIC void GIF_linetype(int type)
+TERM_PUBLIC void
+GIF_linetype(int type)
 {
     if (type >= (gif_state.n_colors - 3))
 	type %= (gif_state.n_colors - 3);
@@ -499,7 +430,8 @@
  * to _text_angle and then horizontally (with respect to the text)
  * justified according to _justify_text.
  */
-TERM_PUBLIC void GIF_put_text(unsigned int x, unsigned int y, char *string)
+TERM_PUBLIC void
+GIF_put_text(unsigned int x, unsigned int y, char *string)
 {
     if (gif_state.angle == 1) {
 	x -= gif_state.charh / 2;
@@ -518,17 +450,44 @@
  * If ang = 0 then text is horizontal.  If ang = 1 then text is vertically
  * upwards.  Returns TRUE if text can be rotated, FALSE otherwise.
  */
-TERM_PUBLIC int GIF_text_angle(int ang)
+TERM_PUBLIC int
+GIF_text_angle(int ang)
 {
     gif_state.angle = ang;
     return TRUE;
 }
 
-/*
- * Local Variables:
- * mode:C
- * End:
- */
+TERM_PUBLIC int
+GIF_set_font(char *fontname)
+{
+    char name[32];
+    int  sep;
+    gdFontPtr font;
+
+    sep = strcspn(fontname,",");
+    strncpy(name,fontname,sep);
+    name[sep] = NUL;
+
+    if (!strcmp(fontname,"small"))
+	font = gdFontSmall;
+    else if (!strcmp(fontname,"medium"))
+	font = gdFontMediumBold;
+    else if(!strcmp(fontname,"large"))
+	font = gdFontLarge;
+    else if(!strcmp(fontname,"giant"))
+	font = gdFontGiant;
+    else if(!strcmp(fontname,"tiny"))
+	font = gdFontTiny;
+    else
+	font = GIF_font;
+
+    gif_state.charw = font->w;
+    gif_state.charh = font->h;
+
+    gif_state.font = font;
+
+    return TRUE;
+}
 
 #endif /* TERM_BODY */
 #ifdef TERM_TABLE
@@ -539,7 +498,7 @@
     GIF_VTIC, GIF_HTIC, GIF_options, GIF_init, GIF_reset,
     GIF_text, null_scale, GIF_graphics, GIF_move, GIF_vector,
     GIF_linetype, GIF_put_text, GIF_text_angle,
-    null_justify_text, do_point, do_arrow, set_font_null,
+    null_justify_text, do_point, do_arrow, GIF_set_font,
     0,				/* pointsize */
     TERM_CAN_MULTIPLOT | TERM_BINARY
 TERM_TABLE_END(gif_driver)
@@ -562,9 +521,11 @@
 " The `gif` terminal driver generates output in GIF format.  It uses Thomas",
 " Boutell's gd library, which is available from http://www.boutell.com/gd/",
 "",
+" By default, the `gif` terminal driver uses a shared Web-friendy palette."
+"",
 " Syntax:",
 "       set terminal gif {transparent} {interlace}",
-"                        {small | medium | large}",
+"                        {tiny | small | medium | large | giant}",
 "                        {size <x>,<y>}",
 "                        {<color0> <color1> <color2> ...}",
 "",
@@ -573,8 +534,8 @@
 "",
 " `interlace` instructs the driver to generate interlaced GIFs.",
 "",
-" The choice of fonts is `small` (6x12 pixels), `medium` (7x13 Bold) or `large`",
-" (8x16).",
+" The choice of fonts is `tiny` (5x8 pixels), `small` (6x12 pixels), `medium`",
+" (7x13 Bold), `large` (8x16) or `giant` (9x15 pixels)",
 "",
 " The size <x,y> is given in pixels---it defaults to 640x480.  The number of",
 " pixels can be also modified by scaling with the `set size` command.",
@@ -607,3 +568,9 @@
 " The current version of the `gif` driver does not support animated GIFs."
 END_HELP(gif)
 #endif /* TERM_HELP */
+
+/*
+ * Local Variables:
+ * mode:C
+ * End:
+ */
diff -urN gnuplot-3.7/term/gnugraph.trm gnuplot-3.7.1/term/gnugraph.trm
--- gnuplot-3.7/term/gnugraph.trm	Mon Dec 14 18:39:22 1998
+++ gnuplot-3.7.1/term/gnugraph.trm	Thu Aug 19 15:17:45 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: gnugraph.trm,v 1.8.2.1 1999/08/19 14:17:45 lhecking Exp $
  */
 
 /* GNUPLOT -- gnugraph.trm */
@@ -73,6 +73,10 @@
  */
 
 #include "driver.h"
+
+#if defined (HAVE_PLOTCOMPAT_H)
+# include <plotcompat.h>
+#endif
 
 #ifdef TERM_REGISTER
 register_term(unixplot)
diff -urN gnuplot-3.7/term/gpic.trm gnuplot-3.7.1/term/gpic.trm
--- gnuplot-3.7/term/gpic.trm	Mon Dec 14 18:39:28 1998
+++ gnuplot-3.7.1/term/gpic.trm	Mon Dec 14 18:39:28 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: gpic.trm,v 1.16 1998/04/14 00:17:46 drd Exp $
+ * $Id: gpic.trm,v 1.7 1998/12/14 18:39:28 lhecking Exp $
  */
 
 /* GNUPLOT - gpic.trm -*-C-*- */
diff -urN gnuplot-3.7/term/gpr.trm gnuplot-3.7.1/term/gpr.trm
--- gnuplot-3.7/term/gpr.trm	Mon Dec 14 18:39:32 1998
+++ gnuplot-3.7.1/term/gpr.trm	Mon Dec 14 18:39:32 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: gpr.trm,v 1.13 1998/04/14 00:17:46 drd Exp $
+ * $Id: gpr.trm,v 1.6 1998/12/14 18:39:32 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/hp26.trm gnuplot-3.7.1/term/hp26.trm
--- gnuplot-3.7/term/hp26.trm	Mon Dec 14 18:39:41 1998
+++ gnuplot-3.7.1/term/hp26.trm	Mon Dec 14 18:39:41 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: hp26.trm,v 1.14 1998/04/14 00:17:47 drd Exp $
+ * $Id: hp26.trm,v 1.6 1998/12/14 18:39:41 lhecking Exp $
  */
 
 /* GNUPLOT - HP26.trm */
diff -urN gnuplot-3.7/term/hp2648.trm gnuplot-3.7.1/term/hp2648.trm
--- gnuplot-3.7/term/hp2648.trm	Wed Nov 25 21:06:34 1998
+++ gnuplot-3.7.1/term/hp2648.trm	Wed Nov 25 21:06:34 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: hp2648.trm,v 1.14 1998/04/14 00:17:48 drd Exp $
+ * $Id: hp2648.trm,v 1.6 1998/11/25 21:06:34 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/hp500c.trm gnuplot-3.7.1/term/hp500c.trm
--- gnuplot-3.7/term/hp500c.trm	Mon Dec 14 18:39:45 1998
+++ gnuplot-3.7.1/term/hp500c.trm	Mon Dec 14 18:39:45 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: hp500c.trm,v 1.17 1998/04/14 00:17:48 drd Exp $
+ * $Id: hp500c.trm,v 1.7 1998/12/14 18:39:45 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/hpgl.trm gnuplot-3.7.1/term/hpgl.trm
--- gnuplot-3.7/term/hpgl.trm	Mon Dec 14 18:39:49 1998
+++ gnuplot-3.7.1/term/hpgl.trm	Mon Dec 14 18:39:49 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: hpgl.trm,v 1.24 1998/04/14 00:17:49 drd Exp $
+ * $Id: hpgl.trm,v 1.7 1998/12/14 18:39:49 lhecking Exp $
  */
 
 /* GNUPLOT - hpgl.trm */
diff -urN gnuplot-3.7/term/hpljii.trm gnuplot-3.7.1/term/hpljii.trm
--- gnuplot-3.7/term/hpljii.trm	Tue Dec 15 20:22:41 1998
+++ gnuplot-3.7.1/term/hpljii.trm	Tue Dec 15 20:22:41 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: hpljii.trm,v 1.20 1998/04/14 00:17:51 drd Exp $
+ * $Id: hpljii.trm,v 1.9 1998/12/15 20:22:41 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/hppj.trm gnuplot-3.7.1/term/hppj.trm
--- gnuplot-3.7/term/hppj.trm	Wed Nov 25 21:06:44 1998
+++ gnuplot-3.7.1/term/hppj.trm	Wed Nov 25 21:06:44 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: hppj.trm,v 1.13 1998/04/14 00:17:51 drd Exp $
+ * $Id: hppj.trm,v 1.7 1998/11/25 21:06:44 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/imagen.trm gnuplot-3.7.1/term/imagen.trm
--- gnuplot-3.7/term/imagen.trm	Mon Dec 14 18:40:00 1998
+++ gnuplot-3.7.1/term/imagen.trm	Mon Dec 14 18:40:00 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: imagen.trm,v 1.24 1998/04/14 00:17:51 drd Exp $
+ * $Id: imagen.trm,v 1.7 1998/12/14 18:40:00 lhecking Exp $
  */
 
 /* GNUPLOT - imagen.trm */
diff -urN gnuplot-3.7/term/impcodes.h gnuplot-3.7.1/term/impcodes.h
--- gnuplot-3.7/term/impcodes.h	Wed Apr 15 20:16:49 1998
+++ gnuplot-3.7.1/term/impcodes.h	Wed Apr 15 20:16:49 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: impcodes.h,v 1.4 1993/09/27 17:16:08 alex Exp $
+ * $Id: impcodes.h,v 1.1.1.1 1998/04/15 19:16:49 lhecking Exp $
  */
 
 /*
diff -urN gnuplot-3.7/term/iris4d.trm gnuplot-3.7.1/term/iris4d.trm
--- gnuplot-3.7/term/iris4d.trm	Mon Dec 14 18:40:12 1998
+++ gnuplot-3.7.1/term/iris4d.trm	Mon Dec 14 18:40:12 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: iris4d.trm,v 1.16 1998/04/14 00:17:52 drd Exp $
+ * $Id: iris4d.trm,v 1.6 1998/12/14 18:40:12 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/kyo.trm gnuplot-3.7.1/term/kyo.trm
--- gnuplot-3.7/term/kyo.trm	Wed Nov 25 21:06:54 1998
+++ gnuplot-3.7.1/term/kyo.trm	Wed Nov 25 21:06:54 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: kyo.trm,v 1.12 1998/04/14 00:17:52 drd Exp $
+ * $Id: kyo.trm,v 1.6 1998/11/25 21:06:54 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/latex.trm gnuplot-3.7.1/term/latex.trm
--- gnuplot-3.7/term/latex.trm	Tue Dec 15 20:21:36 1998
+++ gnuplot-3.7.1/term/latex.trm	Thu Aug 19 15:17:37 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: latex.trm,v 1.63 1998/04/14 00:17:53 drd Exp $
+ * $Id: latex.trm,v 1.9.2.1 1999/08/19 14:17:37 lhecking Exp $
  *
  */
 
@@ -104,6 +104,11 @@
 TERM_PUBLIC void EMTEX_text __PROTO((void));
 #endif
 
+#ifdef EEPIC
+TERM_PUBLIC void EEPIC_move __PROTO((unsigned int x, unsigned int y));
+TERM_PUBLIC void EEPIC_vector __PROTO((unsigned int ux, unsigned int uy));
+#endif
+
 #define TINY_STEP 0.5		/* tiny steps for high quality lines */
 
 #define LATEX_PTS_PER_INCH (72.27)
@@ -220,8 +225,7 @@
 	    strcpy(LATEX_font, "cmr");
 	    c_token++;
 	} else if (almost_equals(c_token, "d$efault")) {
-	    strcpy(LATEX_font, "cmr");
-	    LATEX_fontsize = 10;
+	    strcpy(LATEX_font, "doc");
 	    c_token++;
 	}
     }
@@ -235,8 +239,11 @@
     term->v_char = (unsigned int) (LATEX_fontsize * DOTS_PER_INCH / 72);
     term->h_char = (unsigned int) (LATEX_fontsize * DOTS_PER_INCH / 144);
 
-    sprintf(term_options, "%s %d", LATEX_font[2] == 't' ? "courier" : "roman",
-	    LATEX_fontsize);
+    if (strcmp(LATEX_font, "doc")==0)
+	strncpy(term_options, "(document specific font)",MAX_LINE_LEN);
+    else
+	sprintf(term_options, "%s %d",
+		LATEX_font[2] == 't' ? "courier" : "roman", LATEX_fontsize);
 }
 
 
@@ -265,12 +272,13 @@
     int xscale = xsize * t->xmax;
     int yscale = ysize * t->ymax;
 
-    fprintf(gpoutfile, "\
-\\begin{picture}(%d,%d)(0,0)\n\
+    fprintf(gpoutfile, "\\begin{picture}(%d,%d)(0,0)\n", xscale, yscale);
+    if (strcmp(LATEX_font, "doc") != 0) {
+	fprintf(gpoutfile, "\
 \\font\\gnuplot=%s10 at %dpt\n\
 \\gnuplot\n",
-	    xscale, yscale,
-	    LATEX_font, LATEX_fontsize);
+		LATEX_font, LATEX_fontsize);
+    }
 }
 
 
@@ -831,9 +839,10 @@
 " The `latex` and `emtex` drivers allow two options.",
 "",
 " Syntax:",
-"       set terminal latex | emtex {courier | roman} {<fontsize>}",
+"       set terminal latex | emtex {courier | roman | default} {<fontsize>}",
 "",
-" `fontsize` may be any size you specify.  The default is 10-point Roman.",
+" `fontsize` may be any size you specify.  The default is for the plot to",
+" inherit its font setting from the embedding document.",
 "",
 " Unless your driver is capable of building fonts at any size (e.g. dvips),",
 " stick to the standard 10, 11 and 12 point sizes.",
@@ -842,11 +851,21 @@
 "",
 " All drivers for LaTeX offer a special way of controlling text positioning:",
 " If any text string begins with '{', you also need to include a '}' at the",
-" end of the text, and the whole text will be centered both horizontally",
-" and vertically by LaTeX. --- If the text string begins with '[', you need",
-" to continue it with: a position specification (up to two out of t,b,l,r),",
-" ']{', the text itself, and finally, '}'. The text itself may be anything",
-" LaTeX can typeset as an LR-box. \\rule{}{}'s may help for best positioning.",
+" end of the text, and the whole text will be centered both horizontally and",
+" vertically.  If the text string begins with '[', you need to follow this with",
+" a position specification (up to two out of t,b,l,r), ']{', the text itself,",
+" and finally '}'.  The text itself may be anything LaTeX can typeset as an",
+" LR-box.  '\\rule{}{}'s may help for best positioning.",
+"",
+" Points, among other things, are drawn using the LaTeX commands \"\\Diamond\" and",
+" \"\\Box\".  These commands no longer belong to the LaTeX2e core; they are included",
+" in the latexsym package, which is part of the base distribution and thus part",
+" of any LaTeX implementation.  Please do not forget to use this package.",
+"",
+" Points are drawn with the LaTex commands \\Diamond and \\Box.  These",
+" commands do no longer belong to the LaTeX2e core, but are included in the",
+" latexsym-package in the base distribution, and are hence part of all LaTeX",
+" implementations. Please do not forget to use this package.",
 "",
 " Examples:",
 " About label positioning:",
diff -urN gnuplot-3.7/term/linux.trm gnuplot-3.7.1/term/linux.trm
--- gnuplot-3.7/term/linux.trm	Wed Nov 25 21:07:06 1998
+++ gnuplot-3.7.1/term/linux.trm	Thu Aug 19 15:17:16 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: linux.trm,v 1.21 1998/06/18 14:59:20 ddenholm Exp $
+ * $Id: linux.trm,v 1.8.2.1 1999/08/19 14:17:16 lhecking Exp $
  *
  */
 
@@ -80,7 +80,7 @@
 TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y));
 TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y));
 TERM_PUBLIC int LINUX_text_angle __PROTO((int ang));
-TERM_PUBLIC void LINUX_put_text __PROTO((unsigned int x, unsigned int y, char *str));
+TERM_PUBLIC void LINUX_put_text __PROTO((unsigned int x, unsigned int y, const char *str));
 TERM_PUBLIC void LINUX_suspend __PROTO((void));
 TERM_PUBLIC void LINUX_resume __PROTO((void));
 
@@ -98,6 +98,8 @@
 static int linux_startx, linux_starty, linux_lasty;
 static int linux_angle;
 int LINUX_graphics_allowed;
+extern void drop_privilege();
+extern void take_privilege();
 
 typedef (*linux_line_func_ptr) __PROTO((int x1, int y1, int x2, int y2));
 
@@ -109,7 +111,8 @@
  * /dev/console and /dev/tty\d are considered graphic terminals, all other
  * don't support the linux terminal */
 
-void LINUX_setup(void)
+void
+LINUX_setup(void)
 {
     char line[256];
     FILE *pipe;
@@ -129,7 +132,9 @@
 	    LINUX_graphics_allowed = TRUE;
     }
     if (LINUX_graphics_allowed) {
+	take_privilege();
 	vga_init();
+	drop_privilege();
     } else {
 	/* err - shouldn't we give up root uid whatever happens ?
 	 * or perhaps vga_init() does it ?
@@ -138,15 +143,17 @@
     }
 }
 
-TERM_PUBLIC void LINUX_options()
+TERM_PUBLIC
+void LINUX_options()
 {
     if (!LINUX_graphics_allowed) {
-	int_error("Linux terminal driver not available", NO_CARET);
+	int_error("Linux terminal driver not available",NO_CARET);
     }
     fprintf(stderr, "%s\n", vga_getmodename(linux_vmode));
 }
 
-TERM_PUBLIC void LINUX_init()
+TERM_PUBLIC
+void LINUX_init()
 {
     /* vga_init () has been moved to immediately after main () for security */
     if (vga_getdefaultmode() != -1)
@@ -165,7 +172,8 @@
     linux_lasty = modeinfo->height - 1;
 }
 
-TERM_PUBLIC void LINUX_reset()
+TERM_PUBLIC void
+LINUX_reset()
 {
     if (graphics_on) {
 	vga_setmode(TEXT);
@@ -173,7 +181,8 @@
     }
 }
 
-TERM_PUBLIC void LINUX_text()
+TERM_PUBLIC void
+LINUX_text()
 {
     if (graphics_on) {
 	vga_getch();
@@ -182,7 +191,8 @@
     }
 }
 
-TERM_PUBLIC void LINUX_graphics()
+TERM_PUBLIC void
+LINUX_graphics()
 {
     if (!graphics_on) {
 	vga_setmode(linux_vmode);
@@ -190,17 +200,20 @@
     }
 }
 
-TERM_PUBLIC void LINUX_suspend()
+TERM_PUBLIC void
+LINUX_suspend()
 {
     vga_flip();
 }
 
-TERM_PUBLIC void LINUX_resume()
+TERM_PUBLIC void
+LINUX_resume()
 {
     vga_flip();
 }
 
-TERM_PUBLIC void LINUX_linetype(linetype)
+TERM_PUBLIC void
+LINUX_linetype(linetype)
 int linetype;
 {
     if (linetype >= 13)
@@ -208,7 +221,8 @@
     vga_setcolor(vgacolor[linetype + 2]);
 }
 
-TERM_PUBLIC void LINUX_move(x, y)
+TERM_PUBLIC void
+LINUX_move(x, y)
 unsigned int x;
 unsigned int y;
 {
@@ -216,7 +230,8 @@
     linux_starty = y;
 }
 
-TERM_PUBLIC void LINUX_vector(x, y)
+TERM_PUBLIC void
+LINUX_vector(x, y)
 unsigned int x;
 unsigned int y;
 {
@@ -225,14 +240,16 @@
     linux_starty = y;
 }
 
-TERM_PUBLIC int LINUX_text_angle(ang)
+TERM_PUBLIC int
+LINUX_text_angle(ang)
 int ang;
 {
     linux_angle = ang;
     return TRUE;
 }
 
-static void LINUX_putc(x, y, c, ang, line_func)
+static void
+LINUX_putc(x, y, c, ang, line_func)
 unsigned int x, y;
 int c;
 int ang;
@@ -258,9 +275,10 @@
     }
 }
 
-TERM_PUBLIC void LINUX_put_text(x, y, str)
+TERM_PUBLIC void
+LINUX_put_text(x, y, str)
 unsigned int x, y;
-char *str;
+const char *str;
 {
     int i;
     switch (linux_angle) {
diff -urN gnuplot-3.7/term/mac.trm gnuplot-3.7.1/term/mac.trm
--- gnuplot-3.7/term/mac.trm	Sun Dec  6 21:59:37 1998
+++ gnuplot-3.7.1/term/mac.trm	Tue Oct 19 20:51:03 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: mac.trm,v 1.1.2.1 1999/10/19 19:51:03 lhecking Exp $
  *
  */
 
@@ -123,7 +123,8 @@
 " Several options may be set in the 'macintosh' driver.",
 "",
 " Syntax:",
-"      set terminal macintosh {singlewin | multiwin} {vertical | novertical} {size <width>, <height> | default}",
+"      set terminal macintosh {singlewin | multiwin} {vertical | novertical}",
+"                             {size <width>, <height> | default}",
 "",
 " 'singlewin' limits the output to a single window and is useful for animations.",
 " 'multiwin' allows multiple windows.",
diff -urN gnuplot-3.7/term/metafont.trm gnuplot-3.7.1/term/metafont.trm
--- gnuplot-3.7/term/metafont.trm	Tue Dec 15 20:21:41 1998
+++ gnuplot-3.7.1/term/metafont.trm	Tue Dec 15 20:21:41 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: metafont.trm,v 1.14 1998/04/14 00:17:54 drd Exp $
+ * $Id: metafont.trm,v 1.8 1998/12/15 20:21:41 lhecking Exp $
  */
 
 /* GNUPLOT - metafont.trm */
diff -urN gnuplot-3.7/term/metapost.trm gnuplot-3.7.1/term/metapost.trm
--- gnuplot-3.7/term/metapost.trm	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/term/metapost.trm	Thu Sep 16 17:05:21 1999
@@ -0,0 +1,789 @@
+/*
+ * $Id: metapost.trm,v 1.5.2.4 1999/09/16 16:05:21 lhecking Exp $
+ */
+
+/* GNUPLOT - metapost.trm */
+
+/*[
+ * Copyright 1990 - 1993, 1998
+ *
+ * Permission to use, copy, and distribute this software and its
+ * documentation for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.
+ *
+ * Permission to modify the software is granted, but not the right to
+ * distribute the complete modified source code.  Modifications are to
+ * be distributed as patches to the released version.  Permission to
+ * distribute binaries produced by compiling modified sources is granted,
+ * provided you
+ *   1. distribute the corresponding source modifications from the
+ *    released version in the form of a patch file along with the binaries,
+ *   2. add special version identification to distinguish your version
+ *    in addition to the base release version number,
+ *   3. provide your name and address as the primary contact for the
+ *    support of your modified version, and
+ *   4. retain our contact information in regard to use of the base
+ *    software.
+ * Permission to distribute the released version of the source code along
+ * with corresponding source modifications in the form of a patch file is
+ * granted with same provisions 2 through 4 for binary distributions.
+ *
+ * This software is provided "as is" without express or implied warranty
+ * to the extent permitted by applicable law.
+]*/
+
+/* 1999/04/22
+ *			GNUPLOT -- metapost.trm
+ *
+ *			This terminal driver supports:
+ *		    		Metapost Commands
+ *
+ * Based on metafont.trm, written by
+ *		Pl Hedne
+ *		Trondheim, Norway
+ *		Pal.Hedne@termo.unit.no;
+ *		with improvements by Carsten Steger
+ *
+ * and pstricks.trm, written by
+ *		David Kotz and Raymond Toy
+ *
+ * Adapted to metapost by:
+ * 		Daniel H. Luecking <luecking@comp.uark.edu> and
+ * 	 	L Srinivasa Mohan <mohan@chemeng.iisc.ernet.in>
+ */
+
+#include "driver.h"
+
+#ifdef TERM_REGISTER
+register_term(mp)
+#endif
+
+#ifdef TERM_PROTO
+TERM_PUBLIC void MP_options __PROTO((void));
+TERM_PUBLIC void MP_init __PROTO((void));
+TERM_PUBLIC void MP_graphics __PROTO((void));
+TERM_PUBLIC void MP_text __PROTO((void));
+TERM_PUBLIC void MP_linetype __PROTO((int linetype));
+TERM_PUBLIC void MP_move __PROTO((unsigned int x, unsigned int y));
+TERM_PUBLIC void MP_point __PROTO((unsigned int x, unsigned int y, int number));
+TERM_PUBLIC void MP_pointsize __PROTO((double size));
+TERM_PUBLIC void MP_linewidth __PROTO((double width));
+TERM_PUBLIC void MP_vector __PROTO((unsigned int ux, unsigned int uy));
+TERM_PUBLIC void MP_arrow __PROTO((unsigned int sx, unsigned int sy,
+				   unsigned int ex, unsigned int ey,
+				   TBOOLEAN head));
+TERM_PUBLIC void MP_put_text __PROTO((unsigned int x, unsigned int y, char str[]));
+TERM_PUBLIC int MP_justify_text __PROTO((enum JUSTIFY mode));
+TERM_PUBLIC int MP_text_angle __PROTO((int ang));
+TERM_PUBLIC void MP_reset __PROTO((void));
+TERM_PUBLIC int MP_set_font __PROTO((char *font));
+TERM_PUBLIC void MP_boxfill __PROTO((int style,
+				     unsigned int x1, unsigned int y1,
+				     unsigned int width, unsigned int height));
+
+/* 5 inches wide by 3 inches high (default) */
+#define MP_XSIZE 5.0
+#define MP_YSIZE 3.0
+
+/* gnuplot units will be one pixel if printing device has this
+   resolution */
+#define MP_DPI (300)
+
+#define MP_XMAX (MP_XSIZE*MP_DPI)
+#define MP_YMAX (MP_YSIZE*MP_DPI)
+
+#define MP_HTIC (5*MP_DPI/72)	/* nominally 5pt   */
+#define MP_VTIC (5*MP_DPI/72)	/*    "      5pt   */
+#define MP_HCHAR (MP_DPI*53/10/72)	/*    "      5.3pt */
+#define MP_VCHAR (MP_DPI*11/72)	/*    "      11pt  */
+#endif /* TERM_PROTO */
+
+#ifndef TERM_PROTO_ONLY
+#ifdef TERM_BODY
+
+static double MP_xsize = MP_XSIZE;
+static double MP_ysize = MP_YSIZE;
+/* static double MP_xmax = MP_XMAX;
+   static double MP_ymax = MP_YMAX;
+ * unused, for now
+ */
+static int MP_posx;
+static int MP_posy;
+static char MP_fontname[MAX_ID_LEN + 1];
+static double MP_fontsize;
+static double MP_textmag;
+enum JUSTIFY MP_justify = LEFT;
+static int MP_ang = 0;
+static int MP_char_code = 0;
+
+/* number of nodes in an output line so far */
+static int MP_linecount = 1;
+
+/* Number of point types */
+#define MP_POINT_TYPES 10
+
+/* Number of line types */
+#define MP_LINE_TYPES 8
+
+/* are we in the middle of a MP path? */
+static TBOOLEAN MP_inline = FALSE;
+/* colored or dashed lines? */
+static TBOOLEAN MP_color = FALSE;
+static TBOOLEAN MP_solid = FALSE;
+
+/* compatability mode*/
+static TBOOLEAN MP_notex = FALSE;
+
+/* has a font change taken place? */
+static TBOOLEAN MP_fontchanged = FALSE;
+
+/* The old types */
+static int MP_oldline = -2;
+
+/* The old sizes */
+static double MP_oldptsize = 1.0;
+static double MP_oldpen = 1.0;
+
+/* terminate any path in progress */
+static void MP_endline __PROTO((void));
+
+/* max number of path nodes before a newline */
+#define MP_LINEMAX 5
+
+TERM_PUBLIC void
+MP_options()
+{
+    MP_color = FALSE;
+    MP_solid = FALSE;
+    MP_notex = FALSE;
+    MP_fontsize = 10.0;
+    MP_textmag = 1.0;
+    strcpy(MP_fontname, "cmr10");
+    strcpy(default_font, "");	/* output file will store default font info */
+    while (!END_OF_COMMAND) {
+	if (almost_equals(c_token, "m$onochrome")) {
+	    MP_color = FALSE;
+	    c_token++;
+	    continue;
+	}
+	if (almost_equals(c_token, "c$olor") || almost_equals(c_token, "c$olour")) {
+	    MP_color = TRUE;
+	    c_token++;
+	    continue;
+	}
+	if (almost_equals(c_token, "s$olid")) {
+	    MP_solid = TRUE;
+	    c_token++;
+	    continue;
+	}
+	if (almost_equals(c_token, "da$shed")) {
+	    MP_solid = FALSE;
+	    c_token++;
+	    continue;
+	}
+	if (almost_equals(c_token, "n$otex")) {
+	    MP_notex = TRUE;
+	    strcpy(MP_fontname, "pcrr8r");
+	    c_token++;
+	    continue;
+	}
+	if (almost_equals(c_token, "t$ex")) {
+	    MP_notex = FALSE;
+	    c_token++;
+	    continue;
+	}
+	if (almost_equals(c_token, "de$fault")) {
+	    c_token++;
+	    continue;
+	}
+	if (almost_equals(c_token, "m$agnification")) {
+	    c_token++;
+	    if (!END_OF_COMMAND) {	/* global text scaling */
+		struct value a;
+		MP_textmag = (double) real(const_express(&a));
+	    }
+	    c_token++;
+	    continue;
+	}
+	break;
+    }
+    if (!END_OF_COMMAND && isstring(c_token)) {		/* font name */
+	quote_str(MP_fontname, c_token, MAX_ID_LEN);
+	c_token++;
+    }
+    if (!END_OF_COMMAND) {	/*font size */
+	struct value a;
+	MP_fontsize = (double) real(const_express(&a));
+	c_token++;
+    }
+    /* minimal error recovery: */
+    if (MP_fontsize < 5.0)
+	MP_fontsize = 5.0;
+    if (MP_fontsize > 99.99)
+	MP_fontsize = 99.99;
+
+    term->v_char = (unsigned int) (MP_DPI * MP_fontsize * MP_textmag * 11 / 720);
+    if (MP_notex) {		/* Courier is a little wider than cmtt */
+	term->h_char = (unsigned int) (MP_DPI * MP_fontsize * MP_textmag * 6.0 / 720 + 0.5);
+    } else {
+	term->h_char = (unsigned int) (MP_DPI * MP_fontsize * MP_textmag * 5.3 / 720 + 0.5);
+    }
+    sprintf(term_options, "%s%s%s%s%6.3f \"%s\" %5.2f",
+	    MP_color ? "color " : "", MP_solid ? "solid " : "",
+	    MP_notex ? "notex " : "", "mag ",
+	    MP_textmag, MP_fontname, MP_fontsize);
+}
+
+TERM_PUBLIC void
+MP_init()
+{
+    time_t now;
+    time(&now);
+    MP_posx = MP_posy = 0;
+    fprintf(gpoutfile, "%%GNUPLOT Metapost output: %s\n", asctime(localtime(&now)));
+    fputs("\n\
+defaultmpt:=mpt:=4;\n\
+th:=.6;\n\
+\n\
+def scalepen expr n = pickup pencircle scaled (n*th) enddef;\n\
+def ptsize expr n = mpt:=n*defaultmpt enddef;\n",
+	  gpoutfile);
+
+    fprintf(gpoutfile, "\ntextmag:=%6.3f;\n", MP_textmag);
+
+    fputs("\
+vardef makepic(expr str) =\n\
+  if picture str : str scaled textmag\n\
+  % otherwise a string\n\
+  else: str infont defaultfont scaled (defaultscale*textmag)\n\
+  fi\n\
+enddef;\n\
+\n\
+def	infontsize(expr str, size) =\n\
+  infont str scaled (size /	fontsize str)\n\
+enddef;\n",
+	  gpoutfile);
+
+    if (MP_notex) {
+	fprintf(gpoutfile, "\n\
+defaultfont:= \"%s\";\n\
+defaultscale := %6.3f/fontsize defaultfont;\n",
+		MP_fontname, MP_fontsize);
+    } else {
+	fputs("\n\
+%font changes\n\
+verbatimtex\n\
+  \\def\\setfont#1#2{%.\n\
+    \\font\\gpfont=#1 at #2pt\n\
+    \\gpfont}\n",
+	      gpoutfile);
+
+	fprintf(gpoutfile, "\\setfont{%s}{%5.2f}\netex\n",
+		MP_fontname, MP_fontsize);
+    }
+    fputs("\n\
+color currentcolor; currentcolor=black;\n\
+boolean colorlines,dashedlines;\n",
+	  gpoutfile);
+    if (MP_color) {
+	fputs("colorlines:=true;\n", gpoutfile);
+    } else {
+	fputs("colorlines:=false;\n", gpoutfile);
+    }
+    if (MP_solid) {
+	fputs("dashedlines:=false;\n", gpoutfile);
+    } else {
+	fputs("dashedlines:=true;\n", gpoutfile);
+    }
+    fputs("\n\
+def _wc = withpen currentpen withcolor currentcolor enddef;\n\
+def _ac = addto currentpicture enddef;\n\
+def _sms = scaled mpt shifted enddef;\n\
+% drawing point-types\n\
+def gpdraw (expr n, x, y) =\n\
+  if n<0: _ac contour fullcircle _sms (x,y)\n\
+  elseif (n=1) or (n=3):\n\
+    _ac doublepath ptpath[n] _sms (x,y) _wc;\n\
+    _ac doublepath ptpath[n] rotated 90 _sms (x,y) _wc\n\
+  elseif n<6: _ac doublepath ptpath[n] _sms (x,y) _wc\n\
+  else: _ac contour ptpath[n] _sms (x,y) _wc\n\
+  fi\n\
+enddef;\n\
+\n\
+% the point shapes\n\
+path ptpath[];\n\
+%diamond\n\
+ptpath0 = ptpath6 = (-1/2,0)--(0,-1/2)--(1/2,0)--(0,1/2)--cycle;\n\
+% plus sign\n\
+ptpath1 = (-1/2,0)--(1/2,0);\n\
+% square\n\
+ptpath2 = ptpath7 = (-1/2,-1/2)--(1/2,-1/2)--(1/2,1/2)--(-1/2,1/2)--cycle;\n\
+% cross\n\
+ptpath3 := (-1/2,-1/2)--(1/2,1/2);\n\
+% circle:\n\
+ptpath4 = ptpath8:= fullcircle;\n\
+% triangle\n\
+ptpath5 = ptpath9 := (0,1/2)--(-1/2,-1/2)--(1/2,-1/2)--cycle;\n\
+\n\
+def linetype expr n =\n\
+  currentcolor:= if colorlines : col[n] else: black fi;\n\
+  if n = -1 :\n\
+      drawoptions(withcolor currentcolor withpen (currentpen scaled .5));\n\
+  elseif n < 1 :\n\
+    drawoptions(_wc);\n\
+  else :\n\
+    drawoptions( if dashedlines: dashed lt[n] fi _wc);\n\
+  fi\n\
+enddef;\n\
+\n\
+% dash patterns\n\
+picture lt[];\n\
+lt1=dashpattern(on 2 off 2); % dashes\n\
+lt2=dashpattern(on 2 off 2 on 0.2 off 2); %dash-dot\n\
+lt3=lt1 scaled 1.414;\n\
+lt4=lt2 scaled 1.414;\n\
+lt5=lt1 scaled 2;\n\
+lt6:=lt2 scaled 2;\n\
+lt7=dashpattern(on 0.2 off 2); %dots\n\
+\n\
+color col[],cyan, magenta, yellow;\n\
+cyan=blue+green; magenta=red+blue;yellow=green+red;\n\
+col[-2]:=col[-1]:=col0:=black;\n\
+col1:=red;\n\
+col2:=(.2,.2,1); %blue\n\
+col3:=(1,.66,0); %orange\n\
+col4:=.85*green;\n\
+col5:=.9*magenta;\n\
+col6:=0.85*cyan;\n\
+col7:=.85*yellow;\n\
+\n\
+%placing text\n\
+picture GPtext;\n\
+def put_text(expr pic, x, y, r, j) =\n\
+  GPtext:=makepic(pic);\n\
+  GPtext:=GPtext shifted\n\
+    if j = 1: (-(ulcorner GPtext + llcorner GPtext)/2)\n\
+    elseif j = 2: (-center GPtext)\n\
+    else: (-(urcorner GPtext + lrcorner GPtext)/2)\n\
+    fi\n\
+    rotated if r > 0: 90 else: 0 fi;\n\
+  draw GPtext shifted (x,y)\n\
+enddef;\n",
+	  gpoutfile);
+}
+
+TERM_PUBLIC void
+MP_graphics()
+{
+    /* initialize "remembered" drawing parameters */
+    MP_oldline = -2;
+    MP_oldpen = 1.0;
+    MP_oldptsize = pointsize;
+    fprintf(gpoutfile, "\nbeginfig(%d);\nw:=%gin;h:=%gin;\n",
+	    MP_char_code, MP_xsize, MP_ysize);
+    fprintf(gpoutfile, "a:=w/%d;b:=h/%d;\n", term->xmax, term->ymax);
+    fprintf(gpoutfile, "scalepen 1; ptsize %g;linetype -2;\n", pointsize);
+    MP_char_code++;
+}
+
+TERM_PUBLIC void
+MP_text()
+{
+    if (MP_inline)
+	MP_endline();
+    fputs("endfig;\n", gpoutfile);
+}
+
+TERM_PUBLIC void
+MP_linetype(lt)
+int lt;
+{
+    int linetype = lt;
+    if (linetype >= MP_LINE_TYPES)
+	linetype %= MP_LINE_TYPES;
+    if (MP_inline)
+	MP_endline();
+    if (MP_oldline != linetype) {
+	fprintf(gpoutfile, "linetype %d;\n", linetype);
+	MP_oldline = linetype;
+    }
+}
+
+TERM_PUBLIC void
+MP_move(x, y)
+unsigned int x;
+unsigned int y;
+{
+    if ((x != MP_posx) || (y != MP_posy)) {
+	if (MP_inline)
+	    MP_endline();
+	MP_posx = x;
+	MP_posy = y;
+    }				/* else we seem to be there already */
+}
+
+TERM_PUBLIC void
+MP_point(x, y, pt)
+unsigned int x;
+unsigned int y;
+int pt;
+{
+    int pointtype = pt;
+    if (MP_inline)
+	MP_endline();
+
+    /* Print the shape defined by 'number'; number < 0 means
+       to use a dot, otherwise one of the defined points. */
+
+    if (pointtype >= MP_POINT_TYPES)
+	pointtype %= MP_POINT_TYPES;
+    fprintf(gpoutfile, "gpdraw(%d,%da,%db);\n", pointtype, x, y);
+}
+
+TERM_PUBLIC void
+MP_pointsize(ps)
+double ps;
+{
+    if (MP_oldptsize != ps) {
+	if (MP_inline)
+	    MP_endline();
+	fprintf(gpoutfile, "ptsize %g;\n", ps);
+	MP_oldptsize = ps;
+    }
+}
+
+
+TERM_PUBLIC void
+MP_linewidth(lw)
+double lw;
+{
+    if (MP_oldpen != lw) {
+	if (MP_inline)
+	    MP_endline();
+	fprintf(gpoutfile, "scalepen %g;\n", lw);
+	MP_oldpen = lw;
+    }
+}
+
+
+TERM_PUBLIC void
+MP_vector(ux, uy)
+unsigned int ux;
+unsigned int uy;
+{
+    if ((ux == MP_posx) && (uy == MP_posy))
+	return;			/* Zero length line */
+
+    if (MP_inline) {
+	if (MP_linecount++ >= MP_LINEMAX) {
+	    fputs("\n", gpoutfile);
+	    MP_linecount = 1;
+	}
+    } else {
+	MP_inline = TRUE;
+	fprintf(gpoutfile, "draw (%da,%db)", MP_posx, MP_posy);
+	MP_linecount = 2;
+    }
+    MP_posx = ux;
+    MP_posy = uy;
+    fprintf(gpoutfile, "--(%da,%db)", MP_posx, MP_posy);
+}
+
+static void
+MP_endline()
+{
+    MP_inline = FALSE;
+    fprintf(gpoutfile, ";\n");
+}
+
+TERM_PUBLIC void
+MP_arrow(sx, sy, ex, ey, head)
+unsigned int sx;
+unsigned int sy;
+unsigned int ex;
+unsigned int ey;
+TBOOLEAN head;
+{
+    MP_move(sx, sy);
+    if (head) {
+	fprintf(gpoutfile, "drawarrow (%da,%db)--(%da,%db);\n",
+		sx, sy, ex, ey);
+    } else if ((sx != ex) || (sy != ey)) {
+	fprintf(gpoutfile, "draw (%da,%db)--(%da,%db);\n",
+		sx, sy, ex, ey);
+    }				/* else: arrow with no length and no head = sound of one hand clapping? */
+    MP_posx = ex;
+    MP_posy = ey;
+
+}
+
+TERM_PUBLIC void
+MP_put_text(x, y, str)
+unsigned int x, y;
+char str[];
+{
+    int i, j = 0;
+    char *text;
+
+    /* ignore empty strings */
+    if (!str || !*str)
+	return;
+
+    /* F***. why do drivers need to modify string args? */
+    text = gp_alloc(strlen(str)+1, "temp string");
+    strcpy(text,str);
+
+    if (MP_inline)
+	MP_endline();
+
+
+    switch (MP_justify) {
+    case LEFT:
+	j = 1;
+	break;
+    case CENTRE:
+	j = 2;
+	break;
+    case RIGHT:
+	j = 3;
+	break;
+    }
+    if (MP_notex) {
+	for (i = 0; i < strlen(text); i++)
+	    if (text[i] == '"')
+		text[i] = '\'';	/* Replace " with ' */
+	if (MP_fontchanged) {
+	    fprintf(gpoutfile, "\
+put_text(\"%s\" infontsize(\"%s\",%5.2f), %da, %db, %d, %d);\n",
+		    text, MP_fontname, MP_fontsize, x, y, MP_ang, j);
+	} else {
+	    fprintf(gpoutfile, "put_text(\"%s\", %da, %db, %d, %d);\n",
+		    text, x, y, MP_ang, j);
+	}
+    } else if (MP_fontchanged) {
+	fprintf(gpoutfile, "\
+put_text( btex \\setfont{%s}{%5.2f} %s etex, %da, %db, %d, %d);\n",
+		MP_fontname, MP_fontsize, text, x, y, MP_ang, j);
+    } else {
+	fprintf(gpoutfile, "put_text( btex %s etex, %da, %db, %d, %d);\n",
+		text, x, y, MP_ang, j);
+    }
+
+    free(text);
+}
+
+TERM_PUBLIC int
+MP_justify_text(mode)
+enum JUSTIFY mode;
+{
+    MP_justify = mode;
+    return (TRUE);
+}
+
+TERM_PUBLIC int
+MP_text_angle(ang)
+int ang;
+{
+    /* Metapost code does the conversion */
+    MP_ang = ang;
+    return (TRUE);
+}
+
+TERM_PUBLIC int
+MP_set_font(font)
+char *font;
+{
+    if (*font) {
+	size_t sep = strcspn(font, ",");
+	strncpy(MP_fontname, font, sep);
+	MP_fontname[sep] = NUL;
+	sscanf(&(font[sep + 1]), "%lf", &MP_fontsize);
+	if (MP_fontsize < 5)
+	    MP_fontsize = 5.0;
+	if (MP_fontsize >= 100)
+	    MP_fontsize = 99.99;
+	/*  */
+	MP_fontchanged = TRUE;
+    } else {
+	MP_fontchanged = FALSE;
+    }
+    return TRUE;
+}
+
+
+TERM_PUBLIC void
+MP_reset()
+{
+    fputs("end.\n", gpoutfile);
+}
+
+TERM_PUBLIC void
+MP_boxfill(sty, x1, y1, wd, ht)
+int sty;
+unsigned int x1, y1, wd, ht;
+{
+    /* for now simply clear box if sty <= 0, do nothing otherwise */
+    if (MP_inline)
+	MP_endline();
+    if (sty <= 0)
+	fprintf(gpoutfile, "\
+fill (%da,%db)--(%da,%db)--(%da,%db)--(%da,%db)--cycle withcolor background;\n",
+		x1, y1, x1 + wd, y1, x1 + wd, y1 + ht, x1, y1 + ht);
+}
+
+#endif /* TERM_BODY */
+
+#ifdef TERM_TABLE
+
+TERM_TABLE_START(mp_driver)
+    "mp", "MetaPost plotting standard",
+    MP_XMAX, MP_YMAX, MP_VCHAR, MP_HCHAR,
+    MP_VTIC, MP_HTIC, MP_options, MP_init, MP_reset,
+    MP_text, null_scale, MP_graphics, MP_move, MP_vector,
+    MP_linetype, MP_put_text, MP_text_angle,
+    MP_justify_text, MP_point, MP_arrow, MP_set_font, MP_pointsize,
+    0, 0, 0, MP_boxfill, MP_linewidth
+    TERM_TABLE_END(mp_driver)
+#undef LAST_TERM
+#define LAST_TERM mp_driver
+
+#endif /* TERM_TABLE */
+#endif /* TERM_PROTO_ONLY */
+
+#ifdef TERM_HELP
+START_HELP(mp)
+"1 mp",
+"?commands set terminal mpost",
+"?set terminal mp",
+"?set term mp",
+"?terminal mp",
+"?term mp",
+"?mp",
+"?metapost",
+"",
+" The `mp` driver produces output intended to be input to the Metapost program.",
+" Running Metapost on the file creates EPS files containing the plots. By",
+" default, Metapost passes all text through TeX.  This has the advantage of",
+" allowing essentially  any TeX symbols in titles and labels.",
+"",
+" The `mp` terminal is selected with a command of the form",
+"    set term mp {color} {solid} {notex} {mag <magsize>} {\"<name>\"} {<size>}",
+" The option `color` causes lines to be drawn in color (on a printer or display",
+" that supports it), `monochrome` (or nothing) selects black lines.  The option",
+" `solid` draws solid lines, while `dashed` (or nothing) selects lines with",
+" different patterns of dashes.  If `solid` is selected but `color` is not,",
+" nearly all lines will be identical.  This may occasionally be useful, so it is",
+" allowed.",
+"",
+" The option `notex` bypasses TeX entirely, therefore no TeX code can be used in",
+" labels under this option.  This is intended for use on old plot files or files",
+" that make frequent use of common characters like `$` and `%` that require",
+" special handling in TeX.",
+"",
+" Changing font sizes in TeX has no effect on the size of mathematics, and there",
+" is no foolproof way to make such a change, except by globally  setting a",
+" magnification factor. This is the purpose of the `magnification` option. It",
+" must be followed by a scaling factor. All text (NOT the graphs) will be scaled",
+" by this factor. Use this if you have math that you want at some size other",
+" than the default 10pt. Unfortunately, all math will be the same size, but see",
+" the discussion below on editing the MP output. `mag` will also work under",
+" `notex` but there seems no point in using it as the font size option (below)",
+" works as well.",
+"",
+" A name in quotes selects the font that will be used when no explicit font is",
+" given in a `set label` or `set title`.  A name recognized by TeX (a TFM file",
+" exists) must be used.  The default is \"cmr10\" unless `notex` is selected,",
+" then it is \"pcrr8r\" (Courier).  Even under `notex`, a TFM file is needed by",
+" Metapost. The file `pcrr8r.tfm` is the name given to Courier in LaTeX's psnfss",
+" package.  If you change the font from the `notex` default, choose a font that",
+" matches the ASCII encoding at least in the range 32-126.  `cmtt10` almost",
+" works, but it has a nonblank character in position 32 (space).",
+"",
+" The size can be any number between 5.0 and 99.99.  If it is omitted, 10.0 is",
+" used.  It is advisable to use `magstep` sizes: 10 times an integer or",
+" half-integer power of 1.2, rounded to two decimals, because those are the most",
+" available sizes of fonts in TeX systems.",
+"",
+" All the options are optional.  If font information is given, it must be at the",
+" end, with size (if present) last.  The size is needed to select a size for the",
+" font, even if the font name includes size information.  For example,",
+" `set term mp \"cmtt12\"` selects cmtt12 shrunk to the default size 10.  This",
+" is probably not what you want or you would have used cmtt10.",
+"",
+" The following common ascii characters need special treatment in TeX:",
+"    $, &, #, %, _;  |, <, >;  ^, ~,  \\, {, and }",
+" The five characters $, #, &, _, and % can simply be escaped, e.g., `\\$`.",
+" The three characters <, >, and | can be wrapped in math mode, e.g., `$<$`.",
+" The remainder require some TeX work-arounds.  Any good book on TeX will give",
+" some guidance.",
+"",
+" If you type your labels inside double quotes, backslashes in TeX code need to",
+" be escaped (doubled). Using single quotes will avoid having to do this, but",
+" then you cannot use `\\n` for line breaks.  As of this writing, version 3.7 of",
+" gnuplot processess titles given in a `plot` command differently than in other",
+" places, and backslashes in TeX commands need to be doubled regardless of the",
+" style of quotes.",
+"",
+" Metapost pictures are typically used in TeX documents.  Metapost deals with",
+" fonts pretty much the same way TeX does, which is different from most other",
+" document preparation programs.  If the picture is included in a LaTeX document",
+" using the graphics package, or in a plainTeX document via epsf.tex, and then",
+" converted to PostScript with dvips (or other dvi-to-ps converter), the text in",
+" the plot will usually be handled correctly.  However, the text may not appear",
+" if you send the Metapost output as-is to a PostScript interpreter.",
+"",
+"2 Metapost Instructions",
+"?commands set terminal mp detailed",
+"?set terminal mp detailed",
+"?set term mp detailed",
+"?mp detailed",
+"?metapost detailed",
+"",
+" - Set your terminal to Metapost, e.g.:",
+"    set terminal mp mono \"cmtt12\" 12",
+"",
+" - Select an output-file, e.g.:",
+"    set output \"figure.mp\"",
+"",
+" - Create your pictures.  Each plot (or multiplot group) will generate a",
+" separate Metapost beginfig...endfig group.  Its default size will be 5 by 3",
+" inches.  You can change the size by saying `set size 0.5,0.5` or whatever",
+" fraction of the default size you want to have.",
+"",
+" - Quit gnuplot.",
+"",
+" - Generate EPS files by running Metapost on the output of gnuplot:",
+"    mpost figure.mp  OR  mp figure.mp",
+" The name of the Metapost program depends on the system, typically `mpost` for",
+" a Unix machine and `mp` on many others.  Metapost will generate one EPS file",
+" for each picture.",
+"",
+" - To include your pictures in your document you can use the graphics package",
+" in LaTeX or epsf.tex in plainTeX:",
+"    \\usepackage{graphics} % LaTeX",
+"    \\input epsf.tex       % plainTeX",
+" If you use a driver other than dvips for converting TeX DVI output to PS, you",
+" may need to add the following line in your LaTeX document:",
+"    \\DeclareGraphicsRule{*}{eps}{*}{}",
+" Each picture you made is in a separate file.  The first picture is in, e.g.,",
+" figure.0, the second in figure.1, and so on....  To place the third picture in",
+" your document, for example, all you have to do is:",
+"    \\includegraphics{figure.2} % LaTeX",
+"    \\epsfbox{figure.2}         % plainTeX",
+"",
+" The advantage, if any, of the mp terminal over a postscript terminal is",
+" editable output.  Considerable effort went into making this output as clean as",
+" possible.  For those knowledgeable in the Metapost language, the default line",
+" types and colors can be changed by editing the arrays `lt[]` and `col[]`.",
+" The choice of solid vs dashed lines, and color vs black lines can be change by",
+" changing the values assigned to the booleans `dashedlines` and `colorlines`.",
+" If the default `tex` option was in effect, global changes to the text of",
+" labels can be achieved by editing the `vebatimtex...etex` block.  In",
+" particular, a LaTeX preamble can be added if desired, and then LaTeX's",
+" built-in size changing commands can be used for maximum flexibility. Be sure",
+" to set the appropriate MP configuration variable to force Metapost to run",
+" LaTeX instead of plainTeX."
+END_HELP(mp)
+#endif /* TERM_HELP */
diff -urN gnuplot-3.7/term/mif.trm gnuplot-3.7.1/term/mif.trm
--- gnuplot-3.7/term/mif.trm	Tue Jan 12 14:04:11 1999
+++ gnuplot-3.7.1/term/mif.trm	Tue Jan 12 14:04:11 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: mif.trm,v 1.11 1999/01/12 14:04:11 lhecking Exp $
  */
 /* GNUPLOT -- mif.trm */
 
diff -urN gnuplot-3.7/term/multitos.trm gnuplot-3.7.1/term/multitos.trm
--- gnuplot-3.7/term/multitos.trm	Mon Dec 14 18:40:36 1998
+++ gnuplot-3.7.1/term/multitos.trm	Mon Dec 14 18:40:36 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: multitos.trm,v 1.6 1998/12/14 18:40:36 lhecking Exp $
  */
 
 /* GNUPLOT - multitos.trm */
diff -urN gnuplot-3.7/term/next.trm gnuplot-3.7.1/term/next.trm
--- gnuplot-3.7/term/next.trm	Mon Dec 14 18:40:41 1998
+++ gnuplot-3.7.1/term/next.trm	Thu Aug 19 15:17:02 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: next.trm,v 1.22 1998/06/18 14:59:21 ddenholm Exp $
+ * $Id: next.trm,v 1.10.2.1 1999/08/19 14:17:02 lhecking Exp $
  *
  */
 
@@ -1216,7 +1216,7 @@
 @end
 
 
-@ implementation GnuTermDriver
+@implementation GnuTermDriver
 
 - init
 {
diff -urN gnuplot-3.7/term/object.h gnuplot-3.7.1/term/object.h
--- gnuplot-3.7/term/object.h	Wed Apr 15 20:16:49 1998
+++ gnuplot-3.7.1/term/object.h	Sun Aug 22 19:52:34 1999
@@ -337,7 +337,9 @@
 #define		O_ELLIPSE	1
 #define		O_POLYLINE	2
 #define		O_SPLINE	3
-#define		O_TEXT		4
+/* HBB 990329: quick hack: 'O_TEXT' is in use by <fcntl.h> header
+ * on DOS/Windows platforms. Renamed to OBJ_TEXT */
+#define		OBJ_TEXT	4
 #define		O_ARC		5
 #define		O_COMPOUND	6
 #define		O_END_COMPOUND	-O_COMPOUND
diff -urN gnuplot-3.7/term/openstep.trm gnuplot-3.7.1/term/openstep.trm
--- gnuplot-3.7/term/openstep.trm	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/term/openstep.trm	Fri Aug 20 13:09:47 1999
@@ -0,0 +1,1362 @@
+/* -*- objc -*-
+ * $Id: openstep.trm,v 1.5.2.1 1999/08/20 12:09:47 lhecking Exp $
+ *
+ */
+
+/* GNUPLOT - openstep.trm */
+
+/*[
+ * Copyright 1991 - 1993, 1998
+ *
+ * Permission to use, copy, and distribute this software and its
+ * documentation for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.
+ *
+ * Permission to modify the software is granted, but not the right to
+ * distribute the complete modified source code.  Modifications are to
+ * be distributed as patches to the released version.  Permission to
+ * distribute binaries produced by compiling modified sources is granted,
+ * provided you
+ *   1. distribute the corresponding source modifications from the
+ *    released version in the form of a patch file along with the binaries,
+ *   2. add special version identification to distinguish your version
+ *    in addition to the base release version number,
+ *   3. provide your name and address as the primary contact for the
+ *    support of your modified version, and
+ *   4. retain our contact information in regard to use of the base
+ *    software.
+ * Permission to distribute the released version of the source code along
+ * with corresponding source modifications in the form of a patch file is
+ * granted with same provisions 2 through 4 for binary distributions.
+ *
+ * This software is provided "as is" without express or implied warranty
+ * to the extent permitted by applicable law.
+]*/
+
+/*
+ * This file is included by ../term.c via ../term.h.
+ *
+ * This terminal driver supports:
+ *     next
+ *
+ * AUTHORS
+ *  Robert Lutwak from Russell Lang's post.trm
+ *  'old' option invokes Nick Strobel's original, single viewport terminal
+ * 
+ * send your comments or suggestions to (info-gnuplot@dartmouth.edu).
+ *
+ * This terminal attempts to connect, via the NeXTstep Distributed
+ * Objects system, to the "gnuplotServer."  If there is no such
+ * service registered with the OS, the terminal attempts to fire
+ * up GnuTerm.app.  If the user has not set the environment variable
+ * GNUTERMPATH, the terminal uses the users ApplicationPaths Workspace
+ * dwrite to search for GnuTerm.app (Note:  this is usually something
+ * like ~/Apps, ~/LocalApps, ~/NextApps, etc.).
+ * In order to use this filter, you MUST have GnuTerm.app installed
+ * on your system.
+ *
+ * Once connected to the server, this filter is basically Russell Lang's
+ * Postscript filter, except that the resultant postscript code 
+ * is sent, via the D.O. system, to GnuTerm.app, which manages 
+ * the windows which produce the postscript output on the screen.
+ * 
+ *
+ * Defaults are
+ * 'set term next new dashed auto "Helvetica" 14'
+ *
+ * To change font to Times-Roman and font size to 20pts use 
+ * 'set term next "Times-Roman" 20'.
+ *
+ * to choose window by title
+ * 'set term next title "Window title"
+ *
+ * Monitor Options:
+ * monochrome, color
+ *
+ * To invoke Nick Strobel's old terminal
+ * 'set term next old'
+ */
+
+#include "driver.h"
+
+#ifdef TERM_REGISTER
+register_term(next)
+#endif
+
+#ifdef TERM_PROTO
+
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+#import <stdarg.h>
+
+
+TERM_PUBLIC void NEXT_options __PROTO((void));
+TERM_PUBLIC void NEXT_common_init __PROTO((int uses_fonts, unsigned int xoff, unsigned int yoff, unsigned int xsize, unsigned int ysize, char **dict));
+TERM_PUBLIC void NEXT_init __PROTO((void));
+TERM_PUBLIC void NEXT_graphics __PROTO((void));
+TERM_PUBLIC void NEXT_text __PROTO((void));
+TERM_PUBLIC void NEXT_reset __PROTO((void));
+TERM_PUBLIC void NEXT_linetype __PROTO((int linetype));
+TERM_PUBLIC void NEXT_move __PROTO((unsigned int x, unsigned int y));
+TERM_PUBLIC void NEXT_vector __PROTO((unsigned int x, unsigned int y));
+TERM_PUBLIC void NEXT_put_text __PROTO((unsigned int x, unsigned int y, const char *str));
+TERM_PUBLIC int NEXT_text_angle __PROTO((int ang));
+TERM_PUBLIC int NEXT_justify_text __PROTO((enum JUSTIFY mode));
+TERM_PUBLIC void NEXT_point __PROTO((unsigned int x, unsigned int y, int number));
+TERM_PUBLIC int NEXT_set_font __PROTO((const char *font));
+TERM_PUBLIC char *NEXT_RememberFont __PROTO((char *fname));
+TERM_PUBLIC void NEXT_set_pointsize __PROTO((double size));
+
+
+#define NEXT_POINT_TYPES 8	/* div */
+#define NEXT_XOFF	1	/* page offset in pts */
+#define NEXT_YOFF	1
+#define NEXT_XMAX 6400
+#define NEXT_YMAX 4800
+#define NEXT_XLAST (NEXT_XMAX - 1)
+#define NEXT_YLAST (NEXT_YMAX - 1)
+#define NEXT_VTIC (NEXT_YMAX/80)
+#define NEXT_HTIC (NEXT_YMAX/80)
+#define NEXT_SC (10)		/* scale is 1pt = 10 units */
+#define	NEXT_LW (0.5*NEXT_SC)	/* linewidth = 0.5 pts */
+#define NEXT_VCHAR (14*NEXT_SC)	/* default is 14 point characters */
+#define NEXT_HCHAR (14*NEXT_SC*6/10)
+
+#define GOT_NEXT_PROTO
+#endif
+
+
+#ifndef TERM_PROTO_ONLY
+
+#ifdef TERM_BODY
+
+@interface GnuTermDriver:NSObject 
+{
+    id server;
+}
+
+- (void)senderIsInvalid:(NSNotification *)sender;
+- (void)plot:(char *)PSstr;
+-init;
+@end
+
+
+#define DEFAULTNEXTSIZE 10000
+
+static NSAutoreleasePool *arpool;  // our autorelease pool
+static id gnuTermAccess;	/* local object manages the D.O. connection */
+
+static char *NEXTBuffer, *NEXTBufAt, *NEXTBufEnd;
+static int NEXTsize;
+static char NEXTTmpBuf[1000];
+static void NEXTPrintf(char *,...);
+static TBOOLEAN NEXT_oldterminal = FALSE;
+/*static TBOOLEAN NEXT_colordetect();*/
+
+static char NEXT_title[MAX_LINE_LEN + 1];	/* name of font */
+
+static char NEXT_font[MAX_LINE_LEN + 1] = "Helvetica";	/* name of font */
+static int NEXT_fontsize = 14;	/* size of font in pts */
+static TBOOLEAN NEXT_color = FALSE;
+static TBOOLEAN NEXT_solid = FALSE;	/*  use dashed lines */
+static int NEXT_path_count = 0;	/* count of lines in path */
+static int NEXT_ang = 0;	/* text angle */
+static enum JUSTIFY NEXT_justify = LEFT;	/* text is flush left */
+
+static TBOOLEAN NEXT_duplex_state = FALSE;
+static TBOOLEAN NEXT_duplex_option = FALSE;
+
+static char GPFAR *GPFAR NEXT_header[] =
+{
+    "/M {moveto} bind def\n",
+    "/L {lineto} bind def\n",
+    "/R {rmoveto} bind def\n",
+    "/V {rlineto} bind def\n",
+    "/vpt2 vpt 2 mul def\n",
+    "/hpt2 hpt 2 mul def\n",
+/* flush left show */
+    "/Lshow { currentpoint stroke M\n",
+    "  0 vshift R show } def\n",
+/* flush right show */
+    "/Rshow { currentpoint stroke M\n",
+    "  dup stringwidth pop neg vshift R show } def\n",
+/* centred show */
+    "/Cshow { currentpoint stroke M\n",
+    "  dup stringwidth pop -2 div vshift R show } def\n",
+/* Dash or Color Line */
+    "/DL { Color {setrgbcolor Solid {pop []} if 0 setdash }\n",
+    " {pop pop pop Solid {pop []} if 0 setdash} ifelse } def\n",
+/* Border Lines */
+    "/BL { stroke gnulinewidth 2 mul setlinewidth } def\n",
+/* Axes Lines */
+    "/AL { stroke gnulinewidth 2 div setlinewidth } def\n",
+/* Plot Lines */
+    "/PL { stroke gnulinewidth setlinewidth } def\n",
+/* Line Types */
+    "/LTb { BL [] 0 0 0 DL } def\n",	/* border */
+    "/LTa { AL [1 dl 2 dl] 0 setdash 0 0 0 setrgbcolor } def\n",	/* axes */
+    "/LT0 { PL [] 0 1 0 DL } def\n",
+    "/LT1 { PL [4 dl 2 dl] 0 0 1 DL } def\n",
+    "/LT2 { PL [2 dl 3 dl] 1 0 0 DL } def\n",
+    "/LT3 { PL [1 dl 1.5 dl] 1 0 1 DL } def\n",
+    "/LT4 { PL [5 dl 2 dl 1 dl 2 dl] 0 1 1 DL } def\n",
+    "/LT5 { PL [4 dl 3 dl 1 dl 3 dl] 1 1 0 DL } def\n",
+    "/LT6 { PL [2 dl 2 dl 2 dl 4 dl] 0 0 0 DL } def\n",
+    "/LT7 { PL [2 dl 2 dl 2 dl 2 dl 2 dl 4 dl] 1 0.3 0 DL } def\n",
+    "/LT8 { PL [2 dl 2 dl 2 dl 2 dl 2 dl 2 dl 2 dl 4 dl] 0.5 0.5 0.5 DL } def\n",
+/* Point (Round) *//* Matt Heffron make it round */
+    "/Pnt { stroke [] 0 setdash\n",
+    "   gsave 1 setlinecap M 0 0 V stroke grestore } def\n",
+
+/* Diamond */
+    "/Dia { stroke [] 0 setdash 2 copy vpt add M\n",
+    "  hpt neg vpt neg V hpt vpt neg V\n",
+    "  hpt vpt V hpt neg vpt V closepath stroke\n",
+    "  Pnt } def\n",
+
+/* Plus */
+    "/Pls { stroke [] 0 setdash vpt sub M 0 vpt2 V\n",
+    "  currentpoint stroke M\n",
+    "  hpt neg vpt neg R hpt2 0 V stroke\n",
+    "  } def\n",
+
+/* Box */
+    "/Box { stroke [] 0 setdash 2 copy exch hpt sub exch vpt add M\n",
+    "  0 vpt2 neg V hpt2 0 V 0 vpt2 V\n",
+    "  hpt2 neg 0 V closepath stroke\n",
+    "  Pnt } def\n",
+
+/* Cross (X) */
+    "/Crs { stroke [] 0 setdash exch hpt sub exch vpt add M\n",
+    "  hpt2 vpt2 neg V currentpoint stroke M\n",
+    "  hpt2 neg 0 R hpt2 vpt2 V stroke } def\n",
+
+/* Triangle Up*/
+    "/TriU { stroke [] 0 setdash 2 copy vpt 1.12 mul add M\n",
+    "  hpt neg vpt -1.62 mul V\n",
+    "  hpt 2 mul 0 V\n",
+    "  hpt neg vpt 1.62 mul V closepath stroke\n",
+    "  Pnt  } def\n",
+
+/* Star */
+    "/Star { 2 copy Pls Crs } def\n",
+
+/* div added filed box */
+/* Filled Box */
+    "/BoxF { stroke [] 0 setdash exch hpt sub exch vpt add M\n",
+    "  0 vpt2 neg V  hpt2 0 V  0 vpt2 V\n",
+    "  hpt2 neg 0 V  closepath fill } def\n",
+
+/* div added filled triangle */
+/* Triangle Up, Filled */
+    "/TriUF { stroke [] 0 setdash vpt 1.12 mul add M\n",
+    "  hpt neg vpt -1.62 mul V\n",
+    "  hpt 2 mul 0 V\n",
+    "  hpt neg vpt 1.62 mul V closepath fill } def\n",
+
+/* Matt Heffron: added a few more types */
+/* Triangle Down */
+    "/TriD { stroke [] 0 setdash 2 copy vpt 1.12 mul sub M\n",
+    "  hpt neg vpt 1.62 mul V\n",
+    "  hpt 2 mul 0 V\n",
+    "  hpt neg vpt -1.62 mul V closepath stroke\n",
+    "  Pnt  } def\n",
+
+/* Triangle Down, Filled*/
+    "/TriDF { stroke [] 0 setdash vpt 1.12 mul sub M\n",
+    "  hpt neg vpt 1.62 mul V\n",
+    "  hpt 2 mul 0 V\n",
+    "  hpt neg vpt -1.62 mul V closepath fill} def\n",
+
+/* Diamond, Filled */
+    "/DiaF { stroke [] 0 setdash vpt add M\n",
+    "  hpt neg vpt neg V hpt vpt neg V\n",
+    "  hpt vpt V hpt neg vpt V closepath fill } def\n",
+
+/* Pentagon */
+    "/Pent { stroke [] 0 setdash 2 copy gsave\n",
+    "  translate 0 hpt M 4 {72 rotate 0 hpt L} repeat\n",
+    "  closepath stroke grestore Pnt } def\n",
+
+/* Pentagon, Filled */
+    "/PentF { stroke [] 0 setdash gsave\n",
+    "  translate 0 hpt M 4 {72 rotate 0 hpt L} repeat\n",
+    "  closepath fill grestore } def\n",
+
+/* Circle */
+    "/Circle { stroke [] 0 setdash 2 copy\n",
+    "  hpt 0 360 arc stroke Pnt } def\n",
+
+/* Circle,Filled */
+    "/CircleF { stroke [] 0 setdash hpt 0 360 arc fill } def\n",
+/* 16 differently filled circles */
+    "/C0 { BL [] 0 setdash 2 copy moveto vpt 90 450  arc } bind def\n",
+    "/C1 { BL [] 0 setdash 2 copy        moveto\n",
+    "       2 copy  vpt 0 90 arc closepath fill\n",
+    "               vpt 0 360 arc closepath } bind def\n",
+    "/C2 { BL [] 0 setdash 2 copy moveto\n",
+    "       2 copy  vpt 90 180 arc closepath fill\n",
+    "               vpt 0 360 arc closepath } bind def\n",
+    "/C3 { BL [] 0 setdash 2 copy moveto\n",
+    "       2 copy  vpt 0 180 arc closepath fill\n",
+    "               vpt 0 360 arc closepath } bind def\n",
+    "/C4 { BL [] 0 setdash 2 copy moveto\n",
+    "       2 copy  vpt 180 270 arc closepath fill\n",
+    "               vpt 0 360 arc closepath } bind def\n",
+    "/C5 { BL [] 0 setdash 2 copy moveto\n",
+    "       2 copy  vpt 0 90 arc\n",
+    "       2 copy moveto\n",
+    "       2 copy  vpt 180 270 arc closepath fill\n",
+    "               vpt 0 360 arc } bind def\n",
+    "/C6 { BL [] 0 setdash 2 copy moveto\n",
+    "      2 copy  vpt 90 270 arc closepath fill\n",
+    "              vpt 0 360 arc closepath } bind def\n",
+    "/C7 { BL [] 0 setdash 2 copy moveto\n",
+    "      2 copy  vpt 0 270 arc closepath fill\n",
+    "              vpt 0 360 arc closepath } bind def\n",
+    "/C8 { BL [] 0 setdash 2 copy moveto\n",
+    "      2 copy vpt 270 360 arc closepath fill\n",
+    "              vpt 0 360 arc closepath } bind def\n",
+    "/C9 { BL [] 0 setdash 2 copy moveto\n",
+    "      2 copy  vpt 270 450 arc closepath fill\n",
+    "              vpt 0 360 arc closepath } bind def\n",
+    "/C10 { BL [] 0 setdash 2 copy 2 copy moveto vpt 270 360 arc closepath fill\n",
+    "       2 copy moveto\n",
+    "       2 copy vpt 90 180 arc closepath fill\n",
+    "               vpt 0 360 arc closepath } bind def\n",
+    "/C11 { BL [] 0 setdash 2 copy moveto\n",
+    "       2 copy  vpt 0 90 arc closepath fill\n",
+    "       2 copy moveto\n",
+    "       2 copy  vpt 180 360 arc closepath fill\n",
+    "               vpt 0 360 arc closepath } bind def\n",
+    "/C12 { BL [] 0 setdash 2 copy moveto\n",
+    "       2 copy  vpt 180 360 arc closepath fill\n",
+    "               vpt 0 360 arc closepath } bind def\n",
+    "/C13 { BL [] 0 setdash  2 copy moveto\n",
+    "       2 copy  vpt 0 90 arc closepath fill\n",
+    "       2 copy moveto\n",
+    "       2 copy  vpt 180 360 arc closepath fill\n",
+    "               vpt 0 360 arc closepath } bind def\n",
+    "/C14 { BL [] 0 setdash 2 copy moveto\n",
+    "       2 copy  vpt 90 360 arc closepath fill\n",
+    "               vpt 0 360 arc } bind def\n",
+    "/C15 { BL [] 0 setdash 2 copy vpt 0 360 arc closepath fill\n",
+    "               vpt 0 360 arc closepath } bind def\n",
+
+/* Auxiliary definitions for rectangles */
+
+    "/Rec   { newpath 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto\n",
+    "       neg 0 rlineto closepath } bind def\n",
+    "/Square { dup Rec } bind def\n",
+    "/Bsquare { vpt sub exch vpt sub exch vpt2 Square } bind def\n",
+
+/* 16 differently filled squares */
+
+    "/S0 { BL [] 0 setdash 2 copy moveto 0 vpt rlineto BL Bsquare } bind def\n",
+    "/S1 { BL [] 0 setdash 2 copy vpt Square fill Bsquare } bind def\n",
+    "/S2 { BL [] 0 setdash 2 copy exch vpt sub exch vpt Square fill Bsquare } bind def\n",
+    "/S3 { BL [] 0 setdash 2 copy exch vpt sub exch vpt2 vpt Rec fill Bsquare } bind def\n",
+    "/S4 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt Square fill Bsquare } bind def\n",
+    "/S5 { BL [] 0 setdash 2 copy 2 copy vpt Square fill\n",
+    "       exch vpt sub exch vpt sub vpt Square fill Bsquare } bind def\n",
+    "/S6 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt vpt2 Rec fill Bsquare } bind def\n",
+    "/S7 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt vpt2 Rec fill\n",
+    "       2 copy vpt Square fill\n",
+    "       Bsquare } bind def\n",
+    "/S8 { BL [] 0 setdash 2 copy vpt sub vpt Square fill Bsquare } bind def\n",
+    "/S9 { BL [] 0 setdash 2 copy vpt sub vpt vpt2 Rec fill Bsquare } bind def\n",
+    "/S10 { BL [] 0 setdash 2 copy vpt sub vpt Square fill 2 copy exch vpt sub exch vpt Square fill\n",
+    "       Bsquare } bind def\n",
+    "/S11 { 2 copy vpt sub vpt Square fill 2 copy exch vpt sub exch vpt2 vpt Rec fill\n",
+    "       Bsquare } bind def\n",
+    "/S12 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill Bsquare } bind def\n",
+    "/S13 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill\n",
+    "       2 copy vpt Square fill Bsquare } bind def\n",
+    "/S14 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill\n",
+    "       2 copy exch vpt sub exch vpt Square fill Bsquare } bind def\n",
+    "/S15 { BL [] 0 setdash 2 copy Bsquare fill Bsquare } bind def\n",
+
+/* 16 different diamonds (actually just rotated squares) */
+
+    "/D0 { gsave translate 45 rotate 0 0 Box stroke grestore } bind def\n",
+    "/D1 { gsave translate 45 rotate 0 0 S1 stroke grestore } bind def\n",
+    "/D2 { gsave translate 45 rotate 0 0 S2 stroke grestore } bind def\n",
+    "/D3 { gsave translate 45 rotate 0 0 S3 stroke grestore } bind def\n",
+    "/D4 { gsave translate 45 rotate 0 0 S4 stroke grestore } bind def\n",
+    "/D5 { gsave translate 45 rotate 0 0 S5 stroke grestore } bind def\n",
+    "/D6 { gsave translate 45 rotate 0 0 S6 stroke grestore } bind def\n",
+    "/D7 { gsave translate 45 rotate 0 0 S7 stroke grestore } bind def\n",
+    "/D8 { gsave translate 45 rotate 0 0 S8 stroke grestore } bind def\n",
+    "/D9 { gsave translate 45 rotate 0 0 S9 stroke grestore } bind def\n",
+    "/D10 { gsave translate 45 rotate 0 0 S10 stroke grestore } bind def\n",
+    "/D11 { gsave translate 45 rotate 0 0 S11 stroke grestore } bind def\n",
+    "/D12 { gsave translate 45 rotate 0 0 S12 stroke grestore } bind def\n",
+    "/D13 { gsave translate 45 rotate 0 0 S13 stroke grestore } bind def\n",
+    "/D14 { gsave translate 45 rotate 0 0 S14 stroke grestore } bind def\n",
+    "/D15 { gsave translate 45 rotate 0 0 S15 stroke grestore } bind def\n",
+
+    NULL
+};
+
+static char GPFAR *GPFAR ENHNEXT_header[] =
+{
+/* For MFshow and MFwidth the tos is an array with the string and font info:  */
+/*	[<fontname (a string)> <fontsize> <vertical offset> <width significant?> <text string>]  */
+
+    "/MFshow {{dup dup 0 get findfont exch 1 get scalefont setfont\n",
+    "     [ currentpoint ] exch dup 2 get 0 exch rmoveto dup 4 get show dup\n",
+    "     3 get {2 get neg 0 exch rmoveto pop} {pop aload pop moveto}ifelse} forall} bind def\n",
+    "/MFwidth {0 exch {dup 3 get{dup dup 0 get findfont exch 1 get scalefont setfont\n",
+    "      4 get stringwidth pop add}\n",
+    "    {pop} ifelse} forall} bind def\n",
+
+/* flush left show */
+    "/MLshow { currentpoint stroke M\n",
+    "  0 exch R MFshow } bind def\n",
+
+/* flush right show */
+    "/MRshow { currentpoint stroke M\n",
+    "  exch dup MFwidth neg 3 -1 roll R MFshow } def\n",
+
+/* centred show */
+    "/MCshow { currentpoint stroke M\n",
+    "  exch dup MFwidth -2 div 3 -1 roll R MFshow } def\n",
+    NULL
+};
+
+/* added to post by Matt Heffron <heffron@falstaff.css.beckman.com> */
+/* moved to post.trm by drd */
+
+struct NEXT_FontName {
+    char *name;
+    struct NEXT_FontName *next;
+} *NEXT_DocFonts = NULL;
+
+TERM_PUBLIC char *
+NEXT_RememberFont(fname)
+char *fname;
+{
+    struct NEXT_FontName *fnp;
+
+    for (fnp = NEXT_DocFonts; fnp && strcmp(fnp->name, fname); fnp = fnp->next);
+    if (fnp)
+	return fnp->name;	/* we must have found it in the list */
+
+    if (encoding == ENCODING_ISO_8859_1) {
+	NEXTPrintf("/%s reencodeISO def\n", fname);
+    }
+    fnp = (struct NEXT_FontName *) gp_alloc(sizeof(struct NEXT_FontName), "PostScript Font record");
+    fnp->name = gp_alloc(1 + strlen(fname), "PostScript Font name");
+    strcpy(fnp->name, fname);
+    fnp->next = NEXT_DocFonts;
+    NEXT_DocFonts = fnp;
+    return fnp->name;
+}
+
+int NEXT_pen_x, NEXT_pen_y;
+int NEXT_taken;
+int NEXT_linetype_last;
+TBOOLEAN NEXT_relative_ok;
+
+TERM_PUBLIC void
+NEXT_options()
+{
+    char buf[40];
+    for (; !END_OF_COMMAND; ++c_token) {
+	if (almost_equals(c_token, "d$efault")) {
+	    NEXT_oldterminal = FALSE;
+	    /*NEXT_color=NEXT_colordetect(); */
+	    NEXT_color = FALSE;
+	    NEXT_solid = FALSE;
+	    NEXT_duplex_option = FALSE;
+	    strcpy(NEXT_font, "Helvetica");
+	    NEXT_fontsize = 14;
+	    term->v_char = (unsigned int) (NEXT_fontsize * NEXT_SC);
+	    term->h_char = (unsigned int) (NEXT_fontsize * NEXT_SC * 6 / 10);
+	    term->put_text = NEXT_put_text;
+	} else if (almost_equals(c_token, "mono$chrome")) {
+	    NEXT_color = FALSE;
+	} else if (almost_equals(c_token, "col$or")
+		   || almost_equals(c_token, "col$our")) {
+	    NEXT_color = TRUE;
+	}
+	/*
+	   else if (almost_equals(c_token,"auto$detect")) {
+	   NEXT_color = NEXT_colordetect();
+	   }
+	 */
+
+	else if (almost_equals(c_token, "so$lid")) {
+	    NEXT_solid = TRUE;
+	} else if (almost_equals(c_token, "da$shed")) {
+	    NEXT_solid = FALSE;
+	} else if (almost_equals(c_token, "si$mplex")) {
+	    NEXT_duplex_state = FALSE;
+	    NEXT_duplex_option = TRUE;
+	} else if (almost_equals(c_token, "du$plex")) {
+	    NEXT_duplex_state = TRUE;
+	    NEXT_duplex_option = TRUE;
+	} else if (almost_equals(c_token, "defaultp$lex")) {
+	    NEXT_duplex_option = FALSE;
+	} else if (isstring(c_token)) {
+	    quote_str(NEXT_font, c_token, MAX_LINE_LEN + 1);
+
+	    /* We must have font size specified */
+	    copy_str(buf, ++c_token, 40);
+	    NEXT_fontsize = atoi(buf);
+	    term->v_char = (unsigned int) (NEXT_fontsize * NEXT_SC);
+	    term->h_char = (unsigned int) (NEXT_fontsize * NEXT_SC * 6 / 10);
+	    sprintf(default_font, "%s,%d", NEXT_font, NEXT_fontsize);
+	} else if (almost_equals(c_token, "ti$tle")) {
+	    if (!isstring(++c_token)) {
+		fprintf(stderr, "usage:  set term next title \"newtitle\"\n");
+		--c_token;
+	    }
+	    quote_str(NEXT_title, c_token, MAX_LINE_LEN + 1);
+	} else if (almost_equals(c_token, "old")) {
+	    NEXT_oldterminal = TRUE;
+	} else if (almost_equals(c_token, "new")) {
+	    NEXT_oldterminal = FALSE;
+	}
+    }
+
+
+
+    sprintf(term_options, "%s %s %s %s \"%s\" %d title \"%s\"",
+	    NEXT_oldterminal ? "old" : "new",
+	    NEXT_color ? "color" : "monochrome",
+	    NEXT_solid ? "solid" : "dashed",
+	    NEXT_duplex_option ? (NEXT_duplex_state ? "duplex" : "simplex")
+	    : "defaultplex",
+	    NEXT_font,
+	    NEXT_fontsize,
+	    NEXT_title);
+}
+
+/* store settings passed to common_init() for use in NEXT_graphics()
+ * are reserved for storing the term options
+ */
+static int NEXT_common_uses_fonts;
+static unsigned int NEXT_common_xoff, NEXT_common_yoff;
+
+
+TERM_PUBLIC void
+NEXT_common_init(uses_fonts, xoff, yoff, width, height, dict)
+int uses_fonts;			/* 0 for NEXT(la)tex */
+unsigned int xoff, yoff;	/* offset  - 50 for /post, 0 for NEXT(la)tex */
+unsigned int width, height;	/* for bounding box */
+char **dict;			/* extra entries for the dictionary */
+{
+    static char GPFAR NEXTi1[] = "%%%%Creator: gnuplot\n\
+%%%%DocumentFonts: %s\n";
+    static char GPFAR NEXTi2[] = "%%%%EndComments\n\
+/gnudict 120 dict def\ngnudict begin\n\
+/Color %s def\n\
+/Solid %s def\n\
+/gnulinewidth %.3f def\n\
+/vshift %d def\n\
+/dl {%d mul} def\n\
+/hpt %.1f def\n\
+/vpt %.1f def\n";
+    static char GPFAR *NEXT_iso_8859_1_encoding[] =
+    {
+	"/reencodeISO {\n",
+	"dup dup findfont dup length dict begin\n",
+	"{ 1 index /FID ne { def }{ pop pop } ifelse } forall\n",
+	"/Encoding ISOLatin1Encoding def\n",
+	"currentdict end definefont\n",
+	"} def\n",
+	"/ISOLatin1Encoding [\n",
+	"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n",
+	"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n",
+	"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n",
+	"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n",
+	"/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright\n",
+	"/parenleft/parenright/asterisk/plus/comma/minus/period/slash\n",
+	"/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon\n",
+	"/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N\n",
+	"/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright\n",
+	"/asciicircum/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m\n",
+	"/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde\n",
+	"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n",
+	"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n",
+	"/.notdef/dotlessi/grave/acute/circumflex/tilde/macron/breve\n",
+	"/dotaccent/dieresis/.notdef/ring/cedilla/.notdef/hungarumlaut\n",
+	"/ogonek/caron/space/exclamdown/cent/sterling/currency/yen/brokenbar\n",
+	"/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot\n",
+	"/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior\n",
+	"/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine\n",
+	"/guillemotright/onequarter/onehalf/threequarters/questiondown\n",
+	"/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla\n",
+	"/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex\n",
+	"/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis\n",
+	"/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute\n",
+	"/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis\n",
+	"/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave\n",
+	"/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex\n",
+	"/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis\n",
+	"/yacute/thorn/ydieresis\n",
+	"] def\n",
+	NULL};
+
+
+    struct termentry *t = term;
+    int i;
+
+    NEXT_common_uses_fonts = uses_fonts;
+    NEXT_common_xoff = xoff;
+    NEXT_common_yoff = yoff;
+
+
+    NEXTPrintf("%%!NEXT-Adobe-2.0\n");
+
+    NEXTPrintf(NEXTi1, uses_fonts ? "(atend)" : "");
+
+    NEXTPrintf("%%%%BoundingBox: %d %d %d %d\n", xoff, yoff,
+	       (int) (xsize * width / NEXT_SC + 0.5 + xoff),
+	       (int) (ysize * height / NEXT_SC + 0.5 + yoff));
+
+    NEXTPrintf(NEXTi2,
+	       NEXT_color ? "true" : "false",
+	       NEXT_solid ? "true" : "false",
+	       NEXT_LW,		/* line width */
+	       (int) (t->v_char) / (-3),	/* shift for vertical centring */
+	       NEXT_SC,		/* dash length */
+	       NEXT_HTIC / 2.0,	/* half point width */
+	       NEXT_VTIC / 2.0);	/* half point height */
+
+    if (uses_fonts && (encoding == ENCODING_ISO_8859_1)) {
+	for (i = 0; NEXT_iso_8859_1_encoding[i] != NULL; i++) {
+	    NEXTPrintf("%s", NEXT_iso_8859_1_encoding[i]);
+	}
+    }
+    for (i = 0; NEXT_header[i] != NULL; i++)
+	NEXTPrintf("%s", NEXT_header[i]);
+    if (NEXT_duplex_option)
+	NEXTPrintf("statusdict begin %s setduplexmode end\n",
+		   NEXT_duplex_state ? "true" : "false");
+    NEXT_RememberFont(NEXT_font);
+
+    if (dict)
+	while (*dict)
+	    NEXTPrintf("%s", *(dict++));
+
+    NEXTPrintf("end\n%%%%EndProlog\n");
+}
+
+/* the init fn for the NeXT Terminal driver */
+TERM_PUBLIC void
+NEXT_init()
+{
+    // is this called more than once?
+    arpool = [[NSAutoreleasePool alloc] init];
+
+    /* Initialize output string */
+    NEXTsize = DEFAULTNEXTSIZE;
+    if ((NEXTBuffer = malloc(NEXTsize)) == NULL) {
+	printf("Malloc error in next filter init\n");
+	exit(1);
+    }
+    NEXTBufEnd = NEXTBuffer + NEXTsize;
+    NEXTBufAt = NEXTBuffer;
+
+
+    term->xmax = NEXT_XMAX;
+    term->ymax = NEXT_YMAX;
+
+    gnuTermAccess = [[GnuTermDriver alloc] init];
+    // [gnuTermAccess retain];	// since we hold it privately.
+}
+
+
+TERM_PUBLIC void
+NEXT_graphics()
+{
+    static char GPFAR NEXTg1[] = "0 setgray\nnewpath\n";
+    struct termentry *t = term;
+
+    *NEXTBuffer = 0;
+    NEXTBufAt = NEXTBuffer;
+
+    NEXT_common_init(1, NEXT_XOFF, NEXT_YOFF, term->xmax, term->ymax,
+		     ENHNEXT_header);
+
+    NEXTPrintf("gnudict begin\ngsave\n");
+    NEXTPrintf("%d %d translate\n", NEXT_common_xoff, NEXT_common_yoff);
+    NEXTPrintf("%.3f %.3f scale\n", 1.0 / NEXT_SC, 1.0 / NEXT_SC);
+
+
+    NEXTPrintf(NEXTg1);
+    if (NEXT_common_uses_fonts)
+	NEXTPrintf("(%s) findfont %d scalefont setfont\n", NEXT_font, (t->v_char));
+    NEXT_path_count = 0;
+    NEXT_relative_ok = FALSE;
+    NEXT_pen_x = NEXT_pen_y = -4000;
+    NEXT_taken = 0;
+    NEXT_linetype_last = -1;
+}
+
+
+TERM_PUBLIC voidNEXT_text()
+{
+    static DPSContext d;
+
+    NEXT_path_count = 0;
+    NEXTPrintf("stroke\ngrestore\nend\n");
+
+    /* Terminate string */
+    *NEXTBufAt = 0;
+
+    if (NEXT_oldterminal) {
+      d = DPSGetCurrentContext();
+      DPSPrintf(d, NEXTBuffer);
+      DPSFlushContext(d);
+    }
+    else {
+      /* Here's the call that dumps the string to the server */
+      [gnuTermAccess plot:NEXTBuffer];
+    }
+}
+
+
+TERM_PUBLIC void
+NEXT_reset()
+{
+    NEXTPrintf("%%%%Trailer\n");
+    if (!NEXT_common_uses_fonts) {
+	NEXTPrintf("%%%%DocumentFonts: ");
+	while (NEXT_DocFonts) {
+	    struct NEXT_FontName *fnp;
+	    fnp = NEXT_DocFonts->next;
+	    NEXTPrintf("%s%s", NEXT_DocFonts->name, fnp ? ", " : "\n");
+	    free(NEXT_DocFonts->name);
+	    free(NEXT_DocFonts);
+	    NEXT_DocFonts = fnp;
+	}
+    }
+}
+
+
+TERM_PUBLIC void
+NEXT_linetype(linetype)
+int linetype;
+{
+    linetype = (linetype % 9) + 2;
+    if (linetype < 0)
+	linetype = 0;
+    NEXT_relative_ok = FALSE;
+    if (NEXT_linetype_last == linetype)
+	return;
+    NEXT_linetype_last = linetype;
+    NEXTPrintf("LT%c\n", "ba012345678"[linetype]);
+    NEXT_path_count = 0;
+}
+
+
+TERM_PUBLIC void
+NEXT_move(x, y)
+unsigned int x, y;
+{
+    int dx, dy;
+    char abso[20], rel[20];
+    dx = x - NEXT_pen_x;
+    dy = y - NEXT_pen_y;
+    /* can't cancel all null moves--need a move after stroke'ing */
+    if (dx == 0 && dy == 0 && NEXT_relative_ok)
+	return;
+    sprintf(abso, "%d %d M\n", x, y);
+    sprintf(rel, "%d %d R\n", dx, dy);
+    if (strlen(rel) < strlen(abso) && NEXT_relative_ok) {
+	NEXTPrintf("%s", rel);
+	NEXT_taken++;
+    } else
+	NEXTPrintf("%s", abso);
+    NEXT_relative_ok = TRUE;
+    NEXT_path_count += 1;
+
+    NEXT_pen_x = x;
+    NEXT_pen_y = y;
+}
+
+TERM_PUBLIC void
+NEXT_vector(x, y)
+unsigned int x, y;
+{
+    int dx, dy;
+    char abso[20], rel[20];
+    dx = x - NEXT_pen_x;
+    dy = y - NEXT_pen_y;
+    if (dx == 0 && dy == 0)
+	return;
+    sprintf(abso, "%d %d L\n", x, y);
+    sprintf(rel, "%d %d V\n", dx, dy);
+    if (strlen(rel) < strlen(abso) && NEXT_relative_ok) {
+	NEXTPrintf("%s", rel);
+	NEXT_taken++;
+    } else
+	NEXTPrintf("%s", abso);
+    NEXT_relative_ok = TRUE;
+    NEXT_path_count += 1;
+    NEXT_pen_x = x;
+    NEXT_pen_y = y;
+    if (NEXT_path_count >= 400) {
+	NEXTPrintf("currentpoint stroke M\n");
+	NEXT_path_count = 0;
+    }
+}
+
+
+
+
+TERM_PUBLIC int
+NEXT_text_angle(ang)
+int ang;
+{
+    NEXT_ang = ang;
+    return TRUE;
+}
+
+
+TERM_PUBLIC int
+NEXT_justify_text(mode)
+enum JUSTIFY mode;
+{
+    NEXT_justify = mode;
+    return TRUE;
+}
+
+
+TERM_PUBLIC int
+NEXT_set_font(font) /* Entry font added by DJL */
+const char *font;
+{
+    char name[32];
+    int size, sep;
+
+    sep = strcspn(font, ",");
+    strncpy(name, font, sep);
+    name[sep] = NUL;
+    size = NEXT_fontsize;
+    sscanf(&(font[sep + 1]), "%d", &size);
+    NEXTPrintf("/%s findfont %d scalefont setfont\n", name, size * NEXT_SC);
+    NEXT_RememberFont(name);
+    return TRUE;
+}
+
+
+/* postscript point routines */
+
+TERM_PUBLIC void
+NEXT_set_pointsize(size)
+double size;
+{
+    NEXTPrintf("/vpt %.1f def /hpt %.1f def /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def\n",
+	       pointsize * NEXT_VTIC * 0.5, pointsize * NEXT_HTIC * 0.5);
+}
+
+TERM_PUBLIC void
+NEXT_point(x, y, number)
+unsigned int x, y;
+int number;
+{
+    static char *pointFNS[] =
+    {"Pnt", "Pls", "Crs", "Star",
+     "Box", "BoxF", "Circle", "CircleF",
+     "TriU", "TriUF", "TriD", "TriDF",
+     "Dia", "DiaF", "Pent", "PentF",
+     "C0", "C1", "C2", "C3",
+     "C4", "C5", "C6", "C7",
+     "C8", "C9", "C10", "C11",
+     "C12", "C13", "C14", "C15",
+     "S0", "S1", "S2", "S3",
+     "S4", "S5", "S6", "S7",
+     "S8", "S9", "S10", "S11",
+     "S12", "S13", "S14", "S15",
+     "D0", "D1", "D2", "D3",
+     "D4", "D5", "D6", "D7",
+     "D8", "D9", "D10", "D11",
+     "D12", "D13", "D14", "D15"
+    };
+    if (number < 0)
+	number = -1;		/* negative types are all 'dot' */
+    else
+	number %= sizeof(pointFNS) / sizeof(pointFNS[0]) - 1;
+    NEXTPrintf("%d %d %s\n", x, y, pointFNS[number + 1]);
+
+    NEXT_relative_ok = 0;
+    NEXT_path_count = 0;
+    NEXT_linetype_last = -1;	/* force next linetype change */
+}
+
+/* All lifted from the enhanced postscript driver */
+
+static TBOOLEAN NEXT_opened_string;	/* try to cut out empty ()'s */
+
+/* used in determining height of processed text */
+
+static float NEXT_max_height, NEXT_min_height;
+
+
+/* process a bit of string, and return the last character used.
+ * p is start of string
+ * brace is TRUE to keep processing to }, FALSE for do one character
+ * fontname & fontsize are obvious
+ * base is the current baseline
+ * widthflag is TRUE if the width of this should count,
+ *              FALSE for zero width boxes
+ */
+
+static char *
+NEXT_recurse(p, brace, fontname, fontsize, base, widthflag)
+char *p, *fontname;
+TBOOLEAN brace, widthflag;
+double fontsize, base;
+{
+
+/* close a postscript string if it has been opened */
+#define NEXT_FLUSH      \
+{	if (NEXT_opened_string)  \
+	{	NEXTPrintf("%s", ")]\n");   \
+		NEXT_opened_string = FALSE; \
+	}                         \
+}
+
+#define NEXT_OPEN	\
+{	if (!NEXT_opened_string) \
+	{ NEXTPrintf( "[(%s) %.1f %.1f %s (",  \
+		  fontname, fontsize, base, \
+		  widthflag ? "true" : "false");  \
+	  NEXT_opened_string = TRUE; \
+	}	\
+}
+
+
+    /* Start each recursion with a clean string */
+    NEXT_FLUSH
+
+	if (base + fontsize > NEXT_max_height) {
+	NEXT_max_height = base + fontsize;
+    }
+    if (base < NEXT_min_height) {
+	NEXT_min_height = base;
+    }
+    for (; *p; ++p) {
+	float shift;
+	float f = 0;		/* used for getting new font size */
+	char *localfontname, ch;
+
+	switch (*p) {
+	case '}':
+	    if (brace)
+		return (p);
+
+	    fprintf(stderr, "next driver - spurious }\n");
+	    break;
+
+	case '_':
+	case '^':
+	    shift = (*p == '^') ? 0.5 : -0.3;
+
+	    NEXT_FLUSH
+
+		p = NEXT_recurse(p + 1, FALSE, fontname, fontsize * 0.8, base + shift * fontsize, widthflag);
+
+	    break;
+
+	case '{':
+	    /*{{{  recurse (possibly with a new font) */
+
+	    if (*++p == '/') {	/* then parse a fontname, optional fontsize */
+		while (*++p == ' ');
+		localfontname = p;
+		while ((ch = *p) > ' ' && ch != '=')
+		    ++p;
+		if (ch == '=') {
+		    *p++ = '\0';
+		    /*{{{  get optional font size */
+		    f = (float) strtod(p, &p);
+
+		    if (f)
+			f *= NEXT_SC;	/* remember the scaling */
+		    else
+			f = fontsize;
+
+		    /*}}} */
+		} else {
+		    *p++ = '\0';
+		    f = fontsize;
+		}
+
+		while (*p == ' ')
+		    ++p;
+		if (*localfontname)
+		    localfontname = NEXT_RememberFont(localfontname);
+		else
+		    localfontname = fontname;
+	    } else {
+		localfontname = fontname;
+		f = fontsize;
+	    }
+	    /*}}} */
+
+
+	    p = NEXT_recurse(p, TRUE, localfontname, f, base, widthflag);
+
+
+	    NEXT_FLUSH
+
+		break;
+
+	case '@':
+	    /*{{{  phantom box - prints next 'char', then restores currentpoint */
+
+	    NEXT_FLUSH
+
+		p = NEXT_recurse(++p, FALSE, fontname, fontsize, base, FALSE);
+
+	    break;
+	    /*}}} */
+
+	case '(':
+	case ')':
+	    /* special cases */
+	    NEXT_OPEN
+		NEXTPrintf("\\");
+	    NEXTPrintf("%c", *p);
+	    break;
+	    /*}}} */
+
+	case '\\':
+	    /*{{{  is it an escape */
+	    /* special cases */
+
+	    if (p[1] == '\\' || p[1] == '(' || p[1] == ')') {
+		NEXT_OPEN
+		    NEXTPrintf("%c", '\\');
+	    } else if ((ch = p[1]) >= '0' && ch <= '7') {
+		/* up to 3 octal digits */
+		NEXT_OPEN
+		    NEXTPrintf("%c", '\\');
+		NEXTPrintf("%c", ch);
+		++p;
+		if ((ch = p[1]) >= '0' && ch <= '7') {
+		    NEXTPrintf("%c", ch);
+		    ++p;
+		    if ((ch = p[1]) >= '0' && ch <= '7') {
+			NEXTPrintf("%c", ch);
+			++p;
+		    }
+		}
+		break;
+	    }
+	    ++p;
+	    /* just go and print it (fall into the 'default' case) */
+
+	    /*}}} */
+	default:
+	    NEXT_OPEN
+
+		NEXTPrintf("%c", *p);
+	}
+
+	/* like TeX, we only do one character in a recursion, unless it's
+	 * in braces
+	 */
+
+	if (!brace) {
+	    NEXT_FLUSH
+		return (p);	/* the ++p in the outer copy will increment us */
+	}
+    }
+    NEXT_FLUSH
+	return p;
+}
+
+
+TERM_PUBLIC void
+NEXT_put_text(x, y, str)
+unsigned int x, y;
+const char *str;
+{
+    /* flush any pending graphics (all the XShow routines do this...) */
+
+    if (!strlen(str))
+	return;
+
+    if (NEXT_path_count) {
+	NEXTPrintf(" stroke\n");
+	NEXT_path_count = 0;
+	NEXT_relative_ok = FALSE;
+    }
+    NEXT_move(x, y);
+
+    if (NEXT_ang != 0)
+	NEXTPrintf("currentpoint gsave translate %d rotate 0 0 moveto\n",
+		   NEXT_ang * 90);
+
+    NEXTPrintf("[ ");
+
+    /* set up the globals */
+
+    NEXT_opened_string = FALSE;
+    NEXT_max_height = -1000;
+    NEXT_min_height = 1000;
+
+    while (*(str = NEXT_recurse(str, TRUE, NEXT_font,
+				(double) term->v_char,
+				0.0, TRUE)));
+
+    NEXT_max_height += NEXT_min_height;
+
+    NEXTPrintf("] %.1f ", -NEXT_max_height / 3);
+
+    switch (NEXT_justify) {
+    case LEFT:
+	NEXTPrintf("MLshow\n");
+	break;
+    case CENTRE:
+	NEXTPrintf("MCshow\n");
+	break;
+    case RIGHT:
+	NEXTPrintf("MRshow\n");
+	break;
+    }
+
+    if (NEXT_ang != 0)
+	NEXTPrintf("grestore\n");
+    NEXT_path_count = 0;
+    NEXT_relative_ok = FALSE;
+}
+
+
+
+/*
+static TBOOLEAN
+NEXT_colordetect()
+{
+	NXScreen * mainscreen;
+
+	mainscreen = [Application mainScreen];
+	if (mainscreen->depth == NX_TwoBitGrayDepth) return(FALSE);
+	return(TRUE);
+}
+*/
+
+	/* This just packs all the postscript into one (possibly huge) string 
+	 * which will be passed (as a fake pointer) via D.O. to the server 
+	 */
+
+void
+NEXTPrintf(char *fmt,...)
+{
+    va_list ap;
+    char *pb;
+    int NEXToff;
+
+    /* Process formatting instructions */
+    va_start(ap, fmt);
+    vsprintf(NEXTTmpBuf, fmt, ap);
+    va_end(ap);
+
+    /* Add to buffer */
+    for (pb = NEXTTmpBuf; (*pb != 0); ++pb, ++NEXTBufAt) {
+	/* reallocate if necessary */
+	if (NEXTBufAt >= NEXTBufEnd) {
+	    NEXToff = NEXTBufAt - NEXTBuffer;
+	    NEXTsize *= 2;
+	    NEXTBuffer = realloc(NEXTBuffer, NEXTsize);
+	    NEXTBufEnd = NEXTBuffer + NEXTsize;
+	    NEXTBufAt = NEXTBuffer + NEXToff;
+	}
+	*NEXTBufAt = *pb;
+    }
+
+    return;
+
+}
+
+/*  This next section implements the GnuTermDriver object which manages
+	the D.O. connection and interface to Obj-C 
+*/
+
+
+@protocol GnuTermServerMethods
+/*- (oneway) executePScode:(in char *)PStext termTitle:(in char *)title;*/
+- (void) executePScode:(NSString *) PStext termTitle:(NSString *) title;
+@end
+
+
+@implementation GnuTermDriver
+
+- init
+{
+    NSConnection *myConnection;
+    char serverpath[100], *envstring;
+    int GnuTermPathSet = 0;
+
+
+    /* Ask OS for connection to server */
+    server = [NSConnection rootProxyForConnectionWithRegisteredName: @"gnuplotServer" host:nil];
+
+    [server retain];
+
+    /* Server is running ready to go */
+    if (server)			printf("Connected to server\n")
+	;
+
+    /* Server isn't running, we must fire it up */
+    else {
+	printf("Launching GnuTerm\n"); 
+	*serverpath = 0;
+
+	/* Check for path set in environment */
+	if ((envstring = getenv("GNUTERMPATH")) != (char *) NULL) {
+	    sprintf(serverpath, "%s/GnuTerm.app/GnuTerm", envstring);
+	    GnuTermPathSet = 1;
+	}
+	/* Not in environment */
+	else
+	    strcpy(serverpath, "GnuTerm");
+
+	/* Try to launch application */
+      if ([[NSWorkspace sharedWorkspace] launchApplication:[NSString stringWithCString:serverpath]] == NO) {
+	    printf("Failed to launch %s.\n", serverpath);
+	    /* Offer a little advice */
+	    if (GnuTermPathSet) {
+		printf("You must have setenv GNUTERMPATH to something wrong\n");
+		printf("I recommend you exit gnuplot and fix this.\n");
+	    } else {
+		printf("It must be located in ~/Apps or /LocalApps\n");
+		printf("I recommend that you either\n");
+		printf("- move GnuTerm.app to one of these locations\n");
+		printf("- set GNUTERMPATH with host%%  setenv GNUTERMPATH /directory/containing_GnuTerm.app\n");
+		printf("- start GnuTerm ahead of the first plot command\n");
+	    }
+	}
+	/* I wish the gnuplot terminal interface would 
+	   let me return an error here.
+	 */
+
+	/* Application is launching */
+	else {
+	    /* Wait for it to register Server methods with OS */
+	    do {
+	      server =[[NSConnection
+			 rootProxyForConnectionWithRegisteredName: @"gnuplotServer" host:nil] retain];
+	    } while (!server);	/* This could result in a hang, 
+				   but I've never seen it fail */
+	}
+    }
+
+
+    /* By limiting ourselves to known protocol
+     * we speed up the messaging 
+     */
+    [server setProtocolForProxy:@protocol(GnuTermServerMethods)];
+
+    myConnection = [server connectionForProxy];
+
+    /* If the server dies we want to know about it */
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(senderIsInvalid:) name:NSConnectionDidDieNotification  object:myConnection]; 
+    /* In fact, we'll worry about it */
+    ;
+
+    return self;
+}
+
+
+- (void) plot:(char *)PSstr;
+{
+    /* If server has become invalid, re-initialize */
+    if (!server)
+	[self init];
+
+    /* This is where we send the huge postscript string to the server 
+       Note:
+       The D.O. system doesn't actually give this pointer to the server.  
+       The pointer is dereferenced on the client side and the
+       resulting data is sent to the server. On the server side, 
+       space for the data is automatically allocated, and a pointer to
+       the local data is received.
+       For details check out:
+       /NextLibrary/Documentation/NextDev/GeneralRef/06_DistributedObjects/IntroDistObjects.rtf
+     */
+
+    printf("Calling server...");
+    [server executePScode: [NSString stringWithCString: PSstr]
+	    termTitle: [NSString stringWithCString: NEXT_title]];
+    printf("returned\n");
+    *NEXT_title = 0;
+}
+
+/* This gets called by OS if server goes down */
+- (void) senderIsInvalid: (NSNotification *) sender
+{
+    server = 0;
+}
+
+@end
+
+
+
+#endif /* TERM_BODY */
+
+#ifdef TERM_TABLE
+
+
+TERM_TABLE_START(next_driver)
+    "next",
+    "Interface to GnuTerm.app under NeXTstep",
+    NEXT_XMAX, NEXT_YMAX, NEXT_VCHAR, NEXT_HCHAR,
+    NEXT_VTIC, NEXT_HTIC, NEXT_options, NEXT_init, NEXT_reset,
+    NEXT_text, null_scale, NEXT_graphics, NEXT_move, NEXT_vector,
+    NEXT_linetype, NEXT_put_text, NEXT_text_angle,
+    NEXT_justify_text, NEXT_point, do_arrow, NEXT_set_font,
+    NEXT_set_pointsize
+TERM_TABLE_END(next_driver)
+
+#undef LAST_TERM
+#define LAST_TERM next_driver
+
+#endif /* TERM_TABLE */
+#endif /* TERM_PROTO_ONLY */
+
+
+
+#ifdef TERM_HELP
+START_HELP(next)
+"1 next",
+"?commands set terminal next",
+"?set terminal next",
+"?set term next",
+"?terminal next",
+"?term next",
+"?next",
+"?NeXT",
+" Several options may be set in the next driver.",
+"",
+" Syntax:",
+"       set terminal next {<mode>} {<type> } {<color>} {<dashed>}",
+"                  {\"<fontname>\"} {<fontsize>} title {\"<newtitle>\"}",
+"",
+" where <mode> is  `default`, which sets all options to their defaults;",
+" <type> is either `new` or `old`, where `old` invokes the old single window;",
+" <color> is either `color` or `monochrome`;",
+" <dashed> is either `solid` or `dashed`;",
+" \"<fontname>\" is the name of a valid PostScript font;",
+" <fontsize> is the size of the font in PostScript points; and",
+" <title> is the title for the GnuTerm window.",
+" Defaults are  `new`, `monochrome`, `dashed`, \"Helvetica\", 14pt.",
+"",
+" Examples:",
+"       set term next default",
+"       set term next 22",
+"       set term next color \"Times-Roman\" 14",
+"       set term next color \"Helvetica\" 12 title \"MyPlot\"",
+"       set term next old",
+"",
+" Pointsizes may be changed with `set linestyle`."
+END_HELP(next)
+#endif /* TERM_HELP */
diff -urN gnuplot-3.7/term/pbm.trm gnuplot-3.7.1/term/pbm.trm
--- gnuplot-3.7/term/pbm.trm	Tue Dec 15 20:21:52 1998
+++ gnuplot-3.7.1/term/pbm.trm	Tue Dec 15 20:21:52 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: pbm.trm,v 1.19 1998/06/18 14:59:21 ddenholm Exp $
+ * $Id: pbm.trm,v 1.10 1998/12/15 20:21:52 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/pc.trm gnuplot-3.7.1/term/pc.trm
--- gnuplot-3.7/term/pc.trm	Mon Dec 14 18:40:51 1998
+++ gnuplot-3.7.1/term/pc.trm	Mon Dec 14 18:40:51 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: pc.trm,v 1.20 1998/06/18 14:59:22 ddenholm Exp $
+ * $Id: pc.trm,v 1.12 1998/12/14 18:40:51 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/pm.trm gnuplot-3.7.1/term/pm.trm
--- gnuplot-3.7/term/pm.trm	Wed Dec 23 21:53:26 1998
+++ gnuplot-3.7.1/term/pm.trm	Wed Dec 23 21:53:26 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: pm.trm,v 1.13 1998/12/23 21:53:26 lhecking Exp $
  */
 
 /* GNUPLOT - pm.trm */
diff -urN gnuplot-3.7/term/png.trm gnuplot-3.7.1/term/png.trm
--- gnuplot-3.7/term/png.trm	Sun Jan 17 17:45:16 1999
+++ gnuplot-3.7.1/term/png.trm	Tue Oct 19 14:31:28 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: png.trm,v 1.13 1998/06/18 14:59:23 ddenholm Exp $
+ * $Id: png.trm,v 1.11.2.5 1999/10/19 13:31:28 lhecking Exp $
  *
  */
 
@@ -42,8 +42,8 @@
  *  png
  *
  * AUTHORS
- *  Alexander Lehmann
- *                      derived from pbm.trm by Russell Lang
+ *  Alexander Lehmann	original code,
+ *                      derived from pbm.trm by Russell Lang.
  *
  * send your comments or suggestions to (info-gnuplot@dartmouth.edu).
  *
@@ -69,16 +69,24 @@
 #endif
 
 #ifdef TERM_PROTO
-TERM_PUBLIC void PNGoptions __PROTO((void));
-TERM_PUBLIC void PNGinit __PROTO((void));
-TERM_PUBLIC void PNGreset __PROTO((void));
-TERM_PUBLIC void PNGsetfont __PROTO((void));
-TERM_PUBLIC void PNGgraphics __PROTO((void));
-TERM_PUBLIC void PNGtext __PROTO((void));
-TERM_PUBLIC void PNGlinetype __PROTO((int linetype));
-TERM_PUBLIC void PNGpoint __PROTO((unsigned int x, unsigned int y, int point));
+TERM_PUBLIC void PNG_options __PROTO((void));
+TERM_PUBLIC void PNG_init __PROTO((void));
+TERM_PUBLIC void PNG_reset __PROTO((void));
+TERM_PUBLIC void PNG_setfont __PROTO((void));
+TERM_PUBLIC void PNG_graphics __PROTO((void));
+TERM_PUBLIC void PNG_text __PROTO((void));
+TERM_PUBLIC void PNG_linetype __PROTO((int linetype));
+TERM_PUBLIC void PNG_point __PROTO((unsigned int x, unsigned int y, int point));
 #endif /* TERM_PROTO */
 
+/* make XMAX and YMAX a multiple of 8 */
+#define PNG_XMAX (640)
+#define PNG_YMAX (480)
+#define PNG_VCHAR (FNT5X9_VCHAR)
+#define PNG_HCHAR (FNT5X9_VCHAR)
+#define PNG_VTIC FNT5X9_HBITS
+#define PNG_HTIC FNT5X9_HBITS
+
 #ifdef TERM_BODY
 
 #include "png.h"
@@ -90,18 +98,6 @@
 
 /* png version test now in configure */
 
-/* From version.c */
-extern char version[];
-extern char patchlevel[];
-
-/* make XMAX and YMAX a multiple of 8 */
-#define PNG_XMAX (640)
-#define PNG_YMAX (480)
-#define PNG_VCHAR (FNT5X9_VCHAR)
-#define PNG_HCHAR (FNT5X9_VCHAR)
-#define PNG_VTIC FNT5X9_HBITS
-#define PNG_HTIC FNT5X9_HBITS
-
 static int png_font = 1;	/* small font */
 static int png_mode = 0;	/* 0:monochrome 1:gray 2:color */
 
@@ -111,9 +107,10 @@
 static int png_color_table[] ={ 15, 8, 3, 5, 6, 4, 2, 1, 11, 13, 14 };	/* colors */
 static png_color png_palette[16];
 
-void PNGoptions()
+TERM_PUBLIC void
+PNG_options()
 {
-    png_font = 1;
+    png_font = 1;	/* small */
     png_mode = 0;
 
     term_options[0] = NUL;
@@ -136,7 +133,7 @@
 	    /* reset to default, since term is already set */
 	    png_font = 1;
 	    png_mode = 0;
-	    int_error("expecting: {small, medium, large} and {monochrome, gray, color}", c_token);
+	    int_error("expecting: {small, medium, large}, or {monochrome, gray, color}", c_token);
 	}
 	c_token++;
     }
@@ -144,38 +141,43 @@
     /* setup options string */
 
     switch (png_font) {
-    case 1:
-	strcat(term_options, "small");
+    case 3:
+	strcat(term_options, "large");
 	break;
     case 2:
 	strcat(term_options, "medium");
 	break;
-    case 3:
-	strcat(term_options, "large");
+    case 1:
+    default:
+	strcat(term_options, "small");
 	break;
     }
 
     switch (png_mode) {
-    case 0:
-	strcat(term_options, " monochrome");
+    case 2:
+	strcat(term_options, " color");
 	break;
     case 1:
 	strcat(term_options, " gray");
 	break;
-    case 2:
-	strcat(term_options, " color");
+    case 0:
+    default:
+	strcat(term_options, " monochrome");
 	break;
     }
+
 }
 
 
-void PNGinit()
+TERM_PUBLIC void
+PNG_init()
 {
-    PNGsetfont();		/* HBB 980226: do this here! */
+    PNG_setfont();		/* HBB 980226: do this here! */
 }
 
 
-void PNGreset()
+TERM_PUBLIC void
+PNG_reset()
 {
 #ifdef VMS
     fflush_binary();
@@ -183,15 +185,16 @@
 }
 
 
-void PNGsetfont()
+TERM_PUBLIC void
+PNG_setfont()
 {
     switch (png_font) {
-    case 1:
-	b_charsize(FNT5X9);
-	term->v_char = FNT5X9_VCHAR;
-	term->h_char = FNT5X9_HCHAR;
-	term->v_tic = FNT5X9_HBITS;
-	term->h_tic = FNT5X9_HBITS;
+    case 3:
+	b_charsize(FNT13X25);
+	term->v_char = FNT13X25_VCHAR;
+	term->h_char = FNT13X25_HCHAR;
+	term->v_tic = FNT13X25_HBITS;
+	term->h_tic = FNT13X25_HBITS;
 	break;
     case 2:
 	b_charsize(FNT9X17);
@@ -200,30 +203,33 @@
 	term->v_tic = FNT9X17_HBITS;
 	term->h_tic = FNT9X17_HBITS;
 	break;
-    case 3:
-	b_charsize(FNT13X25);
-	term->v_char = FNT13X25_VCHAR;
-	term->h_char = FNT13X25_HCHAR;
-	term->v_tic = FNT13X25_HBITS;
-	term->h_tic = FNT13X25_HBITS;
+    case 1:
+    default:
+	b_charsize(FNT5X9);
+	term->v_char = FNT5X9_VCHAR;
+	term->h_char = FNT5X9_HCHAR;
+	term->v_tic = FNT5X9_HBITS;
+	term->h_tic = FNT5X9_HBITS;
 	break;
     }
 }
 
 
-void PNGgraphics()
+TERM_PUBLIC void
+PNG_graphics()
 {
-    int numplanes;
+    int numplanes = 1;
 
     switch (png_mode) {
-    case 0:
-	numplanes = 1;
+    case 2:
+	numplanes = 4;
 	break;
     case 1:
 	numplanes = 3;
 	break;
-    case 2:
-	numplanes = 4;
+    case 0:
+    default:
+	numplanes = 1;
 	break;
     }
 
@@ -239,7 +245,8 @@
 	b_setlinetype(0);	/* solid lines */
 }
 
-void PNGtext()
+TERM_PUBLIC void
+PNG_text()
 {
     register int x, j, row;
     png_structp png_ptr;
@@ -274,8 +281,12 @@
 	b_freebitmap();
 	return;
     }
+
+#ifdef __OLD_PNGLIB__
+   /* deprecated and no longer necessary */        
     png_info_init(info_ptr);
-    png_write_init(png_ptr);
+    png_write_init(png_ptr); */
+#endif /* __OLD_PNGLIB__ */
 
     png_init_io(png_ptr, gpoutfile);
 
@@ -319,7 +330,8 @@
 	    png_palette[i].green = green * 85;
 	    png_palette[i].blue = blue * 85;
 	}
-    sprintf(text, "gnuplot %sversion %s patchlevel %s", OS, version, patchlevel);
+    sprintf(text, "gnuplot %sversion %s patchlevel %s",
+	    OS, version, patchlevel);
 
     pngtext.compression = -1;
     pngtext.key = "Software";
@@ -383,27 +395,31 @@
     b_freebitmap();
 }
 
-void PNGlinetype(linetype)
+
+TERM_PUBLIC void
+PNG_linetype(linetype)
 int linetype;
 {
     switch (png_mode) {
-    case 0:
-	b_setlinetype(linetype);
+    case 2:
+	if (linetype >= 9)
+	    linetype %= 9;
+	b_setvalue(png_color_table[linetype + 2]);
 	break;
     case 1:
 	if (linetype >= 7)
 	    linetype %= 7;
 	b_setvalue(png_gray[linetype + 2]);
 	break;
-    case 2:
-	if (linetype >= 9)
-	    linetype %= 9;
-	b_setvalue(png_color_table[linetype + 2]);
+    case 0:
+    default:
+	b_setlinetype(linetype);
 	break;
     }
 }
 
-void PNGpoint(x, y, point)
+TERM_PUBLIC void
+PNG_point(x, y, point)
 unsigned int x, y;
 int point;
 {
@@ -421,10 +437,10 @@
     "png",
     "Portable Network Graphics [small medium large] [monochrome gray color]",
     PNG_XMAX, PNG_YMAX, PNG_VCHAR,
-    PNG_HCHAR, PNG_VTIC, PNG_HTIC, PNGoptions,
-    PNGinit, PNGreset, PNGtext, null_scale,
-    PNGgraphics, b_move, b_vector, PNGlinetype,
-    b_put_text, b_text_angle, null_justify_text, PNGpoint,
+    PNG_HCHAR, PNG_VTIC, PNG_HTIC, PNG_options,
+    PNG_init, PNG_reset, PNG_text, null_scale,
+    PNG_graphics, b_move, b_vector, PNG_linetype,
+    b_put_text, b_text_angle, null_justify_text, PNG_point,
     do_arrow, set_font_null,
     0,				/* pointsize */
     TERM_CAN_MULTIPLOT | TERM_BINARY
@@ -452,6 +468,7 @@
 "       set terminal png {small | medium | large}",
 "                        {monochrome | gray | color}",
 "",
-" The defaults are small (fontsize) and monochrome."
+" The defaults are small (fontsize) and monochrome.  Default size of the output",
+" is 640*480 pixel."
 END_HELP(png)
 #endif /* TERM_HELP */
diff -urN gnuplot-3.7/term/post.trm gnuplot-3.7.1/term/post.trm
--- gnuplot-3.7/term/post.trm	Tue Jan 12 19:16:54 1999
+++ gnuplot-3.7.1/term/post.trm	Thu Aug 19 15:16:33 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: post.trm,v 1.46 1998/06/18 14:59:23 ddenholm Exp $
+ * $Id: post.trm,v 1.21.2.1 1999/08/19 14:16:33 lhecking Exp $
  */
 
 /* GNUPLOT - post.trm */
@@ -162,16 +162,17 @@
 "/DL { Color {setrgbcolor Solid {pop []} if 0 setdash }\n",
 " {pop pop pop Solid {pop []} if 0 setdash} ifelse } def\n",
 /* Border Lines */
-"/BL { stroke gnulinewidth 2 mul setlinewidth } def\n",
+"/BL { stroke userlinewidth 2 mul setlinewidth } def\n",
 /* Axes Lines */
-"/AL { stroke gnulinewidth 2 div setlinewidth } def\n",
+"/AL { stroke userlinewidth 2 div setlinewidth } def\n",
 /* set user defined linewidth */
-"/UL { gnulinewidth mul /userlinewidth exch def } def\n",
+"/UL { dup gnulinewidth mul /userlinewidth exch def\n",
+"      10 mul /udl exch def } def\n",
 /* Plot Lines */
 "/PL { stroke userlinewidth setlinewidth } def\n",
 /* Line Types */
 "/LTb { BL [] 0 0 0 DL } def\n", /* border */
-"/LTa { AL [1 dl 2 dl] 0 setdash 0 0 0 setrgbcolor } def\n", /* axes */
+"/LTa { AL [1 udl mul 2 udl mul] 0 setdash 0 0 0 setrgbcolor } def\n", /* axes */
 "/LT0 { PL [] 1 0 0 DL } def\n",
 "/LT1 { PL [4 dl 2 dl] 0 1 0 DL } def\n",
 "/LT2 { PL [2 dl 3 dl] 0 0 1 DL } def\n",
diff -urN gnuplot-3.7/term/pslatex.trm gnuplot-3.7.1/term/pslatex.trm
--- gnuplot-3.7/term/pslatex.trm	Tue Jan 12 19:16:59 1999
+++ gnuplot-3.7.1/term/pslatex.trm	Fri Oct  1 19:22:37 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: pslatex.trm,v 1.35 1998/06/18 14:59:24 ddenholm Exp $
+ * $Id: pslatex.trm,v 1.15.2.2 1999/10/01 18:22:37 lhecking Exp $
  */
 
 /* GNUPLOT - pslatex.trm */
@@ -91,7 +91,7 @@
 static int PSLATEX_rotate = TRUE;
 static char *PSLATEX_psfile = NULL;
 static TBOOLEAN PSLATEX_useAuxFile = FALSE;	/* do we write two files? */
-static FILE *PSLATEX_auxFile;
+static FILE *PSLATEX_auxFile = NULL;
 static TBOOLEAN PSLATEX_output = TRUE;	/* do we write LaTeX? */
 
 struct text_command {
@@ -176,34 +176,41 @@
     if (strcmp(term->name, "pstex") == 0)
 	PSLATEX_output = FALSE;
 
-    PSLATEX_auxFile = NULL;	/* until we know otherwise */
+    /* until we know otherwise */
+    PSLATEX_auxFile = NULL;
+
     /* dont tweak PSLATEX_useAuxFile if we decide we cannot comply
      * since this affects subsequent plots even after a set out
      * Instead, we will use PSLATEX_auxFile != NULL to indicate
      * use of an aux file
      */
 
+    /* if there's no extension, append ".ps" */
+    if ((dotIndex = strrchr(outstr, '.')) == NULL)
+	dotIndex = strchr(outstr, NUL);
+
     /* try to open the auxiliary file for the postscript parts. */
-    if (outstr && PSLATEX_useAuxFile == TRUE &&
-	(dotIndex = strrchr(outstr, '.'))) {
+    if (outstr && PSLATEX_useAuxFile == TRUE) {
 
-	/* assume file name is ending in ".tex" */
-	if (PSLATEX_psfile)
-	    free(PSLATEX_psfile);
-	PSLATEX_psfile = gp_alloc(dotIndex - outstr + 3, "pslatex aux filename");
+	/* length of outstr plus ('.' or '\0') plus "ps" plus '\0' */
+	PSLATEX_psfile = gp_realloc (PSLATEX_psfile,(dotIndex - outstr) + 4,"pslatex aux filename");
 	if (PSLATEX_psfile) {
-	/* including . */
-	    safe_strncpy(PSLATEX_psfile, outstr, dotIndex - outstr + 1);
-	    strcpy(PSLATEX_psfile + (dotIndex - outstr) + 1, "ps");
-	    if ((PSLATEX_auxFile = fopen(PSLATEX_psfile, "w")) == (FILE *) NULL) {
+	    /* include period or '\0' */
+	    strncpy(PSLATEX_psfile, outstr, (dotIndex - outstr) + 1);
+	    /* period or '\0' is overwritten with period, and "ps" appended */
+	    strcpy(PSLATEX_psfile + (dotIndex - outstr), ".ps");
+	    PSLATEX_auxFile = fopen(PSLATEX_psfile, "w");
+	    if (PSLATEX_auxFile  == (FILE *) NULL) {
 		fprintf(stderr, "Cannot open aux file %s for output\n",
 			PSLATEX_psfile);
+		/* And what? Error handling????? */
 	    }
 	} else {
 	    fprintf(stderr, "\
 Cannot make PostScript file name from %s\n\
 Turning off auxfile option\n", outstr);
 	    PSLATEX_auxFile = NULL;
+	    /* NEW! */ PSLATEX_useAuxFile = FALSE;
 	}
     }
     if (PSLATEX_output) {
@@ -272,24 +279,39 @@
     struct termentry *t = term;
 
     if (PSLATEX_output)
-	fprintf(gpoutfile, "\\begin{picture}(%d,%d)(0,0)%%\n", (int) (xsize * t->xmax), (int)
-		(ysize * t->ymax));
+	fprintf(gpoutfile, "\\begin{picture}(%d,%d)(0,0)%%\n",
+		(int) (xsize * t->xmax), (int) (ysize * t->ymax));
     else
-	fprintf(gpoutfile, "\\GNUPLOTpicture(%d,%d)\n", (int) (xsize * t->xmax), (int) (ysize * t->ymax));
+	fprintf(gpoutfile, "\\GNUPLOTpicture(%d,%d)\n",
+		(int) (xsize * t->xmax), (int) (ysize * t->ymax));
 
     if (PSLATEX_auxFile) {
 	FILE *tmp;
-	/*
-	 * these are taken from the post.trm file computation
-	 * of the bounding box, but without the X_OFF and Y_OFF
-	 */
-	int urx = (int) (xsize * (PS_XMAX) / PS_SC + 0.5), ury = (int) (ysize * (PS_YMAX) / PS_SC
-									+ 0.5);
+	/* these are taken from the post.trm file computation
+	 * of the bounding box, but without the X_OFF and Y_OFF */
+	int urx = (int) (xsize * (PS_XMAX) / PS_SC + 0.5);
+	int ury = (int) (ysize * (PS_YMAX) / PS_SC + 0.5);
+	/* moved this code here from beginning of the function
+	 * PSLATEX_psfile is only != NULL with the `auxfile' option */
+	char *psfile_basename = strrchr(PSLATEX_psfile, DIRSEP1);
+
+	if (psfile_basename)
+	    psfile_basename++;
+	else {
+	    if (DIRSEP2 != NUL) {
+		psfile_basename = strrchr(PSLATEX_psfile, DIRSEP2);
+		if (psfile_basename)
+		    psfile_basename++;
+		else
+		    psfile_basename = PSLATEX_psfile;
+	    } else
+		psfile_basename = PSLATEX_psfile;
+	}
 
 	/* generate special which xdvi and dvips can handle */
 	fprintf(gpoutfile,
 		"\\special{psfile=%s llx=0 lly=0 urx=%d ury=%d rwi=%d}\n",
-		PSLATEX_psfile, urx, ury, 10 * urx);
+		psfile_basename, urx, ury, 10 * urx);
 	tmp = gpoutfile;
 	gpoutfile = PSLATEX_auxFile;
 	PS_graphics();
@@ -601,9 +623,9 @@
 " This is useful if your pictures are large enough that dvips cannot handle",
 " them.  The name of the auxiliary PostScript file is derived from the name of",
 " the TeX file given on the `set output` command; it is determined by replacing",
-" the trailing `.tex` (actually just the final extent in the file name---and",
-" the option will be turned off if there is no extent) with `.ps` in the output",
-" file name.  Remember to close the file before leaving `gnuplot`.",
+" the trailing `.tex` (actually just the final extent in the file name) with",
+" `.ps` in the output file name, or, if the TeX file has no extension, `.ps`",
+" is appended.  Remember to close the file before leaving `gnuplot`.",
 "",
 " All drivers for LaTeX offer a special way of controlling text positioning:",
 " If any text string begins with '{', you also need to include a '}' at the",
diff -urN gnuplot-3.7/term/pstricks.trm gnuplot-3.7.1/term/pstricks.trm
--- gnuplot-3.7/term/pstricks.trm	Tue Jan 12 19:17:05 1999
+++ gnuplot-3.7.1/term/pstricks.trm	Thu Aug 19 15:15:55 1999
@@ -1,6 +1,6 @@
 /* Hey Emacs this is -*- C -*-
  * 
- * $Id: pstricks.trm,v 1.16 1998/06/18 14:59:25 ddenholm Exp $
+ * $Id: pstricks.trm,v 1.12.2.1 1999/08/19 14:15:55 lhecking Exp $
  */
 
 /* GNUPLOT - pstricks.trm */
@@ -417,7 +417,7 @@
 	 * is in scientific notation
 	 */
 
-	safe_strncpy(hack, s, ends - s);
+	safe_strncpy(hack, s, ends - s + 1);
 	/* hack[ends - s] = '\0'; */
 
 	ptr = strchr(hack, 'e');
diff -urN gnuplot-3.7/term/qms.trm gnuplot-3.7.1/term/qms.trm
--- gnuplot-3.7/term/qms.trm	Wed Nov 25 21:07:51 1998
+++ gnuplot-3.7.1/term/qms.trm	Wed Nov 25 21:07:51 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: qms.trm,v 1.14 1998/04/14 00:18:05 drd Exp $
+ * $Id: qms.trm,v 1.6 1998/11/25 21:07:51 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/regis.trm gnuplot-3.7.1/term/regis.trm
--- gnuplot-3.7/term/regis.trm	Wed Nov 25 21:07:58 1998
+++ gnuplot-3.7.1/term/regis.trm	Wed Nov 25 21:07:58 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: regis.trm,v 1.18 1998/04/14 00:18:06 drd Exp $
+ * $Id: regis.trm,v 1.6 1998/11/25 21:07:58 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/rgip.trm gnuplot-3.7.1/term/rgip.trm
--- gnuplot-3.7/term/rgip.trm	Mon Dec 14 18:41:12 1998
+++ gnuplot-3.7.1/term/rgip.trm	Mon Dec 14 18:41:12 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: rgip.trm,v 1.16 1998/04/14 00:18:06 drd Exp $
+ * $Id: rgip.trm,v 1.8 1998/12/14 18:41:12 lhecking Exp $
  */
 
 /* GNUPLOT - rgip.trm Uniplex graphics metafile */
diff -urN gnuplot-3.7/term/sun.trm gnuplot-3.7.1/term/sun.trm
--- gnuplot-3.7/term/sun.trm	Mon Dec 14 18:41:16 1998
+++ gnuplot-3.7.1/term/sun.trm	Mon Dec 14 18:41:16 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: sun.trm,v 1.15 1998/04/14 00:18:07 drd Exp $
+ * $Id: sun.trm,v 1.6 1998/12/14 18:41:16 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/t410x.trm gnuplot-3.7.1/term/t410x.trm
--- gnuplot-3.7/term/t410x.trm	Thu Nov 26 19:02:59 1998
+++ gnuplot-3.7.1/term/t410x.trm	Thu Nov 26 19:02:59 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: t410x.trm,v 1.16 1998/04/14 00:18:07 drd Exp $
+ * $Id: t410x.trm,v 1.7 1998/11/26 19:02:59 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/table.trm gnuplot-3.7.1/term/table.trm
--- gnuplot-3.7/term/table.trm	Wed Nov 25 21:08:17 1998
+++ gnuplot-3.7.1/term/table.trm	Wed Nov 25 21:08:17 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: table.trm,v 1.5 1998/06/18 14:59:25 ddenholm Exp $
+ * $Id: table.trm,v 1.7 1998/11/25 21:08:17 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/tek.trm gnuplot-3.7.1/term/tek.trm
--- gnuplot-3.7/term/tek.trm	Mon Dec 14 18:41:23 1998
+++ gnuplot-3.7.1/term/tek.trm	Mon Dec 14 18:41:23 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: tek.trm,v 1.20 1998/04/14 00:18:07 drd Exp $
+ * $Id: tek.trm,v 1.8 1998/12/14 18:41:23 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/texdraw.trm gnuplot-3.7.1/term/texdraw.trm
--- gnuplot-3.7/term/texdraw.trm	Mon Dec 14 18:41:27 1998
+++ gnuplot-3.7.1/term/texdraw.trm	Mon Dec 14 18:41:27 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: texdraw.trm,v 1.15 1998/06/18 14:59:26 ddenholm Exp $
+ * $Id: texdraw.trm,v 1.9 1998/12/14 18:41:27 lhecking Exp $
  */
 
 /* GNUPLOT - texdraw.trm */
diff -urN gnuplot-3.7/term/tgif.trm gnuplot-3.7.1/term/tgif.trm
--- gnuplot-3.7/term/tgif.trm	Wed Dec 16 19:48:20 1998
+++ gnuplot-3.7.1/term/tgif.trm	Wed Dec 16 19:48:20 1998
@@ -1,7 +1,7 @@
 /*{{{}}}*/
 /***************************************************************************/
 /*                                                                         */
-/* $Id: tgif.trm,v 1.66 1998/04/14 00:18:10 drd Exp $                     */
+/* $Id: tgif.trm,v 1.10 1998/12/16 19:48:20 lhecking Exp $                     */
 /*                                                                         */
 /***************************************************************************/
 /* GNUPLOT - tgif.trm                                                      */
@@ -371,7 +371,7 @@
     fprintf(gpoutfile, "\
 %%TGIF 2.15-p7\n\
 state(%d,30,%u,0,0,%u,16,1,9,1,1,0,0,0,0,1,0,'%s',0,%u,0,0,1,10,0,0,1,1,0,16,0,0,1,1,1).\n\
-%%\n%% @(#)$Header: /export/home/cheetah/ddenholm/cvsroot/gnuplot/term/tgif.trm,v 1.66 1998/04/14 00:18:10 drd Exp $\n%% %%W%%\n%%\n\
+%%\n%% @(#)$Header: /var/tmp/CVSROOT/gnuplot/term/tgif.trm,v 1.10 1998/12/16 19:48:20 lhecking Exp $\n%% %%W%%\n%%\n\
 page(1,\"\").\n",
 	    TgifPortrait ? 0 : 1, uActResolution, uActZoom, sActFont, uActFontSize);
     eTgifState = NEWPOLY;
diff -urN gnuplot-3.7/term/tkcanvas.trm gnuplot-3.7.1/term/tkcanvas.trm
--- gnuplot-3.7/term/tkcanvas.trm	Wed Nov 25 21:08:25 1998
+++ gnuplot-3.7.1/term/tkcanvas.trm	Tue Oct 19 17:00:51 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: tkcanvas.trm,v 1.7 1998/04/14 00:18:11 drd Exp $
+ * $Id: tkcanvas.trm,v 1.6.2.3 1999/10/19 16:00:51 lhecking Exp $
  *
  */
 
@@ -57,6 +57,21 @@
  * adapted to the new terminal layout by Alex Woo (Sept. 1996)
  */
 
+/*
+ * extended interactive Tk/Tcl capabilities 
+ * Thomas Sefzick, March 1999, t.sefzick@fz-juelich.de
+ *
+ * added the perltk.trm code written by Slaven Rezic <eserte@cs.tu-berlin.de>,
+ * the variable 'tk_perl' switches between tcl/tk and perltk code.
+ * 'linewidth' and 'justify text' added, ends of plotted lines are now rounded.
+ * if 'perltk' is chosen, perl code is produced, otherwise tcl code.
+ * Thomas Sefzick, May 1999, t.sefzick@fz-juelich.de
+ *
+ * scale plot to fit into the actual size of the canvas as reported by
+ * the window manager (the canvas itself doesn't report its real size).
+ * Matt Willis, October 1999, mattbwillis@my-deja.com
+ */
+
 #include "driver.h"
 
 #ifdef TERM_REGISTER
@@ -64,6 +79,7 @@
 #endif
 
 #ifdef TERM_PROTO
+TERM_PUBLIC void TK_options __PROTO((void));
 TERM_PUBLIC void TK_init __PROTO((void));
 TERM_PUBLIC void TK_graphics __PROTO((void));
 TERM_PUBLIC void TK_text __PROTO((void));
@@ -72,6 +88,9 @@
 TERM_PUBLIC void TK_vector __PROTO((unsigned int x, unsigned int y));
 TERM_PUBLIC void TK_put_text __PROTO((unsigned int x, unsigned int y, char *str));
 TERM_PUBLIC void TK_reset __PROTO((void));
+TERM_PUBLIC int TK_justify_text __PROTO((enum JUSTIFY));
+TERM_PUBLIC int TK_set_font __PROTO((char *font));
+TERM_PUBLIC void TK_linewidth __PROTO((double linewidth));
 
 #define TK_XMAX 1000
 #define TK_YMAX 1000
@@ -88,89 +107,474 @@
 #ifndef TERM_PROTO_ONLY
 #ifdef TERM_BODY
 
-static int tk_angle = 0;
+/* plot2d.c */
+extern double min_array[], max_array[], base_array[], log_base_array[];
+extern TBOOLEAN log_array[];
+/* graphics.c */
+extern int xleft, xright, ybot, ytop;
+extern TBOOLEAN is_3d_plot;
+
+/* static int tk_angle = 0; unused, for now */
 static int tk_lastx;
 static int tk_lasty;
 static int tk_color = 0;
-static char *tk_colors[] = { "black", "gray", "red", "blue", "green", "brown", "magenta", "cyan" };
+static char tk_anchor[7] = "w";
+static double tk_linewidth = 1.0;
+static int tk_perl = 0;
+static int tk_interactive = 0;
+static char *tk_colors[] = {
+    "black", "gray", "red", "blue", "green", "brown", "magenta", "cyan"
+};
 
-TERM_PUBLIC void TK_init()
+TERM_PUBLIC void
+TK_options()
 {
-    fputs("\
-proc gnuplot can {\n\
-$can delete all\n\
-set cmx [lindex [$can configure -width] 4]\n\
-set cmy [lindex [$can configure -height] 4]\n",
-	  gpoutfile);
+    tk_perl = 0;
+    tk_interactive = 0;
 
-    tk_lastx = tk_lasty = tk_color = 0;
+    if (!END_OF_COMMAND) {
+	if (almost_equals(c_token, "p$erltk")) {
+	    tk_perl = 1;
+	    c_token++;
+	}
+	if (almost_equals(c_token, "i$nteractive")) {
+	    tk_interactive = 1;
+	    c_token++;
+	}
+    }
+
+    sprintf(term_options, "%s %s",
+	    tk_perl ? "perltk" : "",
+	    tk_interactive ? "interactive" : "");
 }
 
-
-TERM_PUBLIC void TK_graphics()
+TERM_PUBLIC void
+TK_init()
 {
 }
 
+TERM_PUBLIC void
+TK_graphics()
+{
+	/*
+	* the resulting tcl or perl code takes the actual width and height
+	* of the defined canvas and scales the plot to fit.
+	* => NOTE: this makes 'set size' useless !!!
+	* unless the original width and height is taken into account
+	* by some tcl or perl code, that's why the 'gnuplot_plotarea' and
+	* 'gnuplot_axisranges' procedures are supplied.
+	*/
+    if (tk_perl) {
+	fputs("\
+sub gnuplot {\n\
+my($can) = @_;\n\
+$can->delete('all');\n\
+my $cmx = ($can->configure(-width))[4];\n\
+my $cmy = ($can->configure(-height))[4];\n\
+my $cmx = $can->width - 2 * $can->cget(-border);\n\
+if ($cmx <= 1) {\n$cmx = ($can->cget(-width));\n}\n\
+my $cmy = $can->height - 2 * $can->cget(-border);\n\
+if ($cmy <= 1) {\n$cmy = ($can->cget(-height));\n}\n",
+	      gpoutfile);
+    } else {
+	fputs("\
+proc gnuplot can {\n\
+$can delete all\n\
+set cmx [expr [winfo width $can]-2*[$can cget -border]]\n\
+if {$cmx <= 1} {set cmx [$can cget -width]}\n\
+set cmy [expr [winfo height $can]-2*[$can cget -border]]\n\
+if {$cmy <= 1} {set cmy [$can cget -height]}\n",
+	      gpoutfile);
+    }
+    tk_lastx = tk_lasty = tk_color = 0;
+}
 
-TERM_PUBLIC void TK_reset()
+TERM_PUBLIC void
+TK_reset()
 {
 }
 
-TERM_PUBLIC void TK_linetype(linetype)
+TERM_PUBLIC void
+TK_linetype(linetype)
 int linetype;
 {
     tk_color = (linetype + 2) & 7;
 }
 
-TERM_PUBLIC void TK_move(x, y)
+TERM_PUBLIC void
+TK_linewidth(linewidth)
+double linewidth;
+{
+    tk_linewidth = linewidth;
+}
+
+TERM_PUBLIC void
+TK_move(x, y)
 unsigned int x, y;
 {
     tk_lastx = x;
     tk_lasty = 1000 - y;
 }
 
+#define TK_REAL_VALUE(value,axis) \
+ (log_array[axis])\
+ ?pow(base_array[axis],min_array[axis]+value*(max_array[axis]-min_array[axis]))\
+ :min_array[axis]+value*(max_array[axis]-min_array[axis])
+
+#define TK_X_VALUE(value) \
+ (double)(value-xleft)/(double)(xright-xleft)
 
-TERM_PUBLIC void TK_vector(x, y)
+#define TK_Y_VALUE(value) \
+ (double)((TK_YMAX-value)-ybot)/(double)(ytop-ybot)
+
+TERM_PUBLIC void
+TK_vector(x, y)
 unsigned int x, y;
 {
+	/*
+	* this is the 1st part of the wrapper around the 'create line' command
+	* used to bind some actions to a line segment:
+	* bind {
+	*      normal create line command
+	*      } gnuplot_xy(some coordinates)
+	*/
+    if (tk_interactive && !is_3d_plot) {
+	if (tk_perl)
+	    fprintf(gpoutfile, "$can->bind(");
+	else
+	    fprintf(gpoutfile, "$can bind [\n");
+    }
+	/*
+	 * end of 1st part of wrapper
+	 */
     y = 1000 - y;
-    fprintf(gpoutfile,
-	    "$can create line [expr $cmx * %d /1000] [expr $cmy * %d /1000] [expr $cmx * %d /1000] [expr $cmy * %d /1000] -fill %s\n",
-	    tk_lastx, tk_lasty, x, y, tk_colors[tk_color]);
+	/*
+	 * here is the basic well-known command for plotting a line segment
+	 */
+    if (tk_perl) {
+	fprintf(gpoutfile,"\
+$can->createLine(\
+$cmx * %d / 1000, \
+$cmy * %d / 1000, \
+$cmx * %d / 1000, \
+$cmy * %d / 1000, -fill => q{%s}, -width => %f, -capstyle => q{round})",
+		tk_lastx, tk_lasty, x, y, tk_colors[tk_color], tk_linewidth);
+    } else {
+	fprintf(gpoutfile,"\
+$can create line \
+[expr $cmx * %d /1000] \
+[expr $cmy * %d /1000] \
+[expr $cmx * %d /1000] \
+[expr $cmy * %d /1000] -fill %s -width %f -capstyle round\n",
+		tk_lastx, tk_lasty, x, y, tk_colors[tk_color], tk_linewidth);
+    }
+
+	/*
+	 * this is the 2nd part of the wrapper around the 'create line'
+	 * command, it generates a mechanism which calls 'gnuplot_xy' for
+	 * the line segment pointed to by the mouse cursor when a mouse
+	 * button is pressed 
+	 */
+    if (tk_interactive && !is_3d_plot) {
+	if (tk_perl) {
+	    /* Ev('W') not needed here, supplied anyhow, WHY ??? */
+	    fprintf(gpoutfile,"\
+, '<Button>' => \
+[\\&gnuplot_xy, %f, %f, %f, %f, %f, %f, %f, %f,",
+		    TK_REAL_VALUE(TK_X_VALUE(tk_lastx), FIRST_X_AXIS),
+		    TK_REAL_VALUE(TK_Y_VALUE(tk_lasty), FIRST_Y_AXIS),
+		    TK_REAL_VALUE(TK_X_VALUE(tk_lastx), SECOND_X_AXIS),
+		    TK_REAL_VALUE(TK_Y_VALUE(tk_lasty), SECOND_Y_AXIS),
+		    TK_REAL_VALUE(TK_X_VALUE(x), FIRST_X_AXIS),
+		    TK_REAL_VALUE(TK_Y_VALUE(y), FIRST_Y_AXIS),
+		    TK_REAL_VALUE(TK_X_VALUE(x), SECOND_X_AXIS),
+		    TK_REAL_VALUE(TK_Y_VALUE(y), SECOND_Y_AXIS));
+	    if (log_array[FIRST_X_AXIS]) {
+		fprintf(gpoutfile, " %f,",
+			TK_REAL_VALUE(TK_X_VALUE(0.5 * (x + tk_lastx)), FIRST_X_AXIS));
+	    } else {
+		fprintf(gpoutfile, " \"\",");
+	    }
+	    if (log_array[FIRST_Y_AXIS]) {
+		fprintf(gpoutfile, " %f,",
+			TK_REAL_VALUE(TK_Y_VALUE(0.5 * (y + tk_lasty)), FIRST_Y_AXIS));
+	    } else {
+		fprintf(gpoutfile, " \"\",");
+	    }
+	    if (log_array[SECOND_X_AXIS]) {
+		fprintf(gpoutfile, " %f,",
+			TK_REAL_VALUE(TK_X_VALUE(0.5 * (x + tk_lastx)), SECOND_X_AXIS));
+	    } else {
+		fprintf(gpoutfile, " \"\",");
+	    }
+	    if (log_array[SECOND_Y_AXIS]) {
+		fprintf(gpoutfile, " %f",
+			TK_REAL_VALUE(TK_Y_VALUE(0.5 * (y + tk_lasty)), SECOND_Y_AXIS));
+	    } else {
+		fprintf(gpoutfile, " \"\"");
+	    }
+	    fprintf(gpoutfile, "]);\n");
+	} else {
+	    fprintf(gpoutfile,"\
+] <Button> \
+\"gnuplot_xy %%W %f %f %f %f %f %f %f %f",
+		    TK_REAL_VALUE(TK_X_VALUE(tk_lastx), FIRST_X_AXIS),
+		    TK_REAL_VALUE(TK_Y_VALUE(tk_lasty), FIRST_Y_AXIS),
+		    TK_REAL_VALUE(TK_X_VALUE(tk_lastx), SECOND_X_AXIS),
+		    TK_REAL_VALUE(TK_Y_VALUE(tk_lasty), SECOND_Y_AXIS),
+		    TK_REAL_VALUE(TK_X_VALUE(x), FIRST_X_AXIS),
+		    TK_REAL_VALUE(TK_Y_VALUE(y), FIRST_Y_AXIS),
+		    TK_REAL_VALUE(TK_X_VALUE(x), SECOND_X_AXIS),
+		    TK_REAL_VALUE(TK_Y_VALUE(y), SECOND_Y_AXIS));
+	    if (log_array[FIRST_X_AXIS]) {
+		fprintf(gpoutfile, " %f",
+			TK_REAL_VALUE(TK_X_VALUE(0.5 * (x + tk_lastx)), FIRST_X_AXIS));
+	    } else {
+		fprintf(gpoutfile, " {}");
+	    }
+	    if (log_array[FIRST_Y_AXIS]) {
+		fprintf(gpoutfile, " %f",
+			TK_REAL_VALUE(TK_Y_VALUE(0.5 * (y + tk_lasty)), FIRST_Y_AXIS));
+	    } else {
+		fprintf(gpoutfile, " {}");
+	    }
+	    if (log_array[SECOND_X_AXIS]) {
+		fprintf(gpoutfile, " %f",
+			TK_REAL_VALUE(TK_X_VALUE(0.5 * (x + tk_lastx)), SECOND_X_AXIS));
+	    } else {
+		fprintf(gpoutfile, " {}");
+	    }
+	    if (log_array[SECOND_Y_AXIS]) {
+		fprintf(gpoutfile, " %f",
+			TK_REAL_VALUE(TK_Y_VALUE(0.5 * (y + tk_lasty)), SECOND_Y_AXIS));
+	    } else {
+		fprintf(gpoutfile, " {}");
+	    }
+	    fprintf(gpoutfile, "\"\n");
+	}
+    } else {
+	if (tk_perl) {
+	    fprintf(gpoutfile, ";\n");
+	}
+    }
+	/*
+	 * end of the wrapper
+	 */
     tk_lastx = x;
     tk_lasty = y;
 }
 
+#undef TK_REAL_VALUE
+#undef TK_X_VALUE
+#undef TK_Y_VALUE
 
-TERM_PUBLIC void TK_put_text(x, y, str)
+TERM_PUBLIC void
+TK_put_text(x, y, str)
 unsigned int x, y;
 char *str;
 {
     y = 1000 - y;
-    fprintf(gpoutfile,
-	    "$can create text [expr $cmx * %d /1000] [expr $cmy * %d /1000] -text {%s} -fill %s -anchor w\n",
-	    x, y, str, tk_colors[tk_color]);
+    if (tk_perl) {
+	fprintf(gpoutfile,"\
+$can->createText(\
+$cmx * %d / 1000, \
+$cmy * %d / 1000, \
+-text => q{%s}, -fill => q{%s}, -anchor => '%s', \
+(defined $font ? (-font => $font) : ()));\n",
+		x, y, str, tk_colors[tk_color], tk_anchor);
+    } else {
+	fprintf(gpoutfile,"\
+eval $can create text \
+[expr $cmx * %d /1000] \
+[expr $cmy * %d /1000] \
+-text \\{%s\\} -fill %s -anchor %s\
+ [expr [info exists font]?\"-font \\$font\":{}]\n",
+		x, y, str, tk_colors[tk_color], tk_anchor);
+    }
 }
 
-TERM_PUBLIC void TK_text()
+TERM_PUBLIC int
+TK_justify_text(anchor)
+enum JUSTIFY anchor;
 {
-    fputs("}\n", gpoutfile);
-    fflush(gpoutfile);
+    int return_value;
+
+    switch (anchor) {
+    case RIGHT:
+	strcpy(tk_anchor, "e");
+	return_value = TRUE;
+	break;
+    case CENTRE:
+	strcpy(tk_anchor, "center");
+	return_value = TRUE;
+	break;
+    case LEFT:
+	strcpy(tk_anchor, "w");
+	return_value = TRUE;
+	break;
+    default:
+	strcpy(tk_anchor, "w");
+	return_value = FALSE;
+    }
+    return return_value;
+}
+
+TERM_PUBLIC int
+TK_set_font(font)
+char *font;
+{
+    if (!font || *font == NUL) {
+	if (tk_perl)
+	    fputs("undef $font;\n", gpoutfile);
+	else
+	    fputs("catch {unset $font}\n", gpoutfile);
+    } else {
+	char *name;
+	int size = 0;
+	size_t sep = strcspn(font, ",");
+
+	name = malloc(sep + 1);
+	if (!name)
+	    return FALSE;
+	strncpy(name, font, sep);
+	name[sep] = NUL;
+	if (sep < strlen(font))
+	    sscanf(&(font[sep + 1]), "%d", &size);
+	if (tk_perl) {
+	    fprintf(gpoutfile,"\
+if ($can->can('fontCreate')) {\n\
+$font = $can->fontCreate(-family => q{%s}",
+		    name);
+	    if (size)
+		fprintf(gpoutfile, ", -size => %d", size);
+	    fputs(");\n}\n", gpoutfile);
+	} else {
+	    fprintf(gpoutfile, "set font [font create -family %s", name);
+	    if (size)
+		fprintf(gpoutfile, " -size %d", size);
+	    fputs("]\n", gpoutfile);
+	}
+	free(name);
+    }
+    return TRUE;
 }
 
+TERM_PUBLIC void
+TK_text()
+{
+	/*
+	* when switching back to text mode some procedures are generated which
+	* return important information about plotarea size and axis ranges:
+	* 'gnuplot_plotarea' returns the plotarea size in tkcanvas units
+	* 'gnuplot_axisranges' returns the min. and max. values of the axis
+	* these are essentially needed to set the size of the canvas when the
+	* axis scaling is important.
+	* moreover, a procedure 'gnuplot_xy' is created which contains the
+	* actions bound to line segments (see the above 'TK_vector' code):
+	* if the user has defined a procedure named 'user_gnuplot_coordinates'
+	* then 'gnuplot_xy' calls this procedure, otherwise is writes the
+	* coordinates of the line segment the mouse cursor is pointing to
+	* to standard output.
+	*/
+    if (tk_perl) {
+	fputs("};\n", gpoutfile);
+	if (!is_3d_plot) {
+	    fputs("sub gnuplot_plotarea {\n", gpoutfile);
+	    fprintf(gpoutfile,
+		    "return (%d, %d, %d, %d);\n",
+		    xleft, xright, 1000 - ytop, 1000 - ybot);
+	    fputs("};\n", gpoutfile);
+	    fputs("sub gnuplot_axisranges {\n", gpoutfile);
+	    fprintf(gpoutfile,
+		    "return (%f, %f, %f, %f, %f, %f, %f, %f);\n",
+		    min_array[FIRST_X_AXIS], max_array[FIRST_X_AXIS],
+		    min_array[FIRST_Y_AXIS], max_array[FIRST_Y_AXIS],
+		    min_array[SECOND_X_AXIS], max_array[SECOND_X_AXIS],
+		    min_array[SECOND_Y_AXIS], max_array[SECOND_Y_AXIS]);
+	    fputs("};\n", gpoutfile);
+	    if (tk_interactive) {
+		fputs("sub gnuplot_xy {\n",
+		      gpoutfile);
+		fputs("my ($win, $x1s, $y1s, $x2s, $y2s, $x1e, $y1e, $x2e, $y2e, $x1m, $y1m, $x2m, $y2m) = @_;\n",
+		      gpoutfile);
+		fputs("if (defined &user_gnuplot_coordinates) {\n",
+		      gpoutfile);
+		fputs("my $id = $win->find('withtag', 'current');\n",
+		      gpoutfile);
+		fputs("user_gnuplot_coordinates $win, $id, $x1s, $y1s, $x2s, $y2s, $x1e, $y1e, $x2e, $y2e, $x1m, $y1m, $x2m, $y2m\n",
+		      gpoutfile);
+		fputs("} else {\n",
+		      gpoutfile);
+		fputs("if (length($x1m)>0) {print \" $x1m\";} else {print \" \", 0.5*($x1s+$x1e);}\n",
+		      gpoutfile);
+		fputs("if (length($y1m)>0) {print \" $y1m\";} else {print \" \", 0.5*($y1s+$y1e);}\n",
+		      gpoutfile);
+		fputs("if (length($x2m)>0) {print \" $x2m\";} else {print \" \", 0.5*($x2s+$x2e);}\n",
+		      gpoutfile);
+		fputs("if (length($y2m)>0) {print \" $y2m\";} else {print \" \", 0.5*($y2s+$y2e);}\n",
+		      gpoutfile);
+		fputs("print \"\\n\"\n",
+		      gpoutfile);
+		fputs("}\n",
+		      gpoutfile);
+		fputs("};\n", gpoutfile);
+	    }
+	}
+    } else {
+	fputs("}\n", gpoutfile);
+	if (!is_3d_plot) {
+	    fputs("proc gnuplot_plotarea {} {\n", gpoutfile);
+	    fprintf(gpoutfile,
+		    "return {%d %d %d %d}\n",
+		    xleft, xright, 1000 - ytop, 1000 - ybot);
+	    fputs("}\n", gpoutfile);
+	    fputs("proc gnuplot_axisranges {} {\n", gpoutfile);
+	    fprintf(gpoutfile,
+		    "return {%f %f %f %f %f %f %f %f}\n",
+		    min_array[FIRST_X_AXIS], max_array[FIRST_X_AXIS],
+		    min_array[FIRST_Y_AXIS], max_array[FIRST_Y_AXIS],
+		    min_array[SECOND_X_AXIS], max_array[SECOND_X_AXIS],
+		    min_array[SECOND_Y_AXIS], max_array[SECOND_Y_AXIS]);
+	    fputs("}\n", gpoutfile);
+	    if (tk_interactive) {
+		fputs("proc gnuplot_xy {win x1s y1s x2s y2s x1e y1e x2e y2e x1m y1m x2m y2m} {\n",
+		      gpoutfile);
+		fputs("if {([llength [info commands user_gnuplot_coordinates]])} {\n",
+		      gpoutfile);
+		fputs("set id [$win find withtag current]\n",
+		      gpoutfile);
+		fputs("user_gnuplot_coordinates $win $id $x1s $y1s $x2s $y2s $x1e $y1e $x2e $y2e $x1m $y1m $x2m $y2m\n",
+		      gpoutfile);
+		fputs("} else {\n", gpoutfile);
+		fputs("if {[string length $x1m]>0} {puts -nonewline \" $x1m\"} else {puts -nonewline \" [expr 0.5*($x1s+$x1e)]\"}\n",
+		      gpoutfile);
+		fputs("if {[string length $y1m]>0} {puts -nonewline \" $y1m\"} else {puts -nonewline \" [expr 0.5*($y1s+$y1e)]\"}\n",
+		      gpoutfile);
+		fputs("if {[string length $x2m]>0} {puts -nonewline \" $x2m\"} else {puts -nonewline \" [expr 0.5*($x2s+$x2e)]\"}\n",
+		      gpoutfile);
+		fputs("if {[string length $y2m]>0} {puts \" $y2m\"} else {puts \" [expr 0.5*($y2s+$y2e)]\"}\n",
+		      gpoutfile);
+		fputs("}\n", gpoutfile);
+		fputs("}\n", gpoutfile);
+	    }
+	}
+    }
+    fflush(gpoutfile);
+}
 
 #endif /* TERM_BODY */
 
 #ifdef TERM_TABLE
+
 TERM_TABLE_START(tkcanvas)
-    "tkcanvas", "Tk/Tcl canvas widget",
+    "tkcanvas", "Tk/Tcl canvas widget [perltk] [interactive]",
     TK_XMAX, TK_YMAX, TK_VCHAR, TK_HCHAR,
-    TK_VTIC, TK_HTIC, options_null, TK_init, TK_reset,
+    TK_VTIC, TK_HTIC, TK_options, TK_init, TK_reset,
     TK_text, null_scale, TK_graphics, TK_move, TK_vector,
     TK_linetype, TK_put_text, null_text_angle,
-    null_justify_text, do_point, do_arrow, set_font_null
+    TK_justify_text, do_point, do_arrow, TK_set_font,
+    NULL, 0, NULL, NULL, NULL, TK_linewidth
 TERM_TABLE_END(tkcanvas)
-
 #undef LAST_TERM
 #define LAST_TERM tkcanvas
 
@@ -186,24 +590,48 @@
 "?terminal tkcanvas",
 "?term tkcanvas",
 "?tkcanvas",
-" This terminal driver generates tk canvas widget commands.  To use it, rebuild",
-" `gnuplot` (after uncommenting or inserting the appropriate line in \"term.h\"),",
-" then",
+" This terminal driver generates Tk canvas widget commands based on Tcl/Tk",
+" (default) or Perl.  To use it, rebuild `gnuplot` (after uncommenting or",
+" inserting the appropriate line in \"term.h\"), then",
 "",
-"  gnuplot> set term tkcanvas",
+"  gnuplot> set term tkcanvas {perltk} {interactive}",
 "  gnuplot> set output 'plot.file'",
 "",
-" After invoking \"wish\", execute the following sequence of tcl commands:",
+" After invoking \"wish\", execute the following sequence of Tcl/Tk commands:",
 "",
 "  % source plot.file",
 "  % canvas .c",
 "  % pack .c",
 "  % gnuplot .c",
 "",
-" The code generated by `gnuplot` creates a tcl procedure called \"gnuplot\"",
-" that takes the name of a canvas as its argument.  When the procedure is,",
+" Or, for Perl/Tk use a program like this:",
+"",
+"  use Tk;",
+"  my $top = MainWindow->new;",
+"  my $c = $top->Canvas;",
+"  $c->pack();",
+"  do \"plot.pl\";",
+"  gnuplot->($c);",
+"  MainLoop;",
+"",
+" The code generated by `gnuplot` creates a procedure called \"gnuplot\"",
+" that takes the name of a canvas as its argument.  When the procedure is",
 " called, it clears the canvas, finds the size of the canvas and draws the plot",
 " in it, scaled to fit.",
+"",
+" For 2-dimensional plotting (`plot`) two additional procedures are defined:",
+" \"gnuplot_plotarea\" will return a list containing the borders of the plotting",
+" area \"xleft, xright, ytop, ybot\" in canvas screen coordinates, while the ranges",
+" of the two axes \"x1min, x1max, y1min, y1max, x2min, x2max, y2min, y2max\" in plot",
+" coordinates can be obtained calling \"gnuplot_axisranges\".",
+" If the \"interactive\" option is specified, mouse clicking on a line segment",
+" will print the coordinates of its midpoint to stdout. Advanced actions",
+" can happen instead if the user supplies a procedure named",
+" \"user_gnuplot_coordinates\", which takes the following arguments:",
+" \"win id x1s y1s x2s y2s x1e y1e x2e y2e x1m y1m x2m y2m\",",
+" the name of the canvas and the id of the line segment followed by the",
+" coordinates of its start and end point in the two possible axis ranges; the",
+" coordinates of the midpoint are only filled for logarithmic axes.",
 "",
 " The current version of `tkcanvas` supports neither `multiplot` nor `replot`."
 END_HELP(tkcanvas)
diff -urN gnuplot-3.7/term/tpic.trm gnuplot-3.7.1/term/tpic.trm
--- gnuplot-3.7/term/tpic.trm	Tue Jan 12 19:17:13 1999
+++ gnuplot-3.7.1/term/tpic.trm	Tue Jan 12 19:17:13 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: tpic.trm,v 1.19 1998/04/14 00:18:12 drd Exp $
+ * $Id: tpic.trm,v 1.9 1999/01/12 19:17:13 lhecking Exp $
  */
 
 /* GNUPLOT - tpic.trm */
diff -urN gnuplot-3.7/term/unixpc.trm gnuplot-3.7.1/term/unixpc.trm
--- gnuplot-3.7/term/unixpc.trm	Mon Dec 14 18:41:43 1998
+++ gnuplot-3.7.1/term/unixpc.trm	Mon Dec 14 18:41:43 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: unixpc.trm,v 1.14 1998/04/14 00:18:12 drd Exp $
+ * $Id: unixpc.trm,v 1.6 1998/12/14 18:41:43 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/unixplot.trm gnuplot-3.7.1/term/unixplot.trm
--- gnuplot-3.7/term/unixplot.trm	Wed Nov 25 21:08:47 1998
+++ gnuplot-3.7.1/term/unixplot.trm	Wed Nov 25 21:08:47 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: unixplot.trm,v 1.13 1998/04/14 00:18:13 drd Exp $
+ * $Id: unixplot.trm,v 1.7 1998/11/25 21:08:47 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/v384.trm gnuplot-3.7.1/term/v384.trm
--- gnuplot-3.7/term/v384.trm	Wed Nov 25 21:09:00 1998
+++ gnuplot-3.7.1/term/v384.trm	Wed Nov 25 21:09:00 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: v384.trm,v 1.13 1998/04/14 00:18:13 drd Exp $
+ * $Id: v384.trm,v 1.6 1998/11/25 21:09:00 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/vws.trm gnuplot-3.7.1/term/vws.trm
--- gnuplot-3.7/term/vws.trm	Mon Dec 14 18:41:49 1998
+++ gnuplot-3.7.1/term/vws.trm	Mon Dec 14 18:41:49 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: vws.trm,v 1.14 1998/04/14 00:18:14 drd Exp $
+ * $Id: vws.trm,v 1.7 1998/12/14 18:41:49 lhecking Exp $
  *
  */
 
diff -urN gnuplot-3.7/term/win.trm gnuplot-3.7.1/term/win.trm
--- gnuplot-3.7/term/win.trm	Mon Dec 14 18:41:54 1998
+++ gnuplot-3.7.1/term/win.trm	Mon Dec 14 18:41:54 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id: win.trm,v 1.8 1998/12/14 18:41:54 lhecking Exp $
  */
 
 /* GNUPLOT - win.trm */
diff -urN gnuplot-3.7/term/x11.trm gnuplot-3.7.1/term/x11.trm
--- gnuplot-3.7/term/x11.trm	Thu Dec 17 22:08:13 1998
+++ gnuplot-3.7.1/term/x11.trm	Wed Aug 25 17:16:40 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: x11.trm,v 1.35 1998/06/18 14:59:27 ddenholm Exp $
+ * $Id: x11.trm,v 1.11.2.2 1999/08/25 16:16:40 lhecking Exp $
  *
  */
 
@@ -73,7 +73,9 @@
 #ifndef TERM_PROTO_ONLY
 
 #ifdef TERM_BODY
-int X11_Display = 0;		/* non-zero if '-display' found on command line */
+
+/* non-zero if '-display' found on command line */
+int X11_Display = 0;
 
 
 /* sunos 4 uses on_exit() in place of atexit(). If both are missing,
@@ -98,58 +100,79 @@
 
 static void X11_atexit HANDLER_PROTO;
 
-static char X11_opts[][20] =
-{
-    "-mono", "-gray", "-clear", "-tvtwm", "-pointsize",
-    "-iconic", "-rv", "-reverse", "+rv", "-synchronous",
-    "-display", "-geometry", "-bg", "-background", "-bd", "-bordercolor", "-bw",
-    "-borderwidth", "-fg", "-foreground", "-fn", "-font", "-name",
-    "-selectionTimeout", "-title", "-xnllanguage", "-xrm",
-    "-raise", "-noraise", "-persist"
+/* Merged the old char X11_opts[] and int X11_optarg[]
+ * into one array of structs.
+ * Loosely based on XrmOptionDescRec, the use of which
+ * would probably be overkill here. */
+typedef enum { hasNoArg, hasArg } OptionArg;
+
+static struct x11opt {
+    const char *option;	/* Name of option */
+    OptionArg arg;	/* Whether option has argument */
+}  X11_opts[] =
+{
+   { "-mono", hasNoArg }, { "-gray", hasNoArg }, { "-clear", hasNoArg },
+   { "-tvtwm", hasNoArg }, { "-pointsize", hasArg },
+   { "-iconic", hasNoArg }, { "-rv", hasNoArg },
+   { "-reverse", hasNoArg }, { "+rv", hasNoArg },
+   { "-synchronous", hasNoArg },
+   { "-display", hasArg }, { "-geometry", hasArg }, { "-bg", hasArg },
+   { "-background", hasArg }, { "-bd", hasArg },
+   { "-bordercolor", hasArg }, { "-bw", hasArg },
+   { "-borderwidth", hasArg }, { "-fg", hasArg },
+   { "-foreground", hasArg }, { "-fn", hasArg }, { "-font", hasArg },
+   { "-name", hasArg },
+   { "-selectionTimeout", hasArg }, { "-title", hasArg },
+   { "-xnllanguage", hasArg }, { "-xrm", hasArg },
+   { "-raise", hasNoArg }, { "-noraise", hasNoArg },
+   { "-persist", hasNoArg }
 };
 
 #define X11_nopts (sizeof(X11_opts) / sizeof(X11_opts[0]))
 
-static int X11_optarg[X11_nopts] =
-{
-    0, 0, 0, 0, 1,
-    0, 0, 0, 0, 0,
-    1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1,
-    0, 0, 0
-};
-
 static FILE *X11_ipc;
-#ifdef OS2
-static char X11_command[1024] = "gnuplot_x11.exe";
-#else
-static char X11_command[1024] = "gnuplot_x11";
-#endif
+
+static char **xargv = (char **)NULL;
+static char *optvec[2*X11_nopts+1];
+# ifdef OS2
+static char X11_command[] = "gnuplot_x11.exe";
+# else
+static char X11_command[] = "gnuplot_x11";
+# endif /* !OS/2 */
 
 /*   X11_args - scan gnuplot command line for standard X Toolkit options
  * called from plot.c so must not be TERM_PUBLIC (which may be static)
  */
 
-int X11_args(argc, argv)
+int
+X11_args(argc, argv)
 int argc;
 char *argv[];
 {
-    int nx11 = 0, n;
+    int nx11 = 0, i = 0, n;
+
+    xargv = (char **) gp_alloc (argc*sizeof(char *), "<xargv>");
 
-    while (++argv, --argc > 0) {
+    if (!xargv) {
+	fputs ("not enough memory to copy argv - quitting\n", stderr);
+	exit (EXIT_FAILURE);
+    }
+
+    /* We make a copy of the argument vector because
+     * argv is modified later. */
+    memcpy (xargv, argv, argc*sizeof(char *));
+    optvec[i++] = X11_command;
+
+    while (++argv, ++xargv, --argc > 0) {
 	for (n = 0; n < X11_nopts; n++) {
-	    if (!strcmp(*argv, X11_opts[n])) {
-		strcat(X11_command, " ");
-		strcat(X11_command, *argv);
+	    if (strcmp(*argv, X11_opts[n].option) == 0) {
+		optvec[i++] = *xargv;
 		if (strcmp(*argv, "-display") == 0)
 		    X11_Display++;
-		if (X11_optarg[n]) {
+		if (X11_opts[n].arg == hasArg) {
 		    if (--argc <= 0)
-			return (nx11);
-		    strcat(X11_command, " \"");
-		    strcat(X11_command, *++argv);
-		    strcat(X11_command, "\"");
+			return nx11;
+		    optvec[i++] = *++xargv, ++argv;
 		    nx11++;
 		}
 		nx11++;
@@ -159,13 +182,15 @@
 	if (n == X11_nopts)
 	    break;
     }
+
     return (nx11);
 }
 
 
 static unsigned int X11_plot_number;
 
-TERM_PUBLIC void X11_options()
+TERM_PUBLIC void
+X11_options()
 {
     if (almost_equals(c_token, "res$et")) {
 	X11_atexit HANDLER_PARAMS;	/* tell gnuplot_x11 to shut down */
@@ -194,7 +219,7 @@
 
 #define DEFAULT_X11
 #if defined(VMS) || defined(CRIPPLED_SELECT)
-#undef DEFAULT_X11
+# undef DEFAULT_X11
 #endif
 #if defined(VMS) && defined(CRIPPLED_SELECT)
 Error.Incompatible options.
@@ -212,14 +237,22 @@
  *   DEFAULT_X11 popen() pipe IPC
  *---------------------------------------------------------------------------*/
 
-	static void X11_atexit HANDLER_DECL { if (X11_ipc) {
+static void
+X11_atexit HANDLER_DECL
+{
+    if (X11_ipc) {
 	fputs("R\n", X11_ipc);
 	fclose(X11_ipc);
 	/* dont wait(), since they might be -persist */
 	X11_ipc = NULL;
     }
-} TERM_PUBLIC void X11_init()
+}
+
+TERM_PUBLIC void
+X11_init()
 {
+    static int been_here = 0;
+
     if (!X11_ipc) {
 	/* first time through or after a reset */
 #if defined(OSK) || defined(OS2)
@@ -227,33 +260,34 @@
 	 * we can safely use it here
 	 */
 	X11_ipc = popen(X11_command, "w");
-#else
+#else /* !(OSK || OS/2) */
 	int fdes[2];
-	pipe(fdes);
+
+	if (pipe(fdes)) perror("pipe() failed:");
+
 	if (fork() == 0) {
 	    /* child */
 	    close(fdes[1]);
 	    dup2(fdes[0], 0);	/* stdin from pipe */
-	    execl("/bin/sh", "sh", "-c", X11_command, NULL);
+	    execvp(X11_command, optvec);
 	    /* if we get here, something went wrong */
 	    perror("exec failed");
-	    exit(1);
+	    exit(EXIT_FAILURE);
 	}
 	/* parent */
 	close(fdes[0]);		/* read end of pipe */
 	X11_ipc = fdopen(fdes[1], "w");
-#endif
-    } {
-	static int been_here = 0;
-	if (!been_here) {
-	    atexit(X11_atexit);
-	    been_here = 1;
-	}
+#endif /* !(OSK || OS/2) */
     }
 
+    if (!been_here) {
+	atexit(X11_atexit);
+	been_here++;
+    }
 }
 
-TERM_PUBLIC void X11_reset()
+TERM_PUBLIC void
+X11_reset()
 {
     /* leave the pipe alone, until exit or  set term x11 reset */
 }
@@ -269,10 +303,9 @@
 
 #define BEFORE_GRAPHICS		/* nowt */
 #define AFTER_TEXT		/* nowt */
-#endif /* DEFAULT_X11 */
 
 
-#ifdef CRIPPLED_SELECT
+#elif defined(CRIPPLED_SELECT)
 
 /* PLEASE CAN SOMEONE CHECK THAT THIS STILL WORKS !!! */
 
@@ -283,10 +316,11 @@
 static char X11_tmp[32], X11_tmp0[32], X11_shutdown[32];
 static int X11_pid;
 
-TERM_PUBLIC void X11_init()
+TERM_PUBLIC void
+X11_init()
 {
     if (!(X11_pid = fork())) {
-	execl("/bin/sh", "sh", "-c", X11_command, NULL);
+	execvp(X11_command, optvec);
 	_exit(1);
     }
     sprintf(X11_tmp, "/tmp/Gnuplot_%d", X11_pid);
@@ -294,7 +328,8 @@
     sprintf(X11_shutdown, "echo R >%s", X11_tmp);
 }
 
-TERM_PUBLIC void X11_reset()
+TERM_PUBLIC void
+X11_reset()
 {
     system(X11_shutdown);
 }
@@ -315,11 +350,11 @@
 #define PRINT5(fmt,p1,p2,p3,p4,p5) fprintf(X11_ipc, fmt,p1,p2,p3,p4,p5)
 #define FFLUSH()             fflush(X11_ipc)
 
-static void X11_atexit HANDLER_DECL { /* WHAT SHOULD I DO ? */
+static void
+X11_atexit HANDLER_DECL { /* WHAT SHOULD I DO ? */
 }
 
-#endif				/* CRIPPLED_SELECT */
-#ifdef VMS
+#elif defined(VMS)
 /*-----------------------------------------------------------------------------
  *   VMS mailbox/spawn IPC - Yehavi Bourvine - YEHAVI@VMS.HUJI.AC.IL
  *---------------------------------------------------------------------------*/
@@ -349,7 +384,8 @@
 };
 
 
-TERM_PUBLIC void X11_init()
+TERM_PUBLIC void
+X11_init()
 {
 
     struct iosb iosb;
@@ -368,7 +404,9 @@
 	    devnam.dsc$a_pointer,
 	    &devnam.dsc$w_length, 0
     };
-
+#define CMDLEN 1024
+    char cmdline[CMDLEN], *cmdp;
+    int optindex;
 
     if (!X11_channel) {
 	int one = 1;
@@ -376,17 +414,30 @@
 	/* Create a descriptor for the command line that starts
 	   GNUPLOT_X11. $DESCRIP doesn't work in this context... */
 
+	/* FIXME!
+	 * This does not work anymore since X11 option passing has been
+	 * changed to use execvp() in the DEFAULT_X11 case
+	 */
 	struct dsc$descriptor_s pgmdsc =
 	{0, DSC$K_DTYPE_T,
 	 DSC$K_CLASS_S, 0};
-	pgmdsc.dsc$w_length = strlen(X11_command);
-	pgmdsc.dsc$a_pointer = X11_command;
-
+        optindex = 0;
+        strcpy (cmdline, optvec[optindex]);
+        cmdp = cmdline + strlen (optvec[optindex]);
+        while (optvec[++optindex] != NULL) {
+          *cmdp++ = ' ';
+          *cmdp++ = '\"';
+          strcpy (cmdp, optvec[optindex]);
+          cmdp += strlen (optvec[optindex]);
+          *cmdp++ = '\"';
+        }
+	pgmdsc.dsc$w_length = cmdp-cmdline;
+	pgmdsc.dsc$a_pointer = cmdline;
 
 	/* Create a mailbox which will be used as a pipe for commands to the 
-	   subprocess.  What we'll write to it will be read by the subprocess as 
-	   its STDIN.  Use an unnamed mailbox and refer to it by its device
-	   number */
+	 * subprocess.  What we'll write to it will be read by the subprocess
+	 * as its STDIN.  Use an unnamed mailbox and refer to it by its device
+	 * number */
 
 	vaxc$errno = sys$crembx(0, &X11_channel, MBXMXMSG, MBXMXMSG, 0, 0, 0, 0);
 	if ((vaxc$errno & SS$_NORMAL) != SS$_NORMAL) {
@@ -450,32 +501,38 @@
 #define BEFORE_GRAPHICS		/* nowt */
 #define AFTER_TEXT		/* nowt */
 
-    static void X11_atexit HANDLER_DECL { if (X11_channel) {
+static void
+X11_atexit HANDLER_DECL
+{
+    if (X11_channel) {
 	PRINT0("R\n");
 	sleep(2);		/* Wait for subprocess to finish */
 	sys$dassgn(X11_channel);
 	X11_channel = 0;
     }
-} TERM_PUBLIC void X11_reset()
+}
+
+TERM_PUBLIC void
+X11_reset()
 {
     /* do nothing until exit */
 }
 
-#endif /* VMS */
-
-
-
+#else /* !VMS */
+You lose.
+#endif /* !VMS */
 
 
 /* common stuff, using macros defined above */
 
 
-
-TERM_PUBLIC void X11_graphics()
+TERM_PUBLIC void
+X11_graphics()
 {
     BEFORE_GRAPHICS;		/* kludge for crippled select */
 
-    PRINT1("G%d\n", X11_plot_number);	/* for VMS sake, keep as separate prints */
+    /* for VMS sake, keep as separate prints */
+    PRINT1("G%d\n", X11_plot_number);
 
 #ifdef ULTRIX_KLUDGE
     fflush(X11_ipc);
@@ -483,7 +540,8 @@
 
 }
 
-TERM_PUBLIC void X11_text()
+TERM_PUBLIC void
+X11_text()
 {
     PRINT0("E\n");
     FFLUSH();
@@ -496,38 +554,44 @@
 }
 
 
-TERM_PUBLIC void X11_move(x, y)
+TERM_PUBLIC void
+X11_move(x, y)
 unsigned int x, y;
 {
     PRINT2("M%04d%04d\n", x, y);
 }
 
-TERM_PUBLIC void X11_vector(x, y)
+TERM_PUBLIC void
+X11_vector(x, y)
 unsigned int x, y;
 {
     PRINT2("V%04d%04d\n", x, y);
 }
 
-TERM_PUBLIC void X11_pointsize(ps)
+TERM_PUBLIC void
+X11_pointsize(ps)
 double ps;
 {
     PRINT2("P7%04d%04d\n",	/* size of point symbols */
 	   (int) (term->h_tic * ps * 0.5), (int) (term->v_tic * ps * 0.5));
 }
 
-TERM_PUBLIC void X11_linewidth(lw)
+TERM_PUBLIC void
+X11_linewidth(lw)
 double lw;
 {
     PRINT1("W%04d\n", (int) lw);
 }
 
-TERM_PUBLIC void X11_linetype(lt)
+TERM_PUBLIC void
+X11_linetype(lt)
 int lt;
 {
     PRINT1("L%04d\n", lt);
 }
 
-TERM_PUBLIC void X11_put_text(x, y, str)
+TERM_PUBLIC void
+X11_put_text(x, y, str)
 unsigned int x, y;
 char str[];
 {
@@ -537,14 +601,16 @@
     }
 }
 
-TERM_PUBLIC int X11_justify_text(mode)
+TERM_PUBLIC int
+X11_justify_text(mode)
 enum JUSTIFY mode;
 {
     PRINT1("J%04d\n", mode);
     return (TRUE);
 }
 
-TERM_PUBLIC void X11_point(x, y, number)
+TERM_PUBLIC void
+X11_point(x, y, number)
 unsigned int x, y;
 int number;
 {
@@ -554,7 +620,8 @@
     PRINT3("P%01d%04d%04d\n", number, x, y);
 }
 
-TERM_PUBLIC void X11_fillbox(style, x, y, w, h)
+TERM_PUBLIC void
+X11_fillbox(style, x, y, w, h)
 int style;
 unsigned int x, y, w, h;
 {
diff -urN gnuplot-3.7/term/xlib.trm gnuplot-3.7.1/term/xlib.trm
--- gnuplot-3.7/term/xlib.trm	Wed Nov 25 21:09:11 1998
+++ gnuplot-3.7.1/term/xlib.trm	Wed Nov 25 21:09:11 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: xlib.trm,v 1.12 1998/04/14 00:18:16 drd Exp $
+ * $Id: xlib.trm,v 1.7 1998/11/25 21:09:11 lhecking Exp $
  */
 
 /* GNUPLOT - xlib.trm */
diff -urN gnuplot-3.7/term.c gnuplot-3.7.1/term.c
--- gnuplot-3.7/term.c	Wed Dec  9 15:25:32 1998
+++ gnuplot-3.7.1/term.c	Fri Oct  1 11:37:23 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: term.c,v 1.104 1998/06/18 14:55:19 ddenholm Exp $";
+static char *RCSid = "$Id: term.c,v 1.19.2.3 1999/10/01 10:37:23 lhecking Exp $";
 #endif
 
 /* GNUPLOT - term.c */
@@ -819,6 +819,13 @@
 
 #define TERMCOUNT (sizeof(term_tbl)/sizeof(struct termentry))
 
+/* mainly useful for external code */
+GP_INLINE int
+term_count()
+{
+    return TERMCOUNT;
+}
+
 void list_terms()
 {
     register int i;
@@ -961,7 +968,7 @@
 #ifdef NEXT
 	env_term = getenv("TERM");
 	if (term_name == (char *) NULL
-	    && env_term != (char *) NULL && strcmp(term, "next") == 0)
+	    && env_term != (char *) NULL && strcmp(env_term, "next") == 0)
 	    term_name = "next";
 #endif /* NeXT */
 
@@ -1181,6 +1188,7 @@
 	key_entry_height = (t->v_char);
 
     /* border linetype */
+    (*t->linewidth) (1.0); 
     (*t->linetype) (-2);
     (*t->move) (0, 0);
     (*t->vector) (xmax_t - 1, 0);
diff -urN gnuplot-3.7/term.h gnuplot-3.7.1/term.h
--- gnuplot-3.7/term.h	Mon Nov 30 21:51:24 1998
+++ gnuplot-3.7.1/term.h	Wed Aug 25 13:17:59 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: term.h,v 1.44 1998/04/14 00:16:25 drd Exp $
+ * $Id: term.h,v 1.12.2.2 1999/08/25 12:17:59 lhecking Exp $
  *
  */
 
@@ -90,6 +90,12 @@
 #endif
 
 
+/* BeOS */
+#ifdef __BEOS__
+# include "be.trm"
+#endif
+
+
 /****************************************************************************/
 /* MS-DOS and Windows */
 #if defined(MSDOS) || defined(_Windows)
@@ -131,6 +137,10 @@
 # include "next.trm"
 #endif
 
+/* Apple MacOs X Server (Openstep Unix) */
+#if defined(__APPLE__) && defined(__MACH__)
+# include "openstep.trm"
+#endif 
 
 /* OS/2 */
 #ifdef OS2
@@ -203,8 +213,8 @@
 #endif
 
 /****************************************************************************/
-/* Terminals not relevant for MSDOS, OS2, MS-Windows, ATARI or Amiga        */
-#if !(defined(MSDOS) || defined(OS2) || defined(_Windows) || defined(ATARI) || defined(MTOS) || defined(AMIGA))
+/* Terminals not relevant for MSDOS, MS-Windows, ATARI or Amiga             */
+#if !(defined(MSDOS) || defined(_Windows) || defined(ATARI) || defined(MTOS) || defined(AMIGA))
 
 /* AED 512 and AED 767 graphics terminals */
 # include "aed.trm"
@@ -225,13 +235,14 @@
 
 /* Tektronix 4106, 4107, 4109 and 420x terminals */
 # include "t410x.trm"
+
 /* a Tek 4010 and others including VT-style */
 # include "tek.trm"
 
 /* inboard terminal driver for X11 (dumps gnuplot_x11 commands) */
 # include "xlib.trm"
 
-#endif /* !MSDOS && !OS2 && !_Windows && !_ATARI && !_MTOS && !AMIGA */
+#endif /* !MSDOS && !_Windows && !_ATARI && !_MTOS && !AMIGA */
 /****************************************************************************/
 
 
@@ -262,8 +273,10 @@
 /* DXF format for use with AutoCad (Release 10.x) */
 #include "dxf.trm"
 
-/* #include "dxy.trm"		/* Roland DXY800A plotter */
-/* #include "excl.trm"		/* QMS/EXCL laserprinter (Talaris 1590 and others) */
+/* Roland DXY800A plotter */
+/* #include "dxy.trm" */
+/* QMS/EXCL laserprinter (Talaris 1590 and others) */
+/* #include "excl.trm" */
 
 /* fig graphics */
 #include "fig.trm"
@@ -274,48 +287,109 @@
 # include "gif.trm"
 #endif
 
-/* #include "grass.trm" /* geographical info system */
-#include "hp26.trm"		/* HP2623A and probably others */
-#include "hp2648.trm"		/* HP2647 and 2648 */
-#include "hp500c.trm"		/* HP DeskJet 500 C */
-#include "hpgl.trm"		/* HP7475, HP7220 plotters, and (hopefully) lots of others */
-#include "hpljii.trm"		/* HP Laserjet II */
-#include "hppj.trm"		/* HP PrintJet */
-#include "imagen.trm"		/* Imagen laser printers */
-/* #include "kyo.trm"		/* Kyocera Prescribe printer */
-#include "mif.trm"		/* Frame Maker MIF 3.00 format driver */
-#include "pbm.trm"		/* portable bit map */
+/* geographical info system */
+/* #include "grass.trm" */
+
+/* HP2623A and probably others */
+#include "hp26.trm"
+
+/* HP2647 and 2648 */
+#include "hp2648.trm"
+
+/* HP DeskJet 500 C */
+#include "hp500c.trm"
+
+/* HP7475, HP7220 plotters, and (hopefully) lots of others */
+#include "hpgl.trm"
+
+/* HP Laserjet II */
+#include "hpljii.trm"
+
+/* HP PrintJet */
+#include "hppj.trm"
+
+/* Imagen laser printers */
+#include "imagen.trm"
+
+/* Kyocera Prescribe printer */
+/* #include "kyo.trm" */
+
+/* Frame Maker MIF 3.00 format driver */
+#include "mif.trm"
+
+/* portable bit map */
+#include "pbm.trm"
 
 /* NOTE THAT PNG REQUIRES A SEPARATE LIBRARY : see term/png.trm */
 #ifdef HAVE_LIBPNG
 # include "png.trm"
 #endif
 
-#include "post.trm"		/* postscript */
-#include "qms.trm"		/* QMS laser printers */
-#include "table.trm"		/* built-in, but used for the documentation */
-#include "tgif.trm"		/* x11 tgif tool */
-#include "tkcanvas.trm"		/* tcl/tk */
-/* #include "v384.trm"		/* Vectrix 384 printer, also Tandy colour */
+/* postscript */
+#include "post.trm"
+
+/* QMS laser printers */
+#include "qms.trm"
+
+/* built-in, but used for the documentation */
+#include "table.trm"
+
+/* x11 tgif tool */
+#include "tgif.trm"
+
+/* tcl/tk with perl extensions */
+#include "tkcanvas.trm"
+
+/* Vectrix 384 printer, also Tandy colour */
+/* #include "v384.trm" */
 
 /* wire printers */
-#define EPSONP			/* Epson LX-800, Star NL-10, NX-1000 and lots of others */
-#define EPS60			/* Epson-style 60-dot per inch printers */
-#define EPS180			/* Epson-style 180-dot per inch (24 pin) printers */
+/* Epson LX-800, Star NL-10, NX-1000 and lots of others */
+#define EPSONP
+
+/* Epson-style 60-dot per inch printers */
+#define EPS60
+
+/* Epson-style 180-dot per inch (24 pin) printers */
+#define EPS180
+
 #define NEC
 #define OKIDATA
 #define STARC
-#define TANDY60			/* Tandy DMP-130 series 60-dot per inch graphics */
-#include "epson.trm"		/* the common driver file for all of these */
+
+/* Tandy DMP-130 series 60-dot per inch graphics */
+#define TANDY60
+
+/* the common driver file for all of these */
+#include "epson.trm"
+
 
 /* TeX related terminals */
 #define EMTEX
-#include "latex.trm"		/* latex and emtex */
-#include "pslatex.trm"		/* latex/tex with picture in postscript */
-#include "eepic.trm"		/* EEPIC-extended LaTeX driver, for EEPIC users */
-#include "tpic.trm"		/* TPIC specials for TeX */
-#include "pstricks.trm"		/* LaTeX picture environment with PSTricks macros */
-#include "texdraw.trm"		/* TeXDraw drawing package for LaTeX */
-#include "metafont.trm"		/* METAFONT */
+#define EEPIC
+
+/* latex and emtex */
+#include "latex.trm"
+
+/* latex/tex with picture in postscript */
+#include "pslatex.trm"
+
+/* EEPIC-extended LaTeX driver, for EEPIC users */
+#include "eepic.trm"
+
+/* TPIC specials for TeX */
+#include "tpic.trm"
+
+/* LaTeX picture environment with PSTricks macros */
+#include "pstricks.trm"
+
+/* TeXDraw drawing package for LaTeX */
+#include "texdraw.trm"
+
+/* METAFONT */
+#include "metafont.trm"
+
+/* METAPOST */
+#include "metapost.trm"
 
 #endif /* !SHORT_TERMLIST */
diff -urN gnuplot-3.7/time.c gnuplot-3.7.1/time.c
--- gnuplot-3.7/time.c	Wed Dec  9 15:25:54 1998
+++ gnuplot-3.7.1/time.c	Thu Aug 19 15:35:30 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: time.c,v 1.11 1998/04/14 00:16:27 drd Exp $";
+static char *RCSid = "$Id: time.c,v 1.5.2.1 1999/08/19 14:35:30 lhecking Exp $";
 #endif
 
 /* GNUPLOT - time.c */
@@ -226,6 +226,13 @@
 
 	case 'y':		/* year number */
 	    s = read_int(s, 2, &tm->tm_year);
+	    /* In line with the current UNIX98 specification by
+	     * The Open Group and major Unix vendors,
+	     * two-digit years 69-99 refer to the 20th century, and
+	     * values in the range 00-68 refer to the 21st century.
+	     */
+	    if (tm->tm_year <= 68)
+		tm->tm_year += 100;
 	    date++;
 	    tm->tm_year += 1900;
 	    break;
diff -urN gnuplot-3.7/util.c gnuplot-3.7.1/util.c
--- gnuplot-3.7/util.c	Wed Dec  9 15:26:04 1998
+++ gnuplot-3.7.1/util.c	Tue Sep 14 21:46:26 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: util.c,v 1.46 1998/06/18 14:55:20 ddenholm Exp $";
+static char *RCSid = "$Id: util.c,v 1.10.2.1 1999/09/14 20:46:26 lhecking Exp $";
 #endif
 
 /* GNUPLOT - util.c */
@@ -103,8 +103,10 @@
     register int start = token[t_num].start_index;
     register int length = token[t_num].length;
 
+    if (!str)
+	return FALSE;
     if (!token[t_num].is_token)
-	return (FALSE);		/* must be a value--can't be equal */
+	return FALSE;		/* must be a value--can't be equal */
     for (i = 0; i < length + after; i++) {
 	if (str[i] != input_line[start + i]) {
 	    if (str[i] != '$')
@@ -190,16 +192,18 @@
 {
     register int i = 0;
     register int start = token[t_num].start_index;
-    register int count;
+    register int count = token[t_num].length;
 
-    if ((count = token[t_num].length) >= max) {
+    if (count >= max) {
 	count = max - 1;
 	FPRINTF((stderr, "str buffer overflow in copy_str"));
     }
+
     do {
 	str[i++] = input_line[start++];
     } while (i != count);
     str[i] = NUL;
+
 }
 
 /* length of token string */
@@ -272,10 +276,8 @@
     register int i, e;
     register char *s;
 
-    if (*str)			/* previous pointer to malloc'd memory there */
-	free(*str);
     e = token[end].start_index + token[end].length;
-    *str = gp_alloc((unsigned long) (e - token[start].start_index + 1), "string");
+    *str = gp_realloc(*str, (e - token[start].start_index + 1), "string");
     s = *str;
     for (i = token[start].start_index; i < e && input_line[i] != NUL; i++)
 	*s++ = input_line[i];
@@ -291,18 +293,19 @@
 char **str;
 int start, end;
 {
-    register int i, e, escflag = 0;
+    register int i, e;
     register char *s;
 
-    if (*str)			/* previous pointer to malloc'd memory there */
-	free(*str);
     e = token[end].start_index + token[end].length - 1;
-    *str = gp_alloc((unsigned long) (e - token[start].start_index + 1), "string");
+    *str = gp_realloc(*str, (e - token[start].start_index + 1), "string");
     s = *str;
     for (i = token[start].start_index + 1; i < e && input_line[i] != NUL; i++)
-	if ((*s++ = input_line[i]) == '\\') ++escflag;
+	*s++ = input_line[i];
     *s = NUL;
-    if (escflag) parse_esc(*str);
+
+    if (input_line[token[start].start_index] == '"')
+	parse_esc(*str);
+
 }
 
 
diff -urN gnuplot-3.7/util3d.c gnuplot-3.7.1/util3d.c
--- gnuplot-3.7/util3d.c	Mon Sep 21 22:04:42 1998
+++ gnuplot-3.7.1/util3d.c	Mon Sep 21 22:04:42 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: util3d.c,v 1.17 1998/06/18 14:55:20 ddenholm Exp $";
+static char *RCSid = "$Id: util3d.c,v 1.7 1998/09/21 21:04:42 lhecking Exp $";
 #endif
 
 
diff -urN gnuplot-3.7/version.c gnuplot-3.7.1/version.c
--- gnuplot-3.7/version.c	Thu Jan 14 19:35:25 1999
+++ gnuplot-3.7.1/version.c	Fri Oct 22 19:29:53 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: version.c,v 1.347 1998/06/22 12:24:56 ddenholm Exp $";
+static char *RCSid = "$Id: version.c,v 1.22.2.33 1999/10/22 18:29:53 lhecking Exp $";
 #endif
 
 /* GNUPLOT - version.c */
@@ -37,8 +37,8 @@
 #include "plot.h"
 
 char version[] = "3.7";
-char patchlevel[] = "0";
-char date[] = "Thu Jan 14 19:34:53 BST 1999";
+char patchlevel[] = "1";
+char date[] = "Fri Oct 22 18:00:00 BST 1999";
 char gnuplot_copyright[] = "Copyright(C) 1986 - 1993, 1998, 1999";
 
 char faq_location[] = FAQ_LOCATION;
diff -urN gnuplot-3.7/vms.c gnuplot-3.7.1/vms.c
--- gnuplot-3.7/vms.c	Fri Nov 20 12:14:51 1998
+++ gnuplot-3.7.1/vms.c	Fri Nov 20 12:14:51 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char    *RCSid = "$Id: vms.c,v 1.5 1998/06/18 14:55:22 ddenholm Exp $";
+static char    *RCSid = "$Id: vms.c,v 1.6 1998/11/20 12:14:51 lhecking Exp $";
 #endif
 
 /* GNUPLOT - vms.c */
diff -urN gnuplot-3.7/win/geticon.c gnuplot-3.7.1/win/geticon.c
--- gnuplot-3.7/win/geticon.c	Tue Dec  1 20:09:38 1998
+++ gnuplot-3.7.1/win/geticon.c	Tue Dec  1 20:09:38 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: geticon.c,v 1.2 1993/09/27 17:24:27 alex Exp $";
+static char *RCSid = "$Id: geticon.c,v 1.2 1998/12/01 20:09:38 lhecking Exp $";
 #endif
 
 /* geticon.c */
diff -urN gnuplot-3.7/win/pgnuplot.c gnuplot-3.7.1/win/pgnuplot.c
--- gnuplot-3.7/win/pgnuplot.c	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/win/pgnuplot.c	Tue Oct 19 14:35:04 1999
@@ -0,0 +1,299 @@
+/*
+ * pgnuplot.c -- pipe stdin to wgnuplot
+ * 
+ * Version 0.3 -- 30 Jun 1999
+ * 
+ * This program is based on pgnuplot.c Copyright (C) 1999 Hans-Bernhard Broeker
+ * with substantial modifications Copyright (C) 1999 Craig R. Schardt.
+ *
+ * The code is released to the public domain.
+ *
+ */
+
+/* Comments from original pgnuplot.c */
+/*
+ * pgnuplot.c -- 'Pipe to gnuplot'  Version 990608
+ *
+ * A small program, to be compiled as a Win32 console mode application.
+ * (NB: will not work on 16bit Windows, not even with Win32s installed).
+ *
+ * This program will accept commands on STDIN, and pipe them to an
+ * active (or newly created) wgnuplot text window. Command line options
+ * are passed on to wgnuplot.
+ *
+ * Effectively, this means `pgnuplot' is an almost complete substitute
+ * for `wgnuplot', on the command line, with the added benefit that it
+ * does accept commands from redirected stdin. (Being a Windows GUI
+ * application, `wgnuplot' itself cannot read stdin at all.)
+ *
+ * Copyright (C) 1999 by Hans-Bernhard Broeker
+ *                       (broeker@physik.rwth-aachen.de)
+ * This file is in the public domain. It might become part of a future
+ * distribution of gnuplot.
+ *
+ * based on a program posted to comp.graphics.apps.gnuplot in May 1998 by
+ * jl Hamel <jlhamel@cea.fr>
+ *
+ * Changes relative to that original version:
+ * -- doesn't start a new wgnuplot if one already is running.
+ * -- doesn't end up in an endless loop if STDIN is not redirected.
+ *    (refuses to read from STDIN at all, in that case).
+ * -- doesn't stop the wgnuplot session at the end of
+ *    stdin, if it didn't start wgnuplot itself.
+ * -- avoids the usual buffer overrun problem with gets().
+ *
+ * For the record, I usually use MinGW32 to compile this, with a
+ * command line looking like this:
+ *
+ *     gcc -o pgnuplot.exe pgnuplot.c -luser32 -s
+ */
+
+/*	Modifications by Craig R. Schardt (17 Jun 1999)
+		
+	Copyright (C) 1999 by Craig R. Schardt (craig@silica.mse.ufl.edu)
+
+	Major changes: (See the explanation below for more information)
+		+ Always starts a new instance of wgnuplot.
+		+ If stdin isn't redirected then start wgnuplot and give it focus.
+		+ Uses CreateProcess() instead of WinExec() to start wgnuplot when stdin
+		  is redirected.
+	
+	Other changes:
+		+ New technique for building the command line to pass to wgnuplot.exe
+		  which is less complicated and seems to work more reliably than the old 
+		  technique.
+		+ Simplified message passing section of the code. 
+		+ All printf(...) statements are now fprintf(stderr,...) so that errors 
+		  are sent to the console, even if stdout is redirected.
+
+	The previous version of pgnuplot would fail when more than one program
+	tried to access wgnuplot simultaneously or when one program tried to start
+	more than one wgnuplot session. Only a single instance of wgnuplot would be
+	started and all input would be sent to that instance. When two or more programs
+	tried to pipe input to wgnuplot, the two seperate input streams would be sent 
+	to one wgnuplot window resulting in one very confused copy of wgnuplot. The only
+	way to avoid this problem was to change pgnuplot so that it would start a 
+	new instance of wgnuplot every time.
+
+	Just starting a new instance of wgnuplot isn't enough. pgnuplot must also
+	make sure that the data on each stdin pipe is sent to the proper wgnuplot 
+	instance. This is achieved by using CreateProcess() which returns a handle 
+	to the newly created process. Once the process has initialized, it can be 
+	searched for the text window and then data can be routed correctly. The search 
+	is carried out by the EnumThreadWindows() call and the data passing is carried 
+	out by a rewritten version of the original code. With these changes, pgnuplot 
+	now behaves in a manner consistent with the behavior of gnuplot on UNIX 
+	computers.
+
+	This program has been compiled using Microsoft Visual C++ 4.0 with the
+	following command line:
+
+		cl /O2 pgnuplot.c /link user32.lib
+
+	The resulting program has been tested on WinNT and Win98 both by calling
+	it directly from the command line with and without redirected input. The
+	program also works on WinNT with a modified version of Gnuplot.py (a script
+	for interactive control of Gnuplot from Python). 
+	
+	22 JUN 1999:
+	+ Fixed command line code to behave properly when the first
+	  item is quoted in the original command line.
+	
+	29 JUN 1999:
+	+ Added some code to print the command line. This is for testing
+	  only and should be removed before the general release. To enable, 
+	  compile with SHOWCMDLINE defined.
+
+	30 JUN 1999:
+	+ New function FindUnquotedSpace() which replaces the earlier technique for
+	  finding the command line arguments to send on to wgnuplot. Prior to this
+	  the arguments were assumed to start after argv[0], however argv[0] is not
+	  set the same by all combinitaions of compiler, command processor, and OS. 
+	  The new method ignores argv completely and manually search the command line
+	  string for the first space which isn't enclosed in double-quotes.
+
+  */
+
+#include <io.h>
+#include <conio.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <windows.h>
+
+#ifndef _O_BINARY
+# define _O_BINARY O_BINARY
+#endif
+#if (__BORLANDC__ >= 0x450) /* about BCBuilder 1.0 */
+# define _setmode setmode
+#endif
+
+/* Customize this path if needed */
+#define PROGNAME "wgnuplot.exe"
+/* CRS: The value given above will work correctly as long as pgnuplot.exe
+ * is in the same directory as wgnuplot.exe or the directory containing
+ * wgnuplot.exe is included in the path. I would recommend placing the 
+ * pgnuplot.exe executable in the same directory as wgnuplot.exe and 
+ * leaving this definition alone.
+ */
+
+#define WINDOWNAME "gnuplot"
+#define PARENTCLASS "wgnuplot_parent"
+#define TEXTCLASS "wgnuplot_text"
+#define GRAPHWINDOW "gnuplot graph"
+#define GRAPHCLASS "wgnuplot_graph"
+#define BUFFER_SIZE 80
+
+/* GLOBAL Variables */
+HWND hwndParent = NULL;
+HWND hwndText = NULL;
+
+PROCESS_INFORMATION piProcInfo; 
+STARTUPINFO         siStartInfo; 
+
+/* CRS: Callback for the EnumThreadWindows function */
+BOOL CALLBACK cbGetTextWindow(HWND  hwnd, LPARAM  lParam )
+{
+	/* save the value of the parent window */
+	hwndParent = hwnd;
+	/* check to see if it has a child text window */
+	hwndText = FindWindowEx(hwnd, NULL, TEXTCLASS, NULL );
+
+	/* if the text window was found, stop looking */
+	return ( hwndText != NULL );
+}
+
+/* sends a string to the specified window */
+/* CRS: made this into a function call */
+void PostString(HWND hwnd, char *pc)
+{
+	while( *pc ){
+		PostMessage( hwnd, WM_CHAR, *pc, 1L );
+		/* CRS: should add a check of return code on PostMessage. If 0, the 
+		   message que was full and the message wasn't posted. */
+		pc++;
+	}
+}
+
+/* FindUnquotedSpace(): Search a string for the first space not enclosed in quotes.
+ *   Returns a pointer to the space, or the empty string if no space is found. 
+ *   -CRS 30061999  
+ */
+char* FindUnquotedSpace( char *pc )
+{
+	while ( (*pc) && (*pc != ' ') && (*pc != '\t') ){
+		if ( *pc == '"' ){
+			do {
+				pc++;
+			} while ( (pc[1]) && (*pc != '"') );
+		}
+		pc++;
+	}
+	return pc;
+}
+
+int main (int argc, char *argv[])
+{
+	char    psBuffer[BUFFER_SIZE];
+	char    psGnuplotCommandLine[MAX_PATH] = PROGNAME;
+	LPTSTR  psCmdLine;
+	BOOL    bSuccess;
+	
+	/* HBB 19990325, to allow pgnuplot < script > output.gif */
+	_setmode(fileno(stdout), _O_BINARY);
+
+	/* CRS: create the new command line, passing all of the command
+	 * line options to wgnuplot so that it can process them:
+	 * first, get the command line,
+	 * then move past the name of the program (e.g., 'pgnuplot'),
+	 * finally, add what's left of the line onto the gnuplot command line. */
+	psCmdLine = GetCommandLine();
+
+#ifdef SHOWCMDLINE
+	fprintf(stderr,"CmdLine: %s\n", psCmdLine);
+	fprintf(stderr,"argv[0]: %s\n",argv[0]);
+#endif
+
+	/* CRS 30061999: Search for the first unquoted space. This should 
+	   separate the program name from the arguments. */
+	psCmdLine = FindUnquotedSpace( psCmdLine );
+
+	strncat(psGnuplotCommandLine, psCmdLine, MAX_PATH - strlen(psGnuplotCommandLine));
+
+#ifdef SHOWCMDLINE
+	fprintf(stderr,"Arguments: %s\n", psCmdLine);
+	fprintf(stderr,"GnuplotCommandLine: %s\n",psGnuplotCommandLine);
+#endif
+
+	/* CRS: if stdin isn't redirected then just launch wgnuplot normally
+	 * and exit. */
+	if ( isatty(fileno(stdin)) ) {
+		if ( WinExec(psGnuplotCommandLine, SW_SHOWDEFAULT) > 31 ){
+			exit(EXIT_SUCCESS);
+		}
+		fprintf(stderr,"ERROR %u: Couldn't execute: \"%s\"\n", 
+			    GetLastError(), psGnuplotCommandLine);
+		exit(EXIT_FAILURE);
+	}
+
+	/* CRS: initialize the STARTUPINFO and call CreateProcess(). */ 
+	siStartInfo.cb = sizeof(STARTUPINFO); 
+	siStartInfo.lpReserved = NULL; 
+	siStartInfo.lpReserved2 = NULL; 
+	siStartInfo.cbReserved2 = 0; 
+	siStartInfo.lpDesktop = NULL; 
+	siStartInfo.dwFlags = STARTF_USESHOWWINDOW;
+	siStartInfo.wShowWindow = SW_SHOWMINIMIZED;
+
+	bSuccess = CreateProcess( 
+			NULL,                   /* pointer to name of executable module   */
+			psGnuplotCommandLine,   /* pointer to command line string         */
+			NULL,                   /* pointer to process security attributes */
+			NULL,                   /* pointer to thread security attributes  */
+			FALSE,                  /* handle inheritance flag                */
+			0,                      /* creation flags                         */
+			NULL,                   /* pointer to new environment block       */
+			NULL,                   /* pointer to current directory name      */
+			&siStartInfo,           /* pointer to STARTUPINFO                 */
+			&piProcInfo             /* pointer to PROCESS_INFORMATION         */
+			);
+
+	/* if CreateProcess() failed, print a warning and exit. */
+	if ( ! bSuccess ) {
+		fprintf(stderr,"ERROR %u: Couldn't execute: \"%s\"\n", 
+						GetLastError(), psGnuplotCommandLine);
+		exit(EXIT_FAILURE);
+	}
+
+	/* CRS: give gnuplot enough time to start (1 sec.) */
+	if ( WaitForInputIdle(piProcInfo.hProcess, 1000) ) {
+		fprintf(stderr, "Timeout: gnuplot is not ready\n");
+		exit(EXIT_FAILURE);
+	}
+
+	/* CRS: get the HWND of the parent window and text windows */
+	EnumThreadWindows(piProcInfo.dwThreadId, cbGetTextWindow, 0);
+
+	/* CRS: free the process and thread handles */
+	CloseHandle(piProcInfo.hProcess);
+	CloseHandle(piProcInfo.hThread);
+
+	if ( ! hwndParent || ! hwndText ) {
+	/* Still no gnuplot window? Problem! */
+		fprintf(stderr, "Can't find the gnuplot window");
+		exit(EXIT_FAILURE);
+	}
+
+	/* wait for commands on stdin, and pass them on to the wgnuplot text
+	 * window */
+	while ( fgets(psBuffer, BUFFER_SIZE, stdin) != NULL ) {
+		PostString(hwndText, psBuffer);
+	}
+	
+	/* exit gracefully */
+	/* CRS: Add a test to see if gnuplot is still running? */
+	PostString(hwndText, "\nexit\n");
+
+	return EXIT_SUCCESS;
+}
diff -urN gnuplot-3.7/win/wcommon.h gnuplot-3.7.1/win/wcommon.h
--- gnuplot-3.7/win/wcommon.h	Tue Jan 12 14:04:58 1999
+++ gnuplot-3.7.1/win/wcommon.h	Tue Jan 12 14:04:58 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: wcommon.h,v 1.7 1998/03/22 22:35:27 drd Exp $
+ * $Id: wcommon.h,v 1.2 1999/01/12 14:04:58 lhecking Exp $
  */
 
 /* GNUPLOT - wcommon.h */
diff -urN gnuplot-3.7/win/wgnuplib.c gnuplot-3.7.1/win/wgnuplib.c
--- gnuplot-3.7/win/wgnuplib.c	Wed Apr 15 20:23:44 1998
+++ gnuplot-3.7.1/win/wgnuplib.c	Wed Apr 15 20:23:44 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: wgnuplib.c,v 1.5 1998/03/22 22:35:27 drd Exp $";
+static char *RCSid = "$Id: wgnuplib.c,v 1.1.1.2 1998/04/15 19:23:44 lhecking Exp $";
 #endif
 
 /* GNUPLOT - win/wgnuplib.c */
diff -urN gnuplot-3.7/win/wgnuplib.h gnuplot-3.7.1/win/wgnuplib.h
--- gnuplot-3.7/win/wgnuplib.h	Thu Dec 10 18:30:13 1998
+++ gnuplot-3.7.1/win/wgnuplib.h	Tue Sep 21 19:48:27 1999
@@ -1,5 +1,5 @@
 /*
- * $Id: wgnuplib.h,v 1.10 1998/03/22 22:35:27 drd Exp $
+ * $Id: wgnuplib.h,v 1.4.2.2 1999/09/21 18:48:27 lhecking Exp $
  */
 
 /* GNUPLOT - win/wgnuplib.h */
@@ -53,7 +53,11 @@
 #define _Windows
 #endif
 
-#ifdef __DLL__
+/* HBB 19990506: The following used to be #ifdef __DLL__.
+ * But  _export is needed outside the DLL, as well. The long-standing
+ * bug crashing 16bit wgnuplot on Alt-F4 or pressing the 'close' button
+ * stemmed here.  */
+#ifndef WIN32
 #define WINEXPORT _export
 #else
 #define WINEXPORT
@@ -320,6 +324,9 @@
 	HPEN	hbpen;					/* border pen */
 	HPEN	hapen;					/* axis pen */
 	HPEN	hpen[WGNUMPENS];		/* pens */
+#if 1 /* HBB 980118: new try ... */
+        HPEN    hsolidpen[WGNUMPENS];           /* solid pens (for point symbols) */
+#endif
 	LOGPEN	colorpen[WGNUMPENS+2];	/* logical color pens */
 	LOGPEN	monopen[WGNUMPENS+2];	/* logical mono pens */
 	COLORREF background;			/* background color */
diff -urN gnuplot-3.7/win/wgnuplot.def gnuplot-3.7.1/win/wgnuplot.def
--- gnuplot-3.7/win/wgnuplot.def	Fri Sep 25 16:16:29 1998
+++ gnuplot-3.7.1/win/wgnuplot.def	Tue Oct 19 14:32:35 1999
@@ -11,4 +11,4 @@
 DATA		MULTIPLE MOVEABLE PRELOAD
 HEAPSIZE	256
 ;STACKSIZE	12000
-STACKSIZE      11700
+STACKSIZE      11000
diff -urN gnuplot-3.7/win/wgraph.c gnuplot-3.7.1/win/wgraph.c
--- gnuplot-3.7/win/wgraph.c	Fri Dec  4 15:17:04 1998
+++ gnuplot-3.7.1/win/wgraph.c	Thu Aug 19 15:13:09 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: wgraph.c,v 1.14 1998/03/22 23:32:00 drd Exp $";
+static char *RCSid = "$Id: wgraph.c,v 1.5.2.1 1999/08/19 14:13:09 lhecking Exp $";
 #endif
 
 /* GNUPLOT - win/wgraph.c */
@@ -384,6 +384,9 @@
 		for (i=0; i<WGNUMPENS; i++)
 		{
 			lpgw->hpen[i] = CreatePenIndirect((LOGPEN FAR *)&lpgw->colorpen[i+2]);
+#if 1 /* HBB 980118 fix 'numsolid' problem */
+			lpgw->hsolidpen[i] = CreatePen(PS_SOLID, 1, lpgw->colorpen[i+2].lopnColor);
+#endif
 			}
 		/* find number of solid, unit width line styles */
 		for (i=0; i<WGNUMPENS && lpgw->colorpen[i+2].lopnStyle==PS_SOLID
@@ -405,6 +408,10 @@
 	DeleteObject(lpgw->hapen);
 	for (i=0; i<WGNUMPENS; i++)
 		DeleteObject(lpgw->hpen[i]);
+#if 1 /* HBB 980118: fix 'numsolid' gotcha */
+	for (i=0; i<WGNUMPENS; i++)
+		DeleteObject(lpgw->hsolidpen[i]);
+#endif
 	for (i=0; i<WGNUMPENS+2; i++)
 		DeleteObject(lpgw->colorbrush[i]);
 }
@@ -732,11 +739,15 @@
 				}
 				break;
 			default:	/* A plot mark */
+#if 0 /* HBB 980118: fix 'sumsolid' gotcha: */
 				if (pen >= numsolid) {
 					pen %= numsolid;	/* select solid pen */
 					SelectObject(hdc, lpgw->hpen[pen]);
 					SelectObject(hdc, lpgw->colorbrush[pen+2]);
 				}
+#else
+                                SelectObject(hdc, lpgw->hsolidpen[pen%WGNUMPENS]);
+#endif
                                 switch (curptr->op) {
 					case W_dot:
 						dot(hdc, xdash, ydash);
diff -urN gnuplot-3.7/win/winmain.c gnuplot-3.7.1/win/winmain.c
--- gnuplot-3.7/win/winmain.c	Fri Dec  4 15:16:59 1998
+++ gnuplot-3.7.1/win/winmain.c	Tue Sep 21 19:48:28 1999
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: winmain.c,v 1.15 1998/03/22 23:32:01 drd Exp $";
+static char *RCSid = "$Id: winmain.c,v 1.3.2.1 1999/09/21 18:48:28 lhecking Exp $";
 #endif
 
 /* GNUPLOT - win/winmain.c */
@@ -146,7 +146,13 @@
 int CALLBACK WINEXPORT
 ShutDown(void)
 {
+#if 0  /* HBB 19990505: try to avoid crash on clicking 'close' */
+       /* Problem was that WinExit was called *twice*, once directly,
+        * and again via 'atexit'. This caused problems by double-freeing
+        * of GlobalAlloc-ed memory inside TextClose() */
+       /* Caveat: relies on atexit() working properly */
 	WinExit();
+#endif
 	exit(0);
 	return 0;
 }
@@ -448,8 +454,6 @@
 #define MAX_PRT_LEN 256
 static char win_prntmp[MAX_PRT_LEN+1];
 
-extern GW graphwin;
- 
 FILE *
 open_printer()
 {
diff -urN gnuplot-3.7/win/wmenu.c gnuplot-3.7.1/win/wmenu.c
--- gnuplot-3.7/win/wmenu.c	Fri Dec  4 15:16:53 1998
+++ gnuplot-3.7.1/win/wmenu.c	Fri Dec  4 15:16:53 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: wmenu.c,v 1.8 1998/03/22 22:35:29 drd Exp $";
+static char *RCSid = "$Id: wmenu.c,v 1.3 1998/12/04 15:16:53 lhecking Exp $";
 #endif
 
 /* GNUPLOT - win/wmenu.c */
diff -urN gnuplot-3.7/win/wpause.c gnuplot-3.7.1/win/wpause.c
--- gnuplot-3.7/win/wpause.c	Fri Dec  4 15:16:46 1998
+++ gnuplot-3.7.1/win/wpause.c	Fri Dec  4 15:16:46 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: wpause.c,v 1.8 1998/03/22 22:35:29 drd Exp $";
+static char *RCSid = "$Id: wpause.c,v 1.3 1998/12/04 15:16:46 lhecking Exp $";
 #endif
 
 /* GNUPLOT - win/wpause.c */
diff -urN gnuplot-3.7/win/wprinter.c gnuplot-3.7.1/win/wprinter.c
--- gnuplot-3.7/win/wprinter.c	Wed Apr 15 20:23:55 1998
+++ gnuplot-3.7.1/win/wprinter.c	Wed Apr 15 20:23:55 1998
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: wprinter.c,v 1.11 1998/03/22 23:32:02 drd Exp $";
+static char *RCSid = "$Id: wprinter.c,v 1.1.1.2 1998/04/15 19:23:55 lhecking Exp $";
 #endif
 
 /* GNUPLOT - win/wprinter.c */
diff -urN gnuplot-3.7/win/wresourc.h gnuplot-3.7.1/win/wresourc.h
--- gnuplot-3.7/win/wresourc.h	Wed Apr 15 20:23:56 1998
+++ gnuplot-3.7.1/win/wresourc.h	Wed Apr 15 20:23:56 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: wresourc.h,v 1.6 1998/03/22 22:35:30 drd Exp $
+ * $Id: wresourc.h,v 1.1.1.2 1998/04/15 19:23:56 lhecking Exp $
  */
 
 /* GNUPLOT - win/wresourc.h */
diff -urN gnuplot-3.7/win/wtext.c gnuplot-3.7.1/win/wtext.c
--- gnuplot-3.7/win/wtext.c	Tue Dec  1 20:10:24 1998
+++ gnuplot-3.7.1/win/wtext.c	Tue Sep 21 19:48:28 1999
@@ -1,8 +1,9 @@
 #ifndef lint
-static char *RCSid = "$Id: wtext.c,v 1.11 1998/03/22 22:35:31 drd Exp $";
+static char *RCSid = "$Id: wtext.c,v 1.3.2.1 1999/09/21 18:48:28 lhecking Exp $";
 #endif
 
 /* GNUPLOT - win/wtext.c */
+
 /*[
  * Copyright 1992, 1993, 1998   Russell Lang
  *
@@ -119,6 +120,10 @@
 
     while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
         {
+#if 1 /* HBB 19990505: Petzold says we should check this: */
+        if (msg.message == WM_QUIT)
+            return;
+#endif
         TranslateMessage(&msg);
         DispatchMessage(&msg);
         }
diff -urN gnuplot-3.7/win/wtext.h gnuplot-3.7.1/win/wtext.h
--- gnuplot-3.7/win/wtext.h	Tue Jun 30 17:46:21 1998
+++ gnuplot-3.7.1/win/wtext.h	Tue Jun 30 17:46:21 1998
@@ -1,5 +1,5 @@
 /*
- * $Id: wtext.h,v 1.5 1998/04/14 00:18:29 drd Exp $
+ * $Id: wtext.h,v 1.2 1998/06/30 16:46:21 lhecking Exp $
  */
 
 /* GNUPLOT - win/wtext.h */
diff -urN gnuplot-3.7/x11.opt gnuplot-3.7.1/x11.opt
--- gnuplot-3.7/x11.opt	Thu Jan  1 01:00:00 1970
+++ gnuplot-3.7.1/x11.opt	Wed Aug 25 17:14:14 1999
@@ -0,0 +1 @@
+sys$share:decw$xlibshr/share