texlive[56043] Master/texmf-dist: pst-3dplot (4aug20)
commits+karl at tug.org
commits+karl at tug.org
Tue Aug 4 23:27:23 CEST 2020
Revision: 56043
http://tug.org/svn/texlive?view=revision&revision=56043
Author: karl
Date: 2020-08-04 23:27:23 +0200 (Tue, 04 Aug 2020)
Log Message:
-----------
pst-3dplot (4aug20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-3dplot/Changes
trunk/Master/texmf-dist/doc/generic/pst-3dplot/README
trunk/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
trunk/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
trunk/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
trunk/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
trunk/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty
Modified: trunk/Master/texmf-dist/doc/generic/pst-3dplot/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-3dplot/Changes 2020-08-04 17:21:54 UTC (rev 56042)
+++ trunk/Master/texmf-dist/doc/generic/pst-3dplot/Changes 2020-08-04 21:27:23 UTC (rev 56043)
@@ -20,6 +20,7 @@
pst-3dplot.tex --------
+2.05 2020-08-04 - fix for hiddenLine
2.04 2017-04-05 - added coorType=7
2.03 2014-12-01 - modifications to coorType=6
2.02 2014-09-01 - use the alternative for hidden lines of \psThreeDBox
Modified: trunk/Master/texmf-dist/doc/generic/pst-3dplot/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-3dplot/README 2020-08-04 17:21:54 UTC (rev 56042)
+++ trunk/Master/texmf-dist/doc/generic/pst-3dplot/README 2020-08-04 21:27:23 UTC (rev 56043)
@@ -2,7 +2,7 @@
%%
%% Herbert Voss <hvoss at tug.org>
%%
-%% 2014-02-01
+%% 2020-08-04
%%
PSTricks offers excellent macros to insert more or less complex
@@ -13,36 +13,3 @@
pst-plot package for two dimensional objects and mathematical functions.
-Save the files
-
-pst-3dplot.sty
-pst-3dplot.tex
-pst-3dplot.pro
-
-in any place, where latex or any other TeX program will find it.
-The pro file should go into $TEXMF$/dvips/pstricks/.
-
-pst-3dplot uses the extended version of the keyval package. So
-be sure that you
-- have installed xkeyval with the special pst-xkey
- (CTAN: /macros/latex/contrib/xkeyval/)
-- do not load another package after pst-3dplot, which loads
- the old keyval.sty or pst-key.tex
-
-
-If you like to get the documentation file in another format run
-
-latex pst-3dplot-doc.tex
-bibtex pst-3dplot-doc
-latex pst-3dplot-doc.tex
-dvips pst-3dplot-doc.dvi
-
-to get a PostScript file. But pay attention, that the pst-3dplot
-files are saved in the above mentioned way, before you run
-latex on the documentation file.
-
-The intermediate DVI file works only with viewers which can
-interprete the embedded PostScript code.
-
-For another PDF output read the introduction from
-the documentation.
Modified: trunk/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex 2020-08-04 17:21:54 UTC (rev 56042)
+++ trunk/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex 2020-08-04 21:27:23 UTC (rev 56043)
@@ -1,15 +1,11 @@
\input{pst-3dplot-doc.dat}
-%% $Id: pst-3dplot-doc.tex 401 2017-04-05 06:57:36Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
+%% $Id: pst-3dplot-doc.tex 21 2020-08-04 12:53:07Z herbert $
+\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings,
headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
\listfiles
\usepackage[utf8]{inputenc}
-
-\usepackage{biblatex}
-\addbibresource{\jobname.bib}
-
\usepackage{pst-grad,pst-3dplot}
\let\pstFV\fileversion
\let\belowcaptionskip\abovecaptionskip
@@ -19,6 +15,8 @@
%\usepackage{tabularx}
%\usepackage{longtable}
%
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
\makeatletter
\renewcommand*\l at subsection{\bprot at dottedtocline{2}{1.5em}{3.6em}}
@@ -1266,7 +1264,8 @@
\end{BDef}
-These are the origin vector $\vec{o}$ and three direction vectors $\vec{u}$, $\vec{v}$ and $\vec{w}$,
+These are the origin vector $\vec{o}$ and three direction vectors $\vec{u}$ ($x$ direction) , $\vec{v}$ ($y$ direction)
+and $\vec{w}$ ($z$ direction),
which are for example shown in the following figure.
@@ -1291,16 +1290,24 @@
\begin{pspicture}(-2,-1.25)(3,4.25)
\psset{Alpha=30,Beta=30}
\pstThreeDCoor[xMin=-3,xMax=1,yMin=-1,yMax=2,zMin=-1,zMax=4]
- \pstThreeDBox[hiddenLine](-1,1,2)(0,0,2)(2,0,0)(0,1,0)
+ \pstThreeDBox[hiddenLine](-1,1,2)(2,0,0)(0,1,0)(0,0,2)
\pstThreeDDot[drawCoor=true](-1,1,2)
\end{pspicture}
\end{LTXexample}
+
+Hidden lines are only possible if you view the object from the
+front and not from behind.
+
+\iffalse
+
+If you are looking from behind, then change the order of the ditection vectors:
+
\begin{LTXexample}[width=5.25cm]
\begin{pspicture}(-2,-1.25)(3,4.25)
\psset{Alpha=210,Beta=30}
\pstThreeDCoor[xMin=-3,xMax=1,yMin=-1,yMax=2,zMin=-1,zMax=4]
- \pstThreeDBox[hiddenLine](-1,1,2)(0,0,2)(2,0,0)(0,1,0)
+ \pstThreeDBox[hiddenLine,alternative](-1,1,2)(2,0,0)(0,1,0)(0,0,2)
\pstThreeDDot[drawCoor=true](-1,1,2)
\end{pspicture}
\end{LTXexample}
@@ -1318,7 +1325,7 @@
\begin{pspicture}(-2,-1.25)(3,4.25)
\psset{Alpha=130,Beta=30}
\pstThreeDCoor[xMin=-3,xMax=1,yMin=-1,yMax=2,zMin=-1,zMax=4]
- \pstThreeDBox[hiddenLine](-1,1,2)(0,0,2)(2,0,0)(0,1,0)
+ \pstThreeDBox[hiddenLine](-1,1,2)(2,0,0)(0,1,0)(0,0,2)
\pstThreeDDot[drawCoor=true](-1,1,2)
\end{pspicture}
\end{LTXexample}
@@ -1327,12 +1334,15 @@
\begin{pspicture}(-2,-1.25)(3,4.25)
\psset{Alpha=130,Beta=100}
\pstThreeDCoor[xMin=-3,xMax=1,yMin=-1,yMax=2,zMin=-1,zMax=4]
- \pstThreeDBox[hiddenLine](-1,1,2)(0,0,2)(2,0,0)(0,1,0)
+ \pstThreeDBox[hiddenLine](-1,1,2)(2,0,0)(0,1,0)(0,0,2)
\pstThreeDDot[drawCoor=true](-1,1,2)
\end{pspicture}
\end{LTXexample}
+\fi
+\clearpage
+
\begin{BDef}
\Lcs{psBox}\OptArgs\Largr{vector o}\Largb{width}\Largb{depth}\Largb{height}
\end{BDef}
Modified: trunk/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro 2020-08-04 17:21:54 UTC (rev 56042)
+++ trunk/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro 2020-08-04 21:27:23 UTC (rev 56043)
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot.pro 401 2017-04-05 06:57:36Z herbert $
+%% $Id: pst-3dplot.pro 21 2020-08-04 12:53:07Z herbert $
%%
%% This is file `pst-3dplot.pro',
%%
Modified: trunk/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex 2020-08-04 17:21:54 UTC (rev 56042)
+++ trunk/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex 2020-08-04 21:27:23 UTC (rev 56043)
@@ -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 at par{}\pst at object{pstThreeDCoor}}
\def\pstThreeDCoor at i{%
- \pst at killglue%
- \begingroup%
+ \pst at killglue
+ \begingroup
\addbefore at par{linewidth=0.5pt,linecolor=red,arrows=->,dotstyle=|}%
- \use at par%
+ \use at par
\expandafter\pst at getIIIDValues\psk at ThreeDplot@Offset{\pst at OffsetX}{\pst at OffsetY}{\pst at OffsetZ}\@nil
\pstThreeDNode(\psk at ThreeDplot@xMin,\pst at OffsetY,\pst at OffsetZ){xMin}%
\psset[pst-3dplot]{RotSet=keep}% Keep the current rotation matrix
@@ -366,15 +366,17 @@
\uput[\psk at ThreeDplot@spotX](xMax){\psk at ThreeDplot@nameX}%
\uput[\psk at ThreeDplot@spotY](yMax){\psk at ThreeDplot@nameY}%
\uput[\psk at ThreeDplot@spotZ](zMax){\psk at ThreeDplot@nameZ}%
- \ifPst at IIIDticks%
+ \ifPst at IIIDticks
%------------ x ticks and labels --------------------------
\ifdim\psk at ThreeDplot@xMax pt>0pt % only for positive parts of the axes
\ifdim\psk at ThreeDplot@xMin pt>\z@
\pstFPadd\pst at tempC\psk at ThreeDplot@xMax{-\psk at ThreeDplot@xMin}
- \else\let\pst at tempC\psk at ThreeDplot@xMax\fi
+ \else
+ \let\pst at tempC\psk at ThreeDplot@xMax
+ \fi
\pstFPadd\pst at tempC\pst at tempC{-\pst at OffsetX}
\pstFPDiv\pst at tempB\pst at tempC{\psk at ThreeDplot@deltax}
- \pst at cntx=\pst at tempB \advance\pst at cntx by -1%
+ \pst at cntx=\pst at tempB \advance\pst at cntx by -1
\pstFPdiv\pst at tempB\psk at IIIDticksize{\psk at ThreeDplot@yThreeDunit}
\pstFPadd\pst at tempA{-\pst at tempB}{\pst at OffsetY}
\pstFPadd\pst at tempB{\pst at tempB}{\pst at OffsetY}
@@ -396,7 +398,7 @@
\ifPst at IIIDlabels%
\pstPlanePut[plane=\psk at IIIDxTicksPlane](\rB,\pst at tempE,\pst at OffsetZ){%
\psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk at xlabelFactor}}%
-% \psxyzlabel{\nA\psk at xlabelFactor}}%
+%% \psxyzlabel{\nA\psk at xlabelFactor}}%
\fi%
}% end of multido
\fi%
@@ -425,7 +427,7 @@
\ifPst at IIIDlabels%
\pstPlanePut[plane=\psk at IIIDxTicksPlane](\rB,\pst at tempE,\pst at OffsetZ){%
\psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk at xlabelFactor}}%
-% \psxyzlabel{\nA\psk at xlabelFactor}}%
+%% \psxyzlabel{\nA\psk at xlabelFactor}}%
\fi%
}% end of multido and the x ticks and labels
\fi
@@ -458,7 +460,7 @@
\ifPst at IIIDlabels%
\pstPlanePut[plane=\psk at IIIDyTicksPlane](\pst at tempE,\rB,\pst at OffsetZ){%
\psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk at ylabelFactor}}%
-% \psxyzlabel{\nA\psk at ylabelFactor}}%
+%% \psxyzlabel{\nA\psk at ylabelFactor}}%
\fi%
}% end of multido
\fi%
@@ -487,7 +489,7 @@
\ifPst at IIIDlabels%
\pstPlanePut[plane=\psk at IIIDyTicksPlane](\pst at tempE,\rB,\pst at OffsetZ){%
\psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk at ylabelFactor}}%
-% \psxyzlabel{\nA\psk at ylabelFactor}}%
+%% \psxyzlabel{\nA\psk at ylabelFactor}}%
\fi
}% end of multido and y ticks and labels
\fi
@@ -519,7 +521,7 @@
\pstThreeDLine[arrows=-](\pst at tempA,\pst at OffsetY,\rB)(\pst at tempB,\pst at OffsetY,\rB)%
\fi\fi
\ifPst at IIIDlabels%
-% \pshlabel{\psk at labelFontSize\expandafter\@LabelComma##1..\@nil\psk at xlabelFactor}%
+%% \pshlabel{\psk at labelFontSize\expandafter\@LabelComma##1..\@nil\psk at xlabelFactor}%
\pstPlanePut[plane=\psk at IIIDzTicksPlane](\pst at OffsetX,\pst at tempE,\rB){%
\psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk at zlabelFactor}}%
\fi%
@@ -549,14 +551,14 @@
\ifPst at IIIDlabels%
\pstPlanePut[plane=\psk at IIIDzTicksPlane](\pst at OffsetX,\pst at tempE,\rB){%
\psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk at zlabelFactor}}%
-% \psxyzlabel{\nA\psk at zlabelFactor}}%
+%% \psxyzlabel{\nA\psk at zlabelFactor}}%
\fi%
}% end \multido
\fi% end \ifdim\psk at ThreeDplot@zMin
\fi% end \ifPst at IIIDticks%
\fi% end \ifPst at drawing
- \endgroup%
- \ignorespaces%
+ \endgroup
+ \ignorespaces
}
%
% planeGrids
@@ -674,8 +676,7 @@
}%
}
\def\pst at lineIIID@ii{%
- \addto at pscode{%
- \pst at 3ddict
+ \addto at pscode{
\IIIDplot at variables
% \psk at ThreeDplot@linejoin setlinejoin
/dxUnit \psk at ThreeDplot@xThreeDunit\space def
@@ -686,13 +687,12 @@
\fi %
/xUnit { \pst at number\psxunit\space mul } def
/yUnit { \pst at number\psyunit\space mul } def
- convertStackTo2D
- end
+ \pst at 3ddict convertStackTo2D end
\pst at cp\space \psline at iii\space \tx at Line
}%
- \end at OpenObj%
- \ignorespaces%
- \SpecialCoor%
+ \end at OpenObj
+ \ignorespaces
+ \SpecialCoor
}
%
% set a 3d dot
@@ -1014,9 +1014,8 @@
\pstThreeDSquare(\pst at tempX #4 add,\pst at tempY #5 add,\pst at tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% front square
\pstThreeDSquare(\pst at tempX #7 add,\pst at tempY #8 add,\pst at tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% top square
\ifPst at hiddenLine
-% \psset{}
- \pstThreeDLine[linestyle=\psk at ThreeDplot@invisibleLineStyle](\pst at tempX #1 add,\pst at tempY,\pst at tempZ)(\pst at tempX,\pst at tempY,\pst at tempZ)(\pst at tempX,\pst at tempY #5 add,\pst at tempZ)
- \pstThreeDLine[linestyle=\psk at ThreeDplot@invisibleLineStyle](\pst at tempX,\pst at tempY,\pst at tempZ)(\pst at tempX,\pst at tempY,\pst at tempZ #9 add)
+ \pstThreeDLine[linestyle=\psk at ThreeDplot@invisibleLineStyle](\pst at tempX #1 add,\pst at tempY #2 add,\pst at tempZ #3 add)(\pst at tempX,\pst at tempY,\pst at tempZ)(\pst at tempX #4 add,\pst at tempY #5 add,\pst at tempZ #6 add)
+ \pstThreeDLine[linestyle=\psk at ThreeDplot@invisibleLineStyle](\pst at tempX,\pst at tempY,\pst at tempZ)(\pst at tempX #7 add,\pst at tempY #8 add,\pst at tempZ #9 add)
% \psset{linestyle=\psk at ThreeDplot@visibleLineStyle}
\else
\pstThreeDSquare(\pst at tempX,\pst at tempY,\pst at tempZ)(#1,#2,#3)(#4,#5,#6)% bottom square
@@ -2033,7 +2032,7 @@
\def\ps at Plane{\pst at makebox{\psPlane@}}
\def\psPlane@{%
\begingroup
- \leavevmode%
+ \leavevmode
\hbox{%
% \kern\wd\pst at hbox%
\pst at Verb{%
@@ -2108,18 +2107,18 @@
\ifx\psk at ThreeDplot@plane\ThreeDplot at planeXY
270 Delta sub rotate
/Rho 90 Gamma add Delta add def
- \else%
+ \else
\ifx\psk at ThreeDplot@plane\ThreeDplot at 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 at TMChange%
+ \fi
+ \fi
+ Rho cos Rho sin 0 0 ] concat} \tx at TMChange
}%
- \box\pst at hbox%
+ \box\pst at hbox
\pst at Verb{\tx at TMRestore}%
% \kern\ht\pst at hbox%
}%
Modified: trunk/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty 2020-08-04 17:21:54 UTC (rev 56042)
+++ trunk/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty 2020-08-04 21:27:23 UTC (rev 56043)
@@ -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)]
More information about the tex-live-commits
mailing list.