From 9b28171a4cb40cd4343bcd6ac913c41acba5220a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 22 Jun 2010 23:25:26 +0000 Subject: pst-plot update (22jun10) git-svn-id: svn://tug.org/texlive/trunk@19110 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-plot/Changes | 2 ++ .../doc/generic/pst-plot/pst-plot-doc.pdf | Bin 844911 -> 772306 bytes .../doc/generic/pst-plot/pst-plot-doc.tex | 2 +- .../texmf-dist/tex/generic/pst-plot/pst-plot.tex | 28 +++++++++++---------- 4 files changed, 18 insertions(+), 14 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes index ec501e66371..adbbec4cd19 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/Changes +++ b/Master/texmf-dist/doc/generic/pst-plot/Changes @@ -1,4 +1,6 @@ ----- pst-plot.tex +1.17 2010-06-22 - fix bug with global setting of arguments in \readdata +1.16 2010-05-14 - allow origin when x axis is not crossing the y axis 1.15 2010-04-29 - fixed bug with double definition of tickstyle 1.14 2010-04-24 - allow labels=x|y|all|none for polar plots 1.13 2010-04-15 - for log labels take care the different font size diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf index 973bac227c2..05e490795bc 100644 Binary files a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf and b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex index 6134e5ef2c7..1bf58798d87 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex @@ -1,4 +1,4 @@ -%% $Id: pst-plot-doc.tex 305 2010-04-24 06:53:47Z herbert $ +%% $Id: pst-plot-doc.tex 314 2010-05-14 17:02:16Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc} \listfiles diff --git a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex index 5102d8c6adc..61e221f3b11 100644 --- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex +++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex @@ -1,4 +1,4 @@ -% $Id: pst-plot.tex 305 2010-04-24 06:53:47Z herbert $ +% $Id: pst-plot.tex 356 2010-06-22 13:43:55Z herbert $ %% BEGIN pst-plot.tex %% %% plotting functions and data with PSTricks. @@ -20,9 +20,9 @@ \ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi \ifx\MultidoLoaded\endinput\else \input multido.tex \fi % -\def\fileversion{1.15} -\def\filedate{2010/04/29} -\message{ v\fileversion, \filedate} +\def\fileversion{1.17} +\def\filedate{2010/06/22} +\message{ v\fileversion, \filedate\space (tvz,hv)} % \edef\TheAtCode{\the\catcode`\@} \catcode`\@=11 @@ -76,7 +76,6 @@ D\space##1% \let(,\let),\let{,\let},\let ,\let^^M,\let_\@empty*% End def \endgroup % - \define@key[psset]{pst-plot}{ignoreLines}[0]{\def\psk@ignoreLines{#1}} \psset[pst-plot]{ignoreLines=0} % @@ -105,10 +104,10 @@ D\space##1% % \def\readdata{\@ifnextchar[{\readdata@i}{\readdata@i[]}} \def\readdata@i[#1]#2#3{% - \def\pst@tempA{#1}% - \ifx\pst@tempA\@empty\else\psset{#1}\fi +% \def\pst@tempA{#1}% \openin1=#3 \begingroup + \ifx#1\relax#1\else\psset{#1}\fi \def\pst@tempg{}% \ifeof1 \@pstrickserr{Data file `#3' not found.}\@ehpa @@ -962,7 +961,7 @@ D\space##1% \fi\fi\fi\fi} \psset[pst-plot]{ticks=all} % -\define@key[psset]{pst-plot}{labels}[all]{\pst@expandafter\psset@@ticks{#1}\@nil\psk@labels} +\define@key[psset]{pst-plot}{labels}[all]{\pst@expandafter\psset@@ticks{#1}\@nil\psk@labels}% same as ticks \psset[pst-plot]{labels=all} % \define@key[psset]{pst-plot}{Ox}[0]{\def\psk@Ox{#1}} @@ -1319,7 +1318,7 @@ D\space##1% % % \def\set@xticksize#1{% - \pst@expandafter\pst@getydimdim{#1} {} {}\@nil % y-unit!! + \pst@expandafter\pst@getydimdim{#1} {} {}\@nil% y-unit!! \ifdim\pst@dimm>\pst@dimn% % first > second value \pst@xticksizeA=\the\pst@dimn% \pst@xticksizeB=\the\pst@dimm% @@ -1335,7 +1334,7 @@ D\space##1% \fi% } \def\set@yticksize#1{% - \pst@expandafter\pst@getxdimdim{#1} {} {}\@nil % x-unit! + \pst@expandafter\pst@getxdimdim{#1} {} {}\@nil% x-unit! \ifdim\pst@dimm>\pst@dimn\relax% % first > second value \pst@yticksizeA=\the\pst@dimn% \pst@yticksizeB=\the\pst@dimm% @@ -1355,7 +1354,7 @@ D\space##1% \define@key[psset]{pst-plot}{ticksize}[-4pt 4pt]{% \def\pst@tempA{max}% \def\pst@tempB{#1}% - \ifx\pst@tempA\pst@tempB + \ifx\pst@tempA\pst@tempB% \Pst@maxxTickstrue\Pst@maxyTickstrue% \set@xticksize{0 4pt}\set@yticksize{0 4pt}% \else% @@ -1371,7 +1370,7 @@ D\space##1% \define@key[psset]{pst-plot}{yticksize}{% \def\pst@tempA{max}% \def\pst@tempB{#1}% - \ifx\pst@tempA\pst@tempB + \ifx\pst@tempA\pst@tempB% \Pst@maxyTickstrue\set@yticksize{0 4pt}% \else\set@yticksize{#1}\Pst@maxyTicksfalse\fi}% \psset[pst-plot]{ticksize=-4pt 4pt} @@ -1550,7 +1549,7 @@ D\space##1% \fi% % \ifPst@xAxis\else\showorigintrue\fi% 2009-10-21 \pst@vlabels{\pst@dimd}{\psk@arrowB}{#3}{#5}% - \ifPst@xAxis\showoriginfalse\fi% + \ifPst@xAxis\ifdim\pst@dima<\z@\showoriginfalse\fi\fi% no 0 when x- axis is crossing \pst@vlabels{\pst@dimb}{\psk@arrowA}{#3}{#5}% \endgroup% \fi% @@ -2086,6 +2085,9 @@ D\space##1% \@namedef{psgraph*}{\psgraph*} \@namedef{endpsgraph*}{\endpsgraph} % +\def\psResetPlotValues{% +} +% \catcode`\@=\TheAtCode\relax \endinput %% -- cgit v1.2.3