From a11f13946676deaf937b8b625c23070d5e5f7d9d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Oct 2020 21:33:21 +0000 Subject: pst-3dplot (25oct20) git-svn-id: svn://tug.org/texlive/trunk@56758 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pst-3dplot/pst-3dplot.tex | 42 +++++++++++++--------- .../texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty | 4 +-- 2 files changed, 27 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex index 6186f8ae252..dbcb6883ada 100644 --- a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex +++ b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex @@ -1,4 +1,4 @@ -%% $Id: pst-3dplot.tex 21 2020-08-04 12:53:07Z herbert $ +%% $Id: pst-3dplot.tex 32 2020-10-25 19:18:25Z herbert $ %% %% This is file `pst-3dplot.tex', %% @@ -27,8 +27,10 @@ \ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{2.05} -\def\filedate{2020/08/04} +\def\fileversion{2.06} +\let\IIIDplotfileversion\fileversion +\def\filedate{2020/10/25} +\let\IIIDplotfiledate\filedate \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -642,7 +644,7 @@ % % put anything at (#2,#3,#4) % -\def\pstThreeDPut{\@ifnextchar[{\pst@ThreeDPut}{\pst@ThreeDPut[]}} +\def\pstThreeDPut{\def\pst@par{}\@ifnextchar[{\pst@ThreeDPut}{\pst@ThreeDPut[]}} \def\pst@ThreeDPut[#1](#2,#3,#4)#5{{% \pst@killglue% \psset{#1}% @@ -669,14 +671,15 @@ \def\pstThreeDLine{\NormalIIIDCoor\def\pst@par{}\pst@object{pst@lineIIID}} \def\pst@lineIIID@i{% - \pst@killglue% + \pst@killglue \pst@getarrows{% - \begin@OpenObj% - \pst@getcoors[\pst@lineIIID@ii% + \begin@OpenObj + \pst@getcoors[\pst@lineIIID@ii }% } \def\pst@lineIIID@ii{% \addto@pscode{ + \pst@3ddict \IIIDplot@variables % \psk@ThreeDplot@linejoin setlinejoin /dxUnit \psk@ThreeDplot@xThreeDunit\space def @@ -684,10 +687,11 @@ /dzUnit \psk@ThreeDplot@zThreeDunit\space def \ifPst@SphericalCoor /SphericalCoor true def \else /SphericalCoor false def - \fi % + \fi /xUnit { \pst@number\psxunit\space mul } def /yUnit { \pst@number\psyunit\space mul } def - \pst@3ddict convertStackTo2D end + convertStackTo2D + end \pst@cp\space \psline@iii\space \tx@Line }% \end@OpenObj @@ -699,11 +703,14 @@ % \def\pstThreeDDot{\def\pst@par{}\pst@object{pstThreeDDot}} \def\pstThreeDDot@i(#1,#2,#3){% - \begin@SpecialObj + \begingroup + \use@keep@par \pstThreeDNode(#1,#2,#3){pst@A} % we need the parameters \ifx\psk@dotstyle\@none\else\psdots(pst@A)\fi + \endgroup \ifPst@drawCoor - \psset{style=showCoorStyle} + \addbefore@par{style=showCoorStyle} + \begin@SpecialObj \addto@pscode{ \pst@3ddict \IIIDplot@variables @@ -747,8 +754,8 @@ \fi end }% - \fi% - \end@SpecialObj% + \end@SpecialObj + \fi \ignorespaces} % % transform the 3d coordinates of the node (#1,#2,#3) @@ -756,13 +763,13 @@ % \def\pstThreeDNode{\def\pst@par{}\pst@object{pstThreeDNode}} \def\pstThreeDNode@i(#1,#2,#3)#4{% - \begin@SpecialObj% -% \def\pst@tempThreeDNode{#1 #2 #3 }% + \begingroup + \use@par +% \begin@SpecialObj% \pnode(! \pst@3ddict \IIIDplot@variables #1 #2 #3 -% \pst@tempThreeDNode \ifPst@SphericalCoor ConvertToCartesian \else @@ -771,7 +778,8 @@ \psk@ThreeDplot@xThreeDunit\space mul /x ED \fi ConvertTo2D x2D y2D end ){#4}% - \end@SpecialObj% +% \end@SpecialObj + \endgroup \ignorespaces} % %\define@key[psset]{pst-3dplot}{nodeType}{\pst@getint{#1}\pst@IIIDNodeType} diff --git a/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty b/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty index 60d1f7da48e..ae8c1ff0fca 100644 --- a/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty +++ b/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty @@ -1,4 +1,4 @@ -%% $Id: pst-3dplot.sty 21 2020-08-04 12:53:07Z herbert $ +%% $Id: pst-3dplot.sty 32 2020-10-25 19:18:25Z herbert $ \RequirePackage{pstricks} \RequirePackage{pst-3d} \RequirePackage{pst-plot} @@ -9,7 +9,7 @@ \input{pst-3dplot.tex} \IfFileExists{pst-3dplot.pro}{% \ProvidesFile{pst-3dplot.pro} - [2010/01/01 v. 0.30, PostScript prologue file (hv)] + [2017/04/05 v. 0.33, PostScript prologue file (hv)] \@addtofilelist{pst-3dplot.pro}}{}% \ProvidesFile{pst-3dplot.tex} [\filedate\space v\fileversion\space `PST-3dplot' (hv)] -- cgit v1.2.3