summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/README35
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdfbin3020360 -> 2382647 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex32
-rw-r--r--Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro2
-rw-r--r--Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex67
-rw-r--r--Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty4
7 files changed, 59 insertions, 82 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
index baa9872ce34..52a55130856 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
@@ -20,6 +20,7 @@ pst-3dplot.pro --------
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
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/README b/Master/texmf-dist/doc/generic/pst-3dplot/README
index d6642cec840..31d732ee7a9 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/README
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/README
@@ -2,7 +2,7 @@
%%
%% Herbert Voss <hvoss@tug.org>
%%
-%% 2014-02-01
+%% 2020-08-04
%%
PSTricks offers excellent macros to insert more or less complex
@@ -13,36 +13,3 @@ dimensional graphical objects. pst-3dplot is similiar to the
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.
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
index 5445581f931..dab17352ac4 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
index f44958f1811..775c5d55e25 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
@@ -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@subsection{\bprot@dottedtocline{2}{1.5em}{3.6em}}
@@ -1266,7 +1264,8 @@ A box is a special case of a square and has the syntax
\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 @@ which are for example shown in the following figure.
\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 @@ which are for example shown in the following figure.
\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,11 +1334,14 @@ which are for example shown in the following figure.
\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}
diff --git a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
index fdb8e0d8d28..e5aacc730c9 100644
--- a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
+++ b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
@@ -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',
%%
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)]
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 16:37:27 +0000