diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx')
| -rw-r--r-- | Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx index 1816c309d36..3ea2a78d27d 100644 --- a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx +++ b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx @@ -42,7 +42,7 @@ %<package> \NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package> \ProvidesPackage{gnuplottex} %<*package> - [2007/10/06 v0.4.1 gnuplot graphs in LaTeX] + [2007/10/13 v0.4.2 gnuplot graphs in LaTeX] \RequirePackage{latexsym,graphicx,moreverb,keyval,ifthen} %</package> % @@ -60,7 +60,7 @@ %</driver> % \fi % -% \CheckSum{233} +% \CheckSum{238} % % \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 @@ -84,6 +84,7 @@ % \changes{v0.3}{2007/08/21}{Improved MikTeX compatibility.} % \changes{v0.4}{2007/09/28}{Added feature to specify gnuplot terminal.} % \changes{v0.4.1}{2007/10/06}{Improved gnuplot terminal handling.} +% \changes{v0.4.2}{2007/10/13}{Added terminaloptions option.} % % \GetFileInfo{gnuplottex.dtx} % @@ -91,7 +92,7 @@ % % \title{The \textsf{gnuplottex} package\thanks{This document % corresponds to \textsf{gnuplottex}~\fileversion, dated \filedate.}} -% \author{Lars Kotthoff\\ \texttt{lars@larsko.org}} +% \author{Lars Kotthof\/f\\ \texttt{lars@larsko.org}} % % \maketitle % @@ -148,19 +149,25 @@ % be the cause. % % The terminal name can be specified as -% a value to the key \texttt{terminal} as an argument to the environment, -% \verb=\begin{gnuplottex}=[scale=\meta{terminal}]\\ +% a value to the key \texttt{terminal} as an argument to the environment,\\ +% \verb=\begin{gnuplottex}=[terminal=\meta{terminal}]\\ % \ldots\\ % \verb=\end{gnuplottex}= % % The graph can be scaled by providing an argument to the \texttt{scale} key, % similar to the specification of the terminal name. It defaults to 1, i.e.\ no -% scaling will be done. +% scaling will be done. Additional options to the terminal can be given as +% argument to the \texttt{terminaloptions} key, e.g.\\ +% \verb=\begin{gnuplottex}=[terminal=pdf,terminaloptions=fsize 12 linewidth 2]\\ +% \ldots\\ +% \verb=\end{gnuplottex}= % % \section{Acknowledgements} % % Thanks to Roy Ratcliffe for the suggestion and basic code for the gnuplot % terminal specification and handling. +% I would also like to thank all the people who sent me bug reports and feature +% requests. Gnuplottex wouldn't be what it is today without you. % % \StopEventually{} % @@ -213,7 +220,7 @@ \def\gnuplotverbatimwrite#1{% \def\BeforeStream {\message{Opening gnuplot stream #1}% - \immediate\write\verbatim@out{\string set terminal \gnuplotterminal} + \immediate\write\verbatim@out{\string set terminal \gnuplotterminal \gnuplotterminaloptions} \immediate\write\verbatim@out{\string set output '\figname.\gnuplottexextension{\gnuplotterminal}'} } \@bsphack @@ -254,8 +261,10 @@ \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}} +\define@key{pic}{terminaloptions}{\def\gnuplotterminaloptions{ #1}} \newenvironment{gnuplot}[1][]{\stepcounter{fignum}% \def\gnuplotterminal{latex} + \def\gnuplotterminaloptions{} \def\gnuplotscale{1} \setkeys{pic}{#1} \xdef\gnuplotCutFile{\figname.gnuplot} @@ -267,25 +276,25 @@ % % \subsection{\texttt{.gnuplot} file processing} % \begin{macrocode} +\def\extension{\gnuplottexextension{\gnuplotterminal}} \long\gdef\gnuplotgraphicsprocess{% \ifShellEscape \IfFileExists{\figname.gnuplot}{% \immediate\write18{gnuplot \figname.gnuplot} - \IfFileExists{\figname.\gnuplottexextension{\gnuplotterminal}}{% - \PackageInfo{gnuplottex} - {\figname.gnuplot converted}} + \IfFileExists{\figname.\extension}{% + \PackageInfo{gnuplottex}{\figname.gnuplot converted}} {\PackageWarningNoLine{gnuplottex} - {Conversion of \figname.gnuplot failed.}}}{} + {Conversion of \figname.gnuplot failed}}}{} \fi} % \end{macrocode} % % \subsection{Graph inclusion} % \begin{macrocode} \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}}} + \IfFileExists{\figname.\extension}{% + \ifthenelse{\equal{\extension}{\string tex}} + {\scalebox{\gnuplotscale}{\input{\figname.\extension}}} + {\includegraphics[scale=\gnuplotscale]{\figname.\extension}} } {\PackageWarningNoLine{gnuplottex} {Please convert \figname.gnuplot manually}} |