From d2f0ecc37190cee10c8bc9e9370d53977f42d150 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 16 Nov 2013 23:50:07 +0000 Subject: gnuplottex (16nov13) git-svn-id: svn://tug.org/texlive/trunk@32160 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf | Bin 174323 -> 174592 bytes .../source/latex/gnuplottex/gnuplottex.dtx | 13 ++++++++++--- .../texmf-dist/tex/latex/gnuplottex/gnuplottex.sty | 6 ++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf b/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf index 6091d2ef1ed..67a208f843f 100644 Binary files a/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf and b/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf differ diff --git a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx index 5ea94440b65..34dd93a13f6 100644 --- a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx +++ b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx @@ -42,7 +42,7 @@ % \NeedsTeXFormat{LaTeX2e}[1999/12/01] % \ProvidesPackage{gnuplottex} %<*package> - [2013/09/08 v0.7.1 gnuplot graphs in LaTeX] + [2013/11/16 v0.7.2 gnuplot graphs in LaTeX] \RequirePackage{latexsym,graphicx,moreverb,keyval,ifthen} % % @@ -60,7 +60,7 @@ % % \fi % -% \CheckSum{403} +% \CheckSum{408} % % \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 @@ -93,6 +93,7 @@ % \changes{v0.6}{2013/06/28}{Support for \texttt{siunitx} package and tikz terminal (Udo H\"ofel).} % \changes{v0.7}{2013/07/23}{Add cleanup and subfolder option (Udo H\"ofel).} % \changes{v0.7.1}{2013/09/08}{Fix bug with subfolder option with MikTeX (Thomas Schmid).} +% \changes{v0.7.2}{2013/11/16}{Allow to specify path to gnuplot (Manuel Solano).} % % \GetFileInfo{gnuplottex.dtx} % @@ -149,6 +150,10 @@ % \item[\oarg{cleanup}] Delete the \texttt{.gnuplot} files after conversion. % \end{description} % +% In addition, you can set \verb=\gnuplotexe= to the path to the gnuplot +% executable. Normally, you don't need to do this; use this option only if +% \LaTeX{} doesn't find gnuplot. +% % The following environment can be used to include graphs: % % \DescribeEnv{gnuplot} @@ -217,6 +222,8 @@ \DeclareOption{cleanup}{\cleanuptrue} \DeclareOption{subfolder}{\usesubfoldertrue} +\@ifundefined{gnuplotexe}{\def\gnuplotexe{gnuplot}}{} + \ExecuteOptions{shell} \ProcessOptions\relax %% test if shell escape really works @@ -349,7 +356,7 @@ \long\gdef\gnuplotgraphicsprocess{% \ifShellEscape \IfFileExists{\subfolder\figname.gnuplot}{% - \immediate\write18{gnuplot \subfolder\figname.gnuplot} + \immediate\write18{\gnuplotexe\space \subfolder\figname.gnuplot} \IfFileExists{\subfolder\figname.\extension}{% \PackageInfo{gnuplottex}{\subfolder\figname.gnuplot converted} \ifcleanup diff --git a/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty b/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty index 085755d6849..1b3b83c156c 100644 --- a/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty +++ b/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{gnuplottex} - [2013/09/08 v0.7.1 gnuplot graphs in LaTeX] + [2013/11/16 v0.7.2 gnuplot graphs in LaTeX] \RequirePackage{latexsym,graphicx,moreverb,keyval,ifthen} \newif\ifShellEscape \newif\ifmiktex \miktexfalse @@ -58,6 +58,8 @@ \DeclareOption{cleanup}{\cleanuptrue} \DeclareOption{subfolder}{\usesubfoldertrue} +\@ifundefined{gnuplotexe}{\def\gnuplotexe{gnuplot}}{} + \ExecuteOptions{shell} \ProcessOptions\relax %% test if shell escape really works @@ -177,7 +179,7 @@ \long\gdef\gnuplotgraphicsprocess{% \ifShellEscape \IfFileExists{\subfolder\figname.gnuplot}{% -\immediate\write18{gnuplot \subfolder\figname.gnuplot} +\immediate\write18{\gnuplotexe\space \subfolder\figname.gnuplot} \IfFileExists{\subfolder\figname.\extension}{% \PackageInfo{gnuplottex}{\subfolder\figname.gnuplot converted} \ifcleanup -- cgit v1.2.3