summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-23 20:57:10 +0000
committerKarl Berry <karl@freefriends.org>2019-09-23 20:57:10 +0000
commit655a4ad8f43255f97598a33cbf65486709f5af7b (patch)
tree800c4bbb42911674d79a32306bad9d798897585a
parent598dc9ed327598a3377784d2aead0c8e240e855e (diff)
gnuplottex (23sep19)
git-svn-id: svn://tug.org/texlive/trunk@52159 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdfbin415723 -> 416400 bytes
-rw-r--r--Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx33
-rw-r--r--Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty26
3 files changed, 31 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf b/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf
index 6534f169844..6faf601c5cc 100644
--- a/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf
+++ b/Master/texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
index 58286bc6fc8..26fe6da4871 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>
- [2016/08/21 v0.9.2 gnuplot graphs in LaTeX]
+ [2019/09/22 v0.9.3 gnuplot graphs in LaTeX]
\RequirePackage{graphicx,moreverb,keyval,ifthen,catchfile}
%</package>
%
@@ -106,6 +106,7 @@
% \changes{v0.9}{2015/12/08}{Show any errors during conversion on Unix (Enrico Gregorio, suggested by Udo H\"ofel).}
% \changes{v0.9.1}{2015/12/13}{Fix bug in error gathering introduced in 0.9.}
% \changes{v0.9.2}{2016/08/21}{Misc bugfixes (thanks fostermaier, Enrico Gregorio, Jan-Benedict Glaw).}
+% \changes{v0.9.3}{2019/09/22}{Whitespace fixes (thanks Johannes Hielscher).}
%
% \GetFileInfo{gnuplottex.dtx}
%
@@ -144,8 +145,9 @@
% To use gnuplottex, you'll need the \texttt{graphicx}, \texttt{latexsym},
% \texttt{keyval}, \texttt{ifthen}, and \texttt{moreverb} packages and, of
% course, gnuplot.
-%If you want to use tikz-terminal you also have to use the \texttt{gnuplot-lua-tikz}-package from gnuplot.
+% If you want to use tikz-terminal you also have to use the \texttt{gnuplot-lua-tikz}-package from gnuplot.
% If you want to use the \texttt{eepic}-terminal, you'll need the \texttt{eepic}-, the \texttt{epic}- and (if you're not using dvips or dvipdfm) the \texttt{eepicemu}-package.
+% If you use beamer, be aware that you have to call the frame with \texttt{\textbackslash begin\{frame\}[fragile]}.
%
% \section{Usage}
%
@@ -169,7 +171,8 @@
%
% 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.
+% \LaTeX{} doesn't find gnuplot. For example:\\
+% \verb=\def\gnuplotexe{/opt/local/bin/gnuplot}=
%
% The following environment can be used to include graphs:
%
@@ -749,18 +752,18 @@
\def\gnuplotverbatimwrite#1{%
\def\BeforeStream
{\message{Opening gnuplot stream #1}%
- \immediate\write\verbatim@out{\string set terminal \gnuplotterminal \gnuplotterminaloptions}
- \immediate\write\verbatim@out{\string set output '\subfolder\figname.\gnuplottexextension{\gnuplotterminal}'}
+ \immediate\write\verbatim@out{\string set terminal \gnuplotterminal \gnuplotterminaloptions}%
+ \immediate\write\verbatim@out{\string set output '\subfolder\figname.\gnuplottexextension{\gnuplotterminal}'}%
\ifusesiunitx
\ifthenelse{\equal{\extension}{\string tex}}{\usesiunitxingnuplot}{\PackageWarningNoLine{gnuplottex}{Axis numbers not written in \noexpand\num{}. Use a terminal that allows TeX output to enable this feature.}}
\else
\relax
\fi
- }
- \@bsphack
- \immediate\openout \verbatim@out #1
+ }%
+ \@bsphack%
+ \immediate\openout \verbatim@out #1%
\BeforeStream%
- \let\do\@makeother\dospecials
+ \let\do\@makeother\dospecials%
\catcode`\^^M\active
\def\verbatim@processline{%
\immediate\write\verbatim@out
@@ -800,11 +803,11 @@
\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{\subfolder\figname.gnuplot}
+ \def\gnuplotterminal{latex}%%
+ \def\gnuplotterminaloptions{}%%
+ \def\gnuplotscale{1}%%
+ \setkeys{pic}{#1}%%
+ \xdef\gnuplotCutFile{\subfolder\figname.gnuplot}%%
\gnuplotverbatimwrite{\gnuplotCutFile}}
{\endgnuplotverbatimwrite%
\gnuplotgraphicsprocess%
@@ -846,7 +849,7 @@
\PackageWarningNoLine{gnuplottex}{Gnuplot execution produced errors:^^J%
\detokenize\expandafter{\gnuploterrors@}}%
\fi
- }{}%
+ }{}
\fi
}
% \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty b/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty
index 3656bfa21b2..1cd04bee5b0 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}
- [2016/08/21 v0.9.2 gnuplot graphs in LaTeX]
+ [2019/09/22 v0.9.3 gnuplot graphs in LaTeX]
\RequirePackage{graphicx,moreverb,keyval,ifthen,catchfile}
\newif\ifShellEscape
\newif\ifmiktex \miktexfalse
@@ -121,18 +121,18 @@
\def\gnuplotverbatimwrite#1{%
\def\BeforeStream
{\message{Opening gnuplot stream #1}%
- \immediate\write\verbatim@out{\string set terminal \gnuplotterminal \gnuplotterminaloptions}
-\immediate\write\verbatim@out{\string set output '\subfolder\figname.\gnuplottexextension{\gnuplotterminal}'}
+ \immediate\write\verbatim@out{\string set terminal \gnuplotterminal \gnuplotterminaloptions}%
+\immediate\write\verbatim@out{\string set output '\subfolder\figname.\gnuplottexextension{\gnuplotterminal}'}%
\ifusesiunitx
\ifthenelse{\equal{\extension}{\string tex}}{\usesiunitxingnuplot}{\PackageWarningNoLine{gnuplottex}{Axis numbers not written in \noexpand\num{}. Use a terminal that allows TeX output to enable this feature.}}
\else
\relax
\fi
- }
- \@bsphack
- \immediate\openout \verbatim@out #1
+ }%
+ \@bsphack%
+ \immediate\openout \verbatim@out #1%
\BeforeStream%
- \let\do\@makeother\dospecials
+ \let\do\@makeother\dospecials%
\catcode`\^^M\active
\def\verbatim@processline{%
\immediate\write\verbatim@out
@@ -168,11 +168,11 @@
\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{\subfolder\figname.gnuplot}
+\def\gnuplotterminal{latex}%%
+\def\gnuplotterminaloptions{}%%
+\def\gnuplotscale{1}%%
+\setkeys{pic}{#1}%%
+ \xdef\gnuplotCutFile{\subfolder\figname.gnuplot}%%
\gnuplotverbatimwrite{\gnuplotCutFile}}
{\endgnuplotverbatimwrite%
\gnuplotgraphicsprocess%
@@ -210,7 +210,7 @@
\PackageWarningNoLine{gnuplottex}{Gnuplot execution produced errors:^^J%
\detokenize\expandafter{\gnuploterrors@}}%
\fi
- }{}%
+ }{}
\fi
}
\long\gdef\gnuplotgraphicsinclude{%