gnuplottex update (21aug07)

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

2 files changed, 25 insertions, 18 deletions

diff --git a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
index fd8d857a6ee..ded27ac4fb6 100644
--- a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
+++ b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (c) 2006, Lars Kotthoff <metalhead@metalhead.ws>
+% Copyright (c) 2006-2007, Lars Kotthoff <lars@larsko.org>
 %
 % Large portions copied from pdftex,
 % Copyright (c) 2001-3, Radhakrishnan CV <cvr@river-valley.com>
@@ -42,7 +42,7 @@
 %<package> \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package> \ProvidesPackage{gnuplottex}
 %<*package>
-    [2006/10/28 v0.2 gnuplot graphs in LaTeX]
+    [2007/08/21 v0.3 gnuplot graphs in LaTeX]
 \RequirePackage{latexsym,graphicx,moreverb,keyval}
 %</package>
 %
@@ -60,7 +60,7 @@
 %</driver>                                                       
 % \fi
 %
-% \CheckSum{164}                                                   
+% \CheckSum{180}                                                   
 %
 % \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
@@ -81,6 +81,7 @@
 %
 % \changes{v0.1}{2006/04/02}{Initial version.}
 % \changes{v0.2}{2006/10/28}{Changed gnuplot output to LaTeX, simplified code.}
+% \changes{v0.3}{2007/08/21}{Improved MikTeX compatibility.}
 %
 % \GetFileInfo{gnuplottex.dtx}
 %
@@ -88,7 +89,7 @@
 %
 % \title{The \textsf{gnuplottex} package\thanks{This document
 %   corresponds to \textsf{gnuplottex}~\fileversion, dated \filedate.}}
-% \author{Lars Kotthoff\\ \texttt{metalhead@metalhead.ws}}
+% \author{Lars Kotthoff\\ \texttt{lars@larsko.org}}
 %
 % \maketitle
 %
@@ -119,7 +120,8 @@
 % 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.
+%     from the gnuplot source files. This is the default. Normally, you don't
+%     need to specify this option.
 %     \item[\oarg{noshell}] Don't use shell escape, graphs must be generated
 %     manually.
 %     \item[\oarg{miktex}] We're using mikTeX.
@@ -131,7 +133,9 @@
 % 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.
+% package. It adds 'set terminal latex' and the name of the output file.
+% Therefore, you cannot specify a terminal or output file in the instructions on
+% this environment because it'll break.
 %
 % You may specify a scaling factor for the graphs by adding the parameter after
 % the beginning of the environment, like so:
@@ -154,17 +158,20 @@
 \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
+		\def\tmpfile{/tmp/w18-test-\the\year\the\month\the\day\the\time}
+		\ifmiktex
+				\def\tmpfile{w18-test-\the\year\the\month\the\day\the\time}
+				\immediate\write18{echo t > "\tmpfile"}
+		\else
+				\immediate\write18{touch \tmpfile}
+		\fi
+		\ifmiktex
+				\IfFileExists{\tmpfile.}{\ShellEscapetrue}{\ShellEscapefalse}
+				\immediate\write18{del "\tmpfile"}
+		\else
+				\IfFileExists{\tmpfile}{\ShellEscapetrue}{\ShellEscapefalse}
+				\immediate\write18{rm -f \tmpfile}
+		\fi
 \fi
 
 \ifShellEscape
diff --git a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.ins b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.ins
index 980493fcb98..1abe863cb9a 100644
--- a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.ins
+++ b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.ins
@@ -85,7 +85,7 @@ MA  02111-1307, USA.
 \Msg{*                                                           *}
 \Msg{*     gnuplottex.sty                                        *}
 \Msg{*                                                           *}
-\Msg{* To produce the documentation run the file dottex.dtx      *}
+\Msg{* To produce the documentation run the file gnuplottex.dtx  *}
 \Msg{* through LaTeX.                                            *}
 \Msg{*                                                           *}
 \Msg{* Happy TeXing!                                             *}