summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/gnuplottex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-10-06 23:20:38 +0000
committerKarl Berry <karl@freefriends.org>2007-10-06 23:20:38 +0000
commit239dea3abc650575370879a8bdc6f69f4861aceb (patch)
treedfb87b98af4b79d436241b1e9c5b7609190e592b /Master/texmf-dist/tex/latex/gnuplottex
parenta1c3638affd84cf8e0b5f8173c1790e7a2dba167 (diff)
gnuplottex update (6oct07)
git-svn-id: svn://tug.org/texlive/trunk@5128 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/gnuplottex')
-rw-r--r--Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty33
1 files changed, 24 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty b/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty
index 05a3044a666..bafdb9e617e 100644
--- a/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty
+++ b/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty
@@ -41,8 +41,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{gnuplottex}
- [2007/08/21 v0.3 gnuplot graphs in LaTeX]
-\RequirePackage{latexsym,graphicx,moreverb,keyval}
+ [2007/10/06 v0.4.1 gnuplot graphs in LaTeX]
+\RequirePackage{latexsym,graphicx,moreverb,keyval,ifthen}
\newif\ifShellEscape
\newif\ifmiktex \miktexfalse
@@ -84,8 +84,8 @@
\def\gnuplotverbatimwrite#1{%
\def\BeforeStream
{\message{Opening gnuplot stream #1}%
- \immediate\write\verbatim@out{\string set terminal latex}
-\immediate\write\verbatim@out{\string set output '\figname.tex'}
+ \immediate\write\verbatim@out{\string set terminal \gnuplotterminal}
+\immediate\write\verbatim@out{\string set output '\figname.\gnuplottexextension{\gnuplotterminal}'}
}
\@bsphack
\immediate\openout \verbatim@out #1
@@ -110,27 +110,42 @@
\catcode`\_8
\catcode`\ 10
\catcode`\%14}
-\define@key{pic}{scale}{\def\gnuplotscale{#1}}
+\def\gnuplottexextension@latex{\string tex}
+\def\gnuplottexextension@epslatex{\string tex}
+\def\gnuplottexextension@eepic{\string tex}
+\def\gnuplottexextension@pstricks{\string tex}
+\def\gnuplottexextension@pslatex{\string tex}
+\def\gnuplottexextension@pstex{\string tex}
+\def\gnuplottexextension@emtex{\string tex}
+\def\gnuplottexextension@jpeg{\string jpg}
+\def\gnuplottexextension#1{\@ifundefined{gnuplottexextension@#1}{#1}{\csname gnuplottexextension@#1\endcsname}}
+\define@key{pic}{scale}[1]{\def\gnuplotscale{#1}}
+\define@key{pic}{terminal}[latex]{\def\gnuplotterminal{#1}}
\newenvironment{gnuplot}[1][]{\stepcounter{fignum}%
+\def\gnuplotterminal{latex}
\def\gnuplotscale{1}
\setkeys{pic}{#1}
\xdef\gnuplotCutFile{\figname.gnuplot}
\gnuplotverbatimwrite{\gnuplotCutFile}}
{\endgnuplotverbatimwrite%
+ \gnuplotgraphicsprocess%
\gnuplotgraphicsinclude}
\long\gdef\gnuplotgraphicsprocess{%
\ifShellEscape
\IfFileExists{\figname.gnuplot}{%
\immediate\write18{gnuplot \figname.gnuplot}
-\IfFileExists{\figname.tex}{%
+\IfFileExists{\figname.\gnuplottexextension{\gnuplotterminal}}{%
\PackageInfo{gnuplottex}
{\figname.gnuplot converted}}
{\PackageWarningNoLine{gnuplottex}
{Conversion of \figname.gnuplot failed.}}}{}
\fi}
-\long\gdef\gnuplotgraphicsinclude{\gnuplotgraphicsprocess%
-\IfFileExists{\figname.tex}{%
-\scalebox{\gnuplotscale}{\input{\figname}}}
+\long\gdef\gnuplotgraphicsinclude{%
+\IfFileExists{\figname.\gnuplottexextension{\gnuplotterminal}}{%
+\ifthenelse{\equal{\gnuplottexextension{\gnuplotterminal}}{\string tex}}
+{\scalebox{\gnuplotscale}{\input{\figname.\gnuplottexextension{\gnuplotterminal}}}}
+{\includegraphics[scale=\gnuplotscale]{\figname.\gnuplottexextension{\gnuplotterminal}}}
+}
{\PackageWarningNoLine{gnuplottex}
{Please convert \figname.gnuplot manually}}
}