From 40b7a17d9a7fae639bf4f42c43a3b3e9541ddef6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 4 Aug 2020 21:27:23 +0000 Subject: pst-3dplot (4aug20) git-svn-id: svn://tug.org/texlive/trunk@56043 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pst-3dplot/pst-3dplot.tex | 67 +++++++++++----------- .../texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty | 4 +- 2 files changed, 35 insertions(+), 36 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 38c21da9c32..6186f8ae252 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 401 2017-04-05 06:57:36Z herbert $ +%% $Id: pst-3dplot.tex 21 2020-08-04 12:53:07Z herbert $ %% %% This is file `pst-3dplot.tex', %% @@ -27,8 +27,8 @@ \ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{2.04} -\def\filedate{2017/04/05} +\def\fileversion{2.05} +\def\filedate{2020/08/04} \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -347,10 +347,10 @@ % \def\pstThreeDCoor{\def\pst@par{}\pst@object{pstThreeDCoor}} \def\pstThreeDCoor@i{% - \pst@killglue% - \begingroup% + \pst@killglue + \begingroup \addbefore@par{linewidth=0.5pt,linecolor=red,arrows=->,dotstyle=|}% - \use@par% + \use@par \expandafter\pst@getIIIDValues\psk@ThreeDplot@Offset{\pst@OffsetX}{\pst@OffsetY}{\pst@OffsetZ}\@nil \pstThreeDNode(\psk@ThreeDplot@xMin,\pst@OffsetY,\pst@OffsetZ){xMin}% \psset[pst-3dplot]{RotSet=keep}% Keep the current rotation matrix @@ -366,15 +366,17 @@ \uput[\psk@ThreeDplot@spotX](xMax){\psk@ThreeDplot@nameX}% \uput[\psk@ThreeDplot@spotY](yMax){\psk@ThreeDplot@nameY}% \uput[\psk@ThreeDplot@spotZ](zMax){\psk@ThreeDplot@nameZ}% - \ifPst@IIIDticks% + \ifPst@IIIDticks %------------ x ticks and labels -------------------------- \ifdim\psk@ThreeDplot@xMax pt>0pt % only for positive parts of the axes \ifdim\psk@ThreeDplot@xMin pt>\z@ \pstFPadd\pst@tempC\psk@ThreeDplot@xMax{-\psk@ThreeDplot@xMin} - \else\let\pst@tempC\psk@ThreeDplot@xMax\fi + \else + \let\pst@tempC\psk@ThreeDplot@xMax + \fi \pstFPadd\pst@tempC\pst@tempC{-\pst@OffsetX} \pstFPDiv\pst@tempB\pst@tempC{\psk@ThreeDplot@deltax} - \pst@cntx=\pst@tempB \advance\pst@cntx by -1% + \pst@cntx=\pst@tempB \advance\pst@cntx by -1 \pstFPdiv\pst@tempB\psk@IIIDticksize{\psk@ThreeDplot@yThreeDunit} \pstFPadd\pst@tempA{-\pst@tempB}{\pst@OffsetY} \pstFPadd\pst@tempB{\pst@tempB}{\pst@OffsetY} @@ -396,7 +398,7 @@ \ifPst@IIIDlabels% \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\pst@tempE,\pst@OffsetZ){% \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@xlabelFactor}}% -% \psxyzlabel{\nA\psk@xlabelFactor}}% +%% \psxyzlabel{\nA\psk@xlabelFactor}}% \fi% }% end of multido \fi% @@ -425,7 +427,7 @@ \ifPst@IIIDlabels% \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\pst@tempE,\pst@OffsetZ){% \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@xlabelFactor}}% -% \psxyzlabel{\nA\psk@xlabelFactor}}% +%% \psxyzlabel{\nA\psk@xlabelFactor}}% \fi% }% end of multido and the x ticks and labels \fi @@ -458,7 +460,7 @@ \ifPst@IIIDlabels% \pstPlanePut[plane=\psk@IIIDyTicksPlane](\pst@tempE,\rB,\pst@OffsetZ){% \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@ylabelFactor}}% -% \psxyzlabel{\nA\psk@ylabelFactor}}% +%% \psxyzlabel{\nA\psk@ylabelFactor}}% \fi% }% end of multido \fi% @@ -487,7 +489,7 @@ \ifPst@IIIDlabels% \pstPlanePut[plane=\psk@IIIDyTicksPlane](\pst@tempE,\rB,\pst@OffsetZ){% \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@ylabelFactor}}% -% \psxyzlabel{\nA\psk@ylabelFactor}}% +%% \psxyzlabel{\nA\psk@ylabelFactor}}% \fi }% end of multido and y ticks and labels \fi @@ -519,7 +521,7 @@ \pstThreeDLine[arrows=-](\pst@tempA,\pst@OffsetY,\rB)(\pst@tempB,\pst@OffsetY,\rB)% \fi\fi \ifPst@IIIDlabels% -% \pshlabel{\psk@labelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}% +%% \pshlabel{\psk@labelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}% \pstPlanePut[plane=\psk@IIIDzTicksPlane](\pst@OffsetX,\pst@tempE,\rB){% \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@zlabelFactor}}% \fi% @@ -549,14 +551,14 @@ \ifPst@IIIDlabels% \pstPlanePut[plane=\psk@IIIDzTicksPlane](\pst@OffsetX,\pst@tempE,\rB){% \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@zlabelFactor}}% -% \psxyzlabel{\nA\psk@zlabelFactor}}% +%% \psxyzlabel{\nA\psk@zlabelFactor}}% \fi% }% end \multido \fi% end \ifdim\psk@ThreeDplot@zMin \fi% end \ifPst@IIIDticks% \fi% end \ifPst@drawing - \endgroup% - \ignorespaces% + \endgroup + \ignorespaces } % % planeGrids @@ -674,8 +676,7 @@ }% } \def\pst@lineIIID@ii{% - \addto@pscode{% - \pst@3ddict + \addto@pscode{ \IIIDplot@variables % \psk@ThreeDplot@linejoin setlinejoin /dxUnit \psk@ThreeDplot@xThreeDunit\space def @@ -686,13 +687,12 @@ \fi % /xUnit { \pst@number\psxunit\space mul } def /yUnit { \pst@number\psyunit\space mul } def - convertStackTo2D - end + \pst@3ddict convertStackTo2D end \pst@cp\space \psline@iii\space \tx@Line }% - \end@OpenObj% - \ignorespaces% - \SpecialCoor% + \end@OpenObj + \ignorespaces + \SpecialCoor } % % set a 3d dot @@ -1014,9 +1014,8 @@ \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% front square \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% top square \ifPst@hiddenLine -% \psset{} - \pstThreeDLine[linestyle=\psk@ThreeDplot@invisibleLineStyle](\pst@tempX #1 add,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY #5 add,\pst@tempZ) - \pstThreeDLine[linestyle=\psk@ThreeDplot@invisibleLineStyle](\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY,\pst@tempZ #9 add) + \pstThreeDLine[linestyle=\psk@ThreeDplot@invisibleLineStyle](\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add) + \pstThreeDLine[linestyle=\psk@ThreeDplot@invisibleLineStyle](\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add) % \psset{linestyle=\psk@ThreeDplot@visibleLineStyle} \else \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% bottom square @@ -2033,7 +2032,7 @@ \def\ps@Plane{\pst@makebox{\psPlane@}} \def\psPlane@{% \begingroup - \leavevmode% + \leavevmode \hbox{% % \kern\wd\pst@hbox% \pst@Verb{% @@ -2108,18 +2107,18 @@ \ifx\psk@ThreeDplot@plane\ThreeDplot@planeXY 270 Delta sub rotate /Rho 90 Gamma add Delta add def - \else% + \else \ifx\psk@ThreeDplot@plane\ThreeDplot@planeXZ 270 Delta sub rotate /Rho 180 Delta add def - \else% + \else Gamma rotate /Rho 90 Gamma sub def - \fi% - \fi% - Rho cos Rho sin 0 0 ] concat} \tx@TMChange% + \fi + \fi + Rho cos Rho sin 0 0 ] concat} \tx@TMChange }% - \box\pst@hbox% + \box\pst@hbox \pst@Verb{\tx@TMRestore}% % \kern\ht\pst@hbox% }% 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 30173c1270f..60d1f7da48e 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 401 2017-04-05 06:57:36Z herbert $ +%% $Id: pst-3dplot.sty 21 2020-08-04 12:53:07Z 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} - [2017/04/05 v. 0.33, PostScript prologue file (hv)] + [2010/01/01 v. 0.30, PostScript prologue file (hv)] \@addtofilelist{pst-3dplot.pro}}{}% \ProvidesFile{pst-3dplot.tex} [\filedate\space v\fileversion\space `PST-3dplot' (hv)] -- cgit v1.2.3