new package gnuplottex

git-svn-id: svn://tug.org/texlive/trunk@1824 c570f23f-e606-0410-a88d-b1316a301751

13 files changed, 908 insertions, 2 deletions

diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index ac8961b4758..d52b9a964fb 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -46,7 +46,8 @@ sub main
          "floatrow", "flowfram", 
          "fltpoint", "fmtcount", "fncychap", "fontspec", "formular",
          "fourier", "free-math-font-survey", "frenchle",
-       "genmisc", "glossary", "gost", "graphics", "graphicx-psmin",
+       "genmisc", "glossary", "gnuplottex", "gost", "graphics",
+         "graphicx-psmin",
        "hrlatex", "hyphen-base", "hyphen-basque", "hyphen-german",
          "hyphen-greek", "hyphen-norwegian", "hyphen-ukenglish",
          "hyphen-usorbian",
diff --git a/Master/texmf-dist/doc/latex/gnuplottex/README b/Master/texmf-dist/doc/latex/gnuplottex/README
new file mode 100644
index 00000000000..c96acc2afff
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/gnuplottex/README
@@ -0,0 +1,5 @@
+This package allows you to include gnuplot graphs in your LaTeX files. Gnuplot
+is a versatile plotting package. More information can be found at
+http://www.gnuplot.info/.
+
+Licensed under the GPL.
diff --git a/Master/texmf-dist/doc/latex/gnuplottex/example.tex b/Master/texmf-dist/doc/latex/gnuplottex/example.tex
new file mode 100644
index 00000000000..525f540d7a2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/gnuplottex/example.tex
@@ -0,0 +1,19 @@
+\documentclass[a4paper]{article}
+
+\usepackage[pdf]{gnuplottex}
+
+\begin{document}
+
+\begin{gnuplot}[width=.3\textwidth]
+	plot sin(x)
+\end{gnuplot}
+
+\begin{gnuplot}
+	set grid
+	set title 'gnuplottex test'
+	set ylabel 'y'
+	set xlabel 'x'
+	plot exp(x) with linespoints
+\end{gnuplot}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf b/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf
new file mode 100644
index 00000000000..2793c43f0e9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf
diff --git a/Master/texmf-dist/doc/latex/gnuplottex/gpl.txt b/Master/texmf-dist/doc/latex/gnuplottex/gpl.txt
new file mode 100644
index 00000000000..0203e5220e7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/gnuplottex/gpl.txt
@@ -0,0 +1,284 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
new file mode 100644
index 00000000000..b4ac6b8abea
--- /dev/null
+++ b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
@@ -0,0 +1,289 @@
+% \iffalse meta-comment
+%
+% Copyright (c) 2006, Lars Kotthoff <metalhead@metalhead.ws>
+%
+% Large portions copied from pdftex,
+% Copyright (c) 2001-3, Radhakrishnan CV <cvr@river-valley.com>
+%                       Rajagopal CV <cvr3@river-valley.com>
+%                       http://www.river-valley.com
+%
+% River Valley Technologies, Floor III, SJP Buildings, Cotton Hills
+% Trivandrum, India 695014
+%
+% Tel: +91 471 233 7501
+%
+%                     Antoine Chambert-Loir 
+%                     <chambert@math.polytechnique.fr>
+%                     http://www.math.polytechnique.fr/~chambert
+%
+% Ecole polytechnique, Palaiseau Cedex, France
+%
+% This program is free software; you can redistribute it and/or
+% modify it under the terms of the GNU General Public License
+% as published by the Free Software Foundation; either version 2
+% of the License, or (at your option) any later version.
+%
+% This program 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.  See the
+% GNU General Public License for more details.
+% 
+% You should have received a copy of the GNU General Public License
+% along with this program (gpl.txt); if not, write to the Free
+% Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+% MA  02111-1307, USA.
+%
+% \fi
+%
+% \iffalse
+%<*driver>
+\ProvidesFile{gnuplottex.dtx}
+%</driver>
+%<package> \NeedsTeXFormat{LaTeX2e}[1999/12/01]
+%<package> \ProvidesPackage{gnuplottex}
+%<*package>
+    [2006/04/02 v0.1 gnuplot graphs in LaTeX]
+\RequirePackage{graphicx,moreverb,keyval}
+%</package>
+%
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage{gnuplottex}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\begin{document}
+    \DocInput{gnuplottex.dtx}
+    \PrintChanges
+    \PrintIndex
+\end{document}
+%</driver>                                                       
+% \fi
+%
+% \CheckSum{223}                                                   
+%
+% \CharacterTable                                                
+%  {Upper-case    \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
+%   Lower-case    \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
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+%
+% \changes{v0.1}{2006/04/02}{Initial version.}
+%
+% \GetFileInfo{gnuplottex.dtx}
+%
+% \DoNotIndex{\the,\year,\month,\day,\time}
+%
+% \title{The \textsf{gnuplottex} package\thanks{This document
+%   corresponds to \textsf{gnuplottex}~\fileversion, dated \filedate.}}
+% \author{Lars Kotthoff\\ \texttt{metalhead@metalhead.ws}}
+%
+% \maketitle
+%
+% \section{Introduction}
+%
+% This package allows you to include gnuplot graphs in your \LaTeX{} documents.
+%
+% The gnuplot code is extracted from the document and written to
+% \texttt{.gnuplot}
+% files. Then, if shell escape is used, the graph files are automatically
+% processed and converted to PostScript or PDF files, which will then be included. If
+% shell escape isn't used, the user will have to manually convert the
+% files.
+%
+% Shell escape is available in the web2c \TeX{} compiler, it allows the execution
+% of shell code during the compilation of a \TeX{} document. It's disabled by
+% default, you'll have to edit your configuration files or give the
+% \texttt{-shell-escape} option to \texttt{latex}.
+%
+% \section{Requirements}
+%
+% To use gnuplottex, you'll need the \texttt{graphicx}, \texttt{keyval} and
+% \texttt{moreverb} packages, epstopdf if you want to use the pdf
+% option, and of course, gnuplot.
+%
+% \section{Usage}
+%
+% To load the package, simply \verb=\usepackage{gnuplottex}= in your document
+% preamble. Options that can be passed to the package are
+% \begin{description}
+%     \item[\oarg{shell}] Use shell escape to automatically generate the graphs
+%     from the gnuplot source files. This is the default.
+%     \item[\oarg{noshell}] Don't use shell escape, graphs must be generated
+%     manually.
+%     \item[\oarg{miktex}] We're using mikTeX.
+%			\item[\oarg{pdf}] PDF output, generate .pdf files of the graphs out of
+%			.ps.
+% \end{description}
+%
+% The following environments can be used to include graphs:
+%
+% \DescribeEnv{gnuplot}
+% Within this environment, you can specify arbitrary gnuplot code, for example\\
+% \texttt{plot sin(x)}.\\
+% The code necessary to write the plot to a file will be inserted by this
+% package.
+%
+% You may specify width or height of the picture using
+% [width=\meta{width}] or [height=\meta{height}] as in the \texttt{includegraphics} command.
+%
+% \StopEventually{}
+%
+% \section{Implementation}
+%
+% \subsection{Initialization}
+%    \begin{macrocode}
+\newif\ifShellEscape
+\newif\ifmiktex \miktexfalse
+\newif\ifpdf \pdffalse
+
+\DeclareOption{shell}{\ShellEscapetrue}
+\DeclareOption{noshell}{\ShellEscapefalse}
+\DeclareOption{miktex}{\global\miktextrue}
+\DeclareOption{pdf}{\pdftrue}
+
+\ExecuteOptions{shell}
+\ProcessOptions\relax
+%% test if shell escape really works
+\ifShellEscape
+    \def\tmpfile{/tmp/w18-test-\the\year\the\month\the\day\the\time} 
+    \ifmiktex
+        \immediate\write18{rem >"\tmpfile"}
+    \else
+        \immediate\write18{touch \tmpfile}
+    \fi
+    \ifmiktex
+        \IfFileExists{\tmpfile.}{\ShellEscapetrue}{\ShellEscapefalse}
+    \else
+        \IfFileExists{\tmpfile}{\ShellEscapetrue}{\ShellEscapefalse}
+    \fi
+\fi
+
+\ifShellEscape
+    \PackageInfo{gnuplottex}
+    {Automatically converting gnuplot files.}
+\else
+    \PackageWarningNoLine{gnuplottex}
+        {Shell escape not enabled.\MessageBreak
+        You'll need to convert the graphs yourself.}
+\fi
+\newcounter{fignum}
+%    \end{macrocode}
+%
+% \subsection{\texttt{.gnuplot} write out}
+%    \begin{macrocode}
+\def\figname{\jobname-gnuplottex-fig\thefignum}
+
+\def\gnuplotverbatimwrite#1{%
+    \def\BeforeStream
+    {\message{Opening gnuplot stream=\figname.gnuplot}%
+        \immediate\write\verbatim@out{\string set terminal postscript eps enhanced}
+				\immediate\write\verbatim@out{\string set output '\figname.eps'}
+    }
+    \@bsphack
+    \immediate\openout \verbatim@out #1
+    \BeforeStream%
+    \let\do\@makeother\dospecials
+    \catcode`\^^M\active
+    \def\verbatim@processline{%
+        \immediate\write\verbatim@out
+        {\the\verbatim@line}}%
+    \verbatim@start}
+\def\endgnuplotverbatimwrite{%
+    \immediate\closeout\verbatim@out
+    \@esphack}
+%    \end{macrocode}
+% 
+% \subsection{Environment definition}
+%    \begin{macrocode}
+\define@key{pic}{width}{\def\gnuplotwidth{#1}}
+\define@key{pic}{height}{\def\gnuplotheight{#1}}
+\newenvironment{gnuplot}[1][]{\stepcounter{fignum}%
+		\let\gnuplotwidth\undefined
+		\let\gnuplotheight\undefined
+		\setkeys{pic}{#1}
+    \xdef\gnuplotCutFile{\figname.gnuplot}
+    \gnuplotverbatimwrite{\gnuplotCutFile}}
+    {\endgnuplotverbatimwrite%
+    \gnuplotgraphicsinclude}
+%    \end{macrocode}
+%
+% \subsection{\texttt{.gnuplot} file processing}
+%    \begin{macrocode}
+\long\gdef\gnuplotgraphicsprocess{%
+    \ifShellEscape
+				\IfFileExists{\figname.gnuplot}{%
+						\immediate\write18{gnuplot \figname.gnuplot}
+						\IfFileExists{\figname.eps}{%
+								\ifpdf
+										\immediate\write18{epstopdf \figname.eps}
+										\IfFileExists{\figname.pdf}{%
+												\PackageInfo{gnuplottex}
+												{\figname.gnuplot converted}}
+												{\PackageWarningNoLine{gnuplottex}
+														{Conversion of \figname.gnuplot failed.}}
+								\else
+										\PackageInfo{gnuplottex}
+										{\figname.gnuplot converted}
+								\fi}
+								{\PackageWarningNoLine{gnuplottex}
+										{Conversion of \figname.gnuplot failed.}}}{}
+				\fi}
+%    \end{macrocode}
+%
+% \subsection{Graph inclusion}
+%    \begin{macrocode}
+\long\gdef\gnuplotgraphicsinclude{\gnuplotgraphicsprocess%
+		\ifpdf
+				\IfFileExists{\figname.pdf}{%
+						\ifx\gnuplotwidth\undefined
+								\ifx\gnuplotheight\undefined
+										\includegraphics{\figname}
+								\else
+										\includegraphics[height=\gnuplotheight]{\figname}
+								\fi
+						\else
+								\ifx\gnuplotheight\undefined
+										\includegraphics[width=\gnuplotwidth]{\figname}
+								\else
+										\includegraphics[width=\gnuplotwidth,height=\gnuplotheight]{\figname}
+								\fi
+						\fi
+				}
+				{\PackageWarningNoLine{gnuplottex}
+						{Please convert \figname.gnuplot manually}}
+		\else
+				\IfFileExists{\figname.eps}{%
+						\ifx\gnuplotwidth\undefined
+								\ifx\gnuplotheight\undefined
+										\includegraphics{\figname}
+								\else
+										\includegraphics[height=\gnuplotheight]{\figname}
+								\fi
+						\else
+								\ifx\gnuplotheight\undefined
+										\includegraphics[width=\gnuplotwidth]{\figname}
+								\else
+										\includegraphics[width=\gnuplotwidth,height=\gnuplotheight]{\figname}
+								\fi
+						\fi
+				}
+				{\PackageWarningNoLine{gnuplottex}
+						{Please convert \figname.gnuplot manually}}
+		\fi
+}
+%    \end{macrocode}
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.ins b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.ins
new file mode 100644
index 00000000000..980493fcb98
--- /dev/null
+++ b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.ins
@@ -0,0 +1,95 @@
+%%
+%% Copyright (c) 2006, Lars Kotthoff <metalhead@metalhead.ws>
+%%
+%% Large portions copied from pdftex,
+%% Copyright (c) 2001-3, Radhakrishnan CV <cvr@river-valley.com>
+%%                       Rajagopal CV <cvr3@river-valley.com>
+%%                       http://www.river-valley.com
+%%
+%% River Valley Technologies, Floor III, SJP Buildings, Cotton Hills
+%% Trivandrum, India 695014
+%%
+%% Tel: +91 471 233 7501
+%%
+%%                     Antoine Chambert-Loir 
+%%                     <chambert@math.polytechnique.fr>
+%%                     http://www.math.polytechnique.fr/~chambert
+%%
+%% Ecole polytechnique, Palaiseau Cedex, France
+%%
+%% This program is free software; you can redistribute it and/or
+%% modify it under the terms of the GNU General Public License
+%% as published by the Free Software Foundation; either version 2
+%% of the License, or (at your option) any later version.
+%%
+%% This program 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.  See the
+%% GNU General Public License for more details.
+%% 
+%% You should have received a copy of the GNU General Public License
+%% along with this program (gpl.txt); if not, write to the Free
+%% Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+%% MA  02111-1307, USA.
+%%
+
+\input docstrip.tex
+\keepsilent
+
+\usedir{tex/latex/gnuplottex}
+
+\preamble
+
+Copyright (c) 2006, Lars Kotthoff <metalhead@metalhead.ws>
+
+Large portions copied from pdftex,
+Copyright (c) 2001-3, Radhakrishnan CV <cvr@river-valley.com>
+                      Rajagopal CV <cvr3@river-valley.com>
+                      http://www.river-valley.com
+
+River Valley Technologies, Floor III, SJP Buildings, Cotton Hills
+Trivandrum, India 695014
+
+Tel: +91 471 233 7501
+
+                    Antoine Chambert-Loir 
+                    <chambert@math.polytechnique.fr>
+                    http://www.math.polytechnique.fr/~chambert
+
+Ecole polytechnique, Palaiseau Cedex, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program 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.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program (gpl.txt); if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA.
+
+\endpreamble
+
+\generate{\file{gnuplottex.sty}{\from{gnuplottex.dtx}{package}}}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{*                                                           *}
+\Msg{* To finish the installation you have to move the following *}
+\Msg{* file into a directory searched by TeX:                    *}
+\Msg{*                                                           *}
+\Msg{*     gnuplottex.sty                                        *}
+\Msg{*                                                           *}
+\Msg{* To produce the documentation run the file dottex.dtx      *}
+\Msg{* through LaTeX.                                            *}
+\Msg{*                                                           *}
+\Msg{* Happy TeXing!                                             *}
+\Msg{*                                                           *}
+\Msg{*************************************************************}
+
+\endbatchfile
diff --git a/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty b/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty
new file mode 100644
index 00000000000..e4427eee8dc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty
@@ -0,0 +1,171 @@
+%%
+%% This is file `gnuplottex.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% gnuplottex.dtx  (with options: `package')
+%% 
+%% Copyright (c) 2006, Lars Kotthoff <metalhead@metalhead.ws>
+%% 
+%% Large portions copied from pdftex,
+%% Copyright (c) 2001-3, Radhakrishnan CV <cvr@river-valley.com>
+%%                       Rajagopal CV <cvr3@river-valley.com>
+%%                       http://www.river-valley.com
+%% 
+%% River Valley Technologies, Floor III, SJP Buildings, Cotton Hills
+%% Trivandrum, India 695014
+%% 
+%% Tel: +91 471 233 7501
+%% 
+%%                     Antoine Chambert-Loir
+%%                     <chambert@math.polytechnique.fr>
+%%                     http://www.math.polytechnique.fr/\protect \unhbox \voidb@x \penalty \@M \ {}chambert
+%% 
+%% Ecole polytechnique, Palaiseau Cedex, France
+%% 
+%% This program is free software; you can redistribute it and/or
+%% modify it under the terms of the GNU General Public License
+%% as published by the Free Software Foundation; either version 2
+%% of the License, or (at your option) any later version.
+%% 
+%% This program 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.  See the
+%% GNU General Public License for more details.
+%% 
+%% You should have received a copy of the GNU General Public License
+%% along with this program (gpl.txt); if not, write to the Free
+%% Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+%% MA  02111-1307, USA.
+%% 
+ \NeedsTeXFormat{LaTeX2e}[1999/12/01]
+ \ProvidesPackage{gnuplottex}
+    [2006/04/02 v0.1 gnuplot graphs in LaTeX]
+\RequirePackage{graphicx,moreverb,keyval}
+\newif\ifShellEscape
+\newif\ifmiktex \miktexfalse
+\newif\ifpdf \pdffalse
+
+\DeclareOption{shell}{\ShellEscapetrue}
+\DeclareOption{noshell}{\ShellEscapefalse}
+\DeclareOption{miktex}{\global\miktextrue}
+\DeclareOption{pdf}{\pdftrue}
+
+\ExecuteOptions{shell}
+\ProcessOptions\relax
+%% test if shell escape really works
+\ifShellEscape
+    \def\tmpfile{/tmp/w18-test-\the\year\the\month\the\day\the\time}
+    \ifmiktex
+        \immediate\write18{rem >"\tmpfile"}
+    \else
+        \immediate\write18{touch \tmpfile}
+    \fi
+    \ifmiktex
+        \IfFileExists{\tmpfile.}{\ShellEscapetrue}{\ShellEscapefalse}
+    \else
+        \IfFileExists{\tmpfile}{\ShellEscapetrue}{\ShellEscapefalse}
+    \fi
+\fi
+
+\ifShellEscape
+    \PackageInfo{gnuplottex}
+    {Automatically converting gnuplot files.}
+\else
+    \PackageWarningNoLine{gnuplottex}
+        {Shell escape not enabled.\MessageBreak
+        You'll need to convert the graphs yourself.}
+\fi
+\newcounter{fignum}
+\def\figname{\jobname-gnuplottex-fig\thefignum}
+
+\def\gnuplotverbatimwrite#1{%
+    \def\BeforeStream
+    {\message{Opening gnuplot stream=\figname.gnuplot}%
+        \immediate\write\verbatim@out{\string set terminal postscript eps enhanced}
+\immediate\write\verbatim@out{\string set output '\figname.eps'}
+    }
+    \@bsphack
+    \immediate\openout \verbatim@out #1
+    \BeforeStream%
+    \let\do\@makeother\dospecials
+    \catcode`\^^M\active
+    \def\verbatim@processline{%
+        \immediate\write\verbatim@out
+        {\the\verbatim@line}}%
+    \verbatim@start}
+\def\endgnuplotverbatimwrite{%
+    \immediate\closeout\verbatim@out
+    \@esphack}
+\define@key{pic}{width}{\def\gnuplotwidth{#1}}
+\define@key{pic}{height}{\def\gnuplotheight{#1}}
+\newenvironment{gnuplot}[1][]{\stepcounter{fignum}%
+\let\gnuplotwidth\undefined
+\let\gnuplotheight\undefined
+\setkeys{pic}{#1}
+    \xdef\gnuplotCutFile{\figname.gnuplot}
+    \gnuplotverbatimwrite{\gnuplotCutFile}}
+    {\endgnuplotverbatimwrite%
+    \gnuplotgraphicsinclude}
+\long\gdef\gnuplotgraphicsprocess{%
+    \ifShellEscape
+\IfFileExists{\figname.gnuplot}{%
+\immediate\write18{gnuplot \figname.gnuplot}
+\IfFileExists{\figname.eps}{%
+\ifpdf
+\immediate\write18{epstopdf \figname.eps}
+\IfFileExists{\figname.pdf}{%
+\PackageInfo{gnuplottex}
+{\figname.gnuplot converted}}
+{\PackageWarningNoLine{gnuplottex}
+{Conversion of \figname.gnuplot failed.}}
+\else
+\PackageInfo{gnuplottex}
+{\figname.gnuplot converted}
+\fi}
+{\PackageWarningNoLine{gnuplottex}
+{Conversion of \figname.gnuplot failed.}}}{}
+\fi}
+\long\gdef\gnuplotgraphicsinclude{\gnuplotgraphicsprocess%
+\ifpdf
+\IfFileExists{\figname.pdf}{%
+\ifx\gnuplotwidth\undefined
+\ifx\gnuplotheight\undefined
+\includegraphics{\figname}
+\else
+\includegraphics[height=\gnuplotheight]{\figname}
+\fi
+\else
+\ifx\gnuplotheight\undefined
+\includegraphics[width=\gnuplotwidth]{\figname}
+\else
+\includegraphics[width=\gnuplotwidth,height=\gnuplotheight]{\figname}
+\fi
+\fi
+}
+{\PackageWarningNoLine{gnuplottex}
+{Please convert \figname.gnuplot manually}}
+\else
+\IfFileExists{\figname.eps}{%
+\ifx\gnuplotwidth\undefined
+\ifx\gnuplotheight\undefined
+\includegraphics{\figname}
+\else
+\includegraphics[height=\gnuplotheight]{\figname}
+\fi
+\else
+\ifx\gnuplotheight\undefined
+\includegraphics[width=\gnuplotwidth]{\figname}
+\else
+\includegraphics[width=\gnuplotwidth,height=\gnuplotheight]{\figname}
+\fi
+\fi
+}
+{\PackageWarningNoLine{gnuplottex}
+{Please convert \figname.gnuplot manually}}
+\fi
+}
+\endinput
+%%
+%% End of file `gnuplottex.sty'.
diff --git a/Master/texmf-dist/tpm/gnuplottex.tpm b/Master/texmf-dist/tpm/gnuplottex.tpm
new file mode 100644
index 00000000000..ff0caf5c202
--- /dev/null
+++ b/Master/texmf-dist/tpm/gnuplottex.tpm
@@ -0,0 +1,31 @@
+<!DOCTYPE rdf:RDF SYSTEM "../../support/tpm.dtd">
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:TPM="http://texlive.dante.de/">
+  <rdf:Description about="http://texlive.dante.de/texlive/Package/gnuplottex.zip">
+    <TPM:Name>gnuplottex</TPM:Name>
+    <TPM:Type>Package</TPM:Type>
+    <TPM:Date>2006/04/02 15:28:00</TPM:Date>
+    <TPM:Version></TPM:Version>
+    <TPM:Creator>karl</TPM:Creator>
+    <TPM:Title>The gnuplottex package.</TPM:Title>
+    <TPM:Description></TPM:Description>
+    <TPM:Author></TPM:Author>
+    <TPM:Size>126748</TPM:Size>
+    <TPM:Build/>
+    <TPM:RunFiles size="6352">
+texmf-dist/tex/latex/gnuplottex/gnuplottex.sty
+texmf-dist/tpm/gnuplottex.tpm
+    </TPM:RunFiles>
+    <TPM:DocFiles size="108349">
+texmf-dist/doc/latex/gnuplottex/README
+texmf-dist/doc/latex/gnuplottex/example.tex
+texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf
+texmf-dist/doc/latex/gnuplottex/gpl.txt
+    </TPM:DocFiles>
+    <TPM:SourceFiles size="13196">
+texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
+texmf-dist/source/latex/gnuplottex/gnuplottex.ins
+    </TPM:SourceFiles>
+    <TPM:Provides>Package/gnuplottex</TPM:Provides>
+  </rdf:Description>
+</rdf:RDF>
+
diff --git a/Master/texmf/lists/gnuplottex b/Master/texmf/lists/gnuplottex
new file mode 100644
index 00000000000..d8ffcb769cc
--- /dev/null
+++ b/Master/texmf/lists/gnuplottex
@@ -0,0 +1,10 @@
+texmf-dist/doc/latex/gnuplottex/README
+texmf-dist/doc/latex/gnuplottex/example.tex
+texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf
+texmf-dist/doc/latex/gnuplottex/gpl.txt
+texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
+texmf-dist/source/latex/gnuplottex/gnuplottex.ins
+texmf-dist/tex/latex/gnuplottex/gnuplottex.sty
+texmf-dist/tpm/gnuplottex.tpm
+
+texmf/lists/gnuplottex
diff --git a/Master/texmf/tpm/collection-latexextra.tpm b/Master/texmf/tpm/collection-latexextra.tpm
index 140f5fb0d19..64a60451ca5 100644
--- a/Master/texmf/tpm/collection-latexextra.tpm
+++ b/Master/texmf/tpm/collection-latexextra.tpm
@@ -364,6 +364,7 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="proof"/>
       <TPM:Package name="protocol"/>
       <TPM:Package name="psfragx"/>
+      <TPM:Package name="pst-pdf"/>
       <TPM:Package name="qcm"/>
       <TPM:Package name="qobitree"/>
       <TPM:Package name="qsymbols"/>
diff --git a/Master/texmf/tpm/collection-latexrecommended.tpm b/Master/texmf/tpm/collection-latexrecommended.tpm
index 143d4a085de..2851ab4ff15 100644
--- a/Master/texmf/tpm/collection-latexrecommended.tpm
+++ b/Master/texmf/tpm/collection-latexrecommended.tpm
@@ -48,7 +48,6 @@ A collection of recommended add-on packages for LaTeX which have widespread use
       <TPM:Package name="oberdiek"/>
       <TPM:Package name="pdfpages"/>
       <TPM:Package name="powerdot"/>
-      <TPM:Package name="ps4pdf"/>
       <TPM:Package name="psfrag"/>
       <TPM:Package name="rcs"/>
       <TPM:Package name="rotating"/>
diff --git a/Master/texmf/tpm/collection-pictures.tpm b/Master/texmf/tpm/collection-pictures.tpm
index 59b686702ba..19121eca304 100644
--- a/Master/texmf/tpm/collection-pictures.tpm
+++ b/Master/texmf/tpm/collection-pictures.tpm
@@ -20,6 +20,7 @@
       <TPM:Package name="dottex"/>
       <TPM:Package name="dratex"/>
       <TPM:Package name="eepic"/>
+      <TPM:Package name="gnuplottex"/>
       <TPM:Package name="kuvio"/>
       <TPM:Package name="miniplot"/>
       <TPM:Package name="pb-diagram"/>