summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdfbin2274425 -> 2274786 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex18
-rw-r--r--Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex161
4 files changed, 92 insertions, 88 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
index 152f42d9895..501997297bb 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
@@ -13,6 +13,7 @@ pst-3dplot.pro --------
pst-3dplot.tex --------
+1.83 2008-11-18 - fix for a missing \if@IIIDlabels for x labels
1.82 2008-11-12 - rewrote \pstThreeDCircle to allow non perpendicular vectors
for the circle plane
1.81 2008-04-05 - rename the internal variablesIIID to prevent clash
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 404a71cc82e..97c8f75aff4 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 fca24399945..5075b31c5dc 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,4 +1,4 @@
-%% $Id: pst-3dplot-doc.tex 50 2008-11-12 13:44:21Z herbert $
+%% $Id: pst-3dplot-doc.tex 55 2008-11-14 12:01:12Z herbert $
\listfiles
\begin{filecontents}{data3D.Roessler}
2.0, 0.0, 0.0
@@ -710,6 +710,7 @@ listed options with the predefined values.
\Lkeyword{nameZ} & <string> & \$z\$\\
\Lkeyword{spotZ} & <angle> & 90\\
\Lkeyword{IIIDticks} & false|true & false\\
+\Lkeyword{IIIDlabels} & false|true & false\\
\Lkeyword{Dx} & <value> & 1\\
\Lkeyword{Dy} & <value> & 1\\
\Lkeyword{Dz} & <value> & 1\\
@@ -812,8 +813,10 @@ Cartesian coordinate system.
\lstset{wide=true}
-\subsection{Ticks}
-With the option \Lkeyword{IIIDticks} the axes get ticks and labels. There are several
+\subsection{Ticks and labels}
+With the option \Lkeyword{IIIDticks} the axes get ticks and with \Lkeyword{IIIDlabels} labels.
+Without ticks are not possible.
+There are several
options to place the labels in right plane to get an optimal view. The view of the
ticklabels can be changed by redefining the macro
@@ -834,7 +837,8 @@ ticklabels can be changed by redefining the macro
\begin{LTXexample}[width=7.25cm]
\begin{pspicture}(-3,-2.5)(3,4)
\pstThreeDCoor[linecolor=black,%
- IIIDticks,xMin=-2,yMin=-2,zMin=-2]%
+ IIIDticks,IIIDlabels,
+ xMin=-2,yMin=-2,zMin=-2]%
\end{pspicture}
\end{LTXexample}
@@ -862,7 +866,8 @@ The following example shows a wrong placing of the labels, the planes should be
\psset{Alpha=-60,Beta=60}
\begin{pspicture}(-4,-2.25)(1,3)
\pstThreeDCoor[linecolor=black,%
- IIIDticks,planecorr=normal,
+ IIIDticks,IIIDlabels,
+ planecorr=normal,
Dx=2,Dy=1,Dz=0.25]%
\end{pspicture}
\end{LTXexample}
@@ -871,7 +876,8 @@ The following example shows a wrong placing of the labels, the planes should be
\psset{Alpha=-60,Beta=60}
\begin{pspicture}(-4,-2.25)(1,3)
\pstThreeDCoor[linecolor=black,%
- IIIDticks,planecorr=xyrot,
+ IIIDticks,IIIDlabels,
+ planecorr=xyrot,
Dx=2,Dy=1,Dz=0.25]%
\end{pspicture}
\end{LTXexample}
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 f5616fdd09c..aa4e64502ca 100644
--- a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
+++ b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
@@ -25,8 +25,8 @@
\ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi% loads node and plot
\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
%
-\def\fileversion{1.82}
-\def\filedate{2008/11/12}
+\def\fileversion{1.83}
+\def\filedate{2008/11/18}
\message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -203,14 +203,10 @@
%
\def\psds@none{\pst@gdot{}}% define none for the dotstyle
%
-\newpsstyle{showCoorStyle}{
- linestyle=dashed,
- linecolor=black,
- linewidth=0.5pt
- }
+\newpsstyle{showCoorStyle}{linestyle=dashed,linecolor=black,linewidth=0.5pt}
\newpsstyle{hiddenStyle}{fillstyle=solid,fillcolor=white}
-\newcount\pst@cntx\newcount\pst@cnty\newcount\pst@cntz
-\newdimen\pst@dimx\newdimen\pst@dimy\newdimen\pst@dimz
+\newcount\pst@cntx \newcount\pst@cnty \newcount\pst@cntz
+\newdimen\pst@dimx \newdimen\pst@dimy \newdimen\pst@dimz
%
\define@key[psset]{pst-3dplot}{planeGrid}{\def\psk@planeGrid{#1}}
\define@key[psset]{pst-3dplot}{planeGridOffset}{\def\psk@planeGridOffset{#1}}
@@ -370,86 +366,87 @@
\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%
-% \ifnum\psk@ThreeDplot@Alpha=90\else
- \pst@dimx=\psk@ThreeDplot@xMax\p@%
- \pst@dima=\psk@ThreeDplot@xThreeDunit\p@%
- \pst@dima=\psk@ThreeDplot@deltax\pst@dima%
-% \pst@dima=\pst@dima
- \divide\pst@dimx by \pst@dima%
- \pst@cntx=\number\pst@dimx\advance\pst@cntx by -1%
- \multido{%
-% \rA=\psk@ThreeDplot@Deltax+\psk@ThreeDplot@Deltax,% the label increment
- \rA=\psk@Dx+\psk@Dx,%
- \rB=\psk@ThreeDplot@deltax+\psk@ThreeDplot@deltax}{\pst@cntx}{% the coor increment
-% \rB=\psk@ThreeDplot@xThreeDunit+\psk@ThreeDplot@xThreeDunit}{\pst@cntx}{%
- \pstThreeDLine[arrows=-](\rB,-\psk@IIIDticksize,0)(\rB,\psk@IIIDticksize,0)%
- \pstPlanePut[plane=\psk@IIIDxTicksPlane]%
- (\rB,\psk@IIIDxticksep,0){\psxyzlabel{\rA}}%
- }%
- \pst@dimx=\psk@ThreeDplot@xMin\p@%
- \pst@dima=\psk@ThreeDplot@xThreeDunit\p@%
- \divide\pst@dimx by \pst@dima%
- \ifdim\psk@ThreeDplot@xMin pt<\p@ \pst@cntx=-\number\pst@dimx%
- \else\pst@cntx=\number\pst@dimx\fi%
- \multido{\rA=-\psk@Dx+-\psk@Dx,%
- \rB=-\psk@ThreeDplot@xThreeDunit+-\psk@ThreeDplot@xThreeDunit}{\pst@cntx}{%
+ \ifPst@IIIDticks%
+%------------ x ticks and labels --------------------------
+ \pst@dimx=\psk@ThreeDplot@xMax\p@
+ \pst@dima=\psk@ThreeDplot@xThreeDunit\p@
+ \pst@dima=\psk@ThreeDplot@deltax\pst@dima
+ \divide\pst@dimx by \pst@dima
+ \pst@cntx=\number\pst@dimx\advance\pst@cntx by -1%
+ \multido{\rA=\psk@Dx+\psk@Dx,
+ \rB=\psk@ThreeDplot@deltax+\psk@ThreeDplot@deltax}
+ {\pst@cntx}{% the coor increment
\pstThreeDLine[arrows=-](\rB,-\psk@IIIDticksize,0)(\rB,\psk@IIIDticksize,0)%
\ifPst@IIIDlabels%
\pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\psk@IIIDxticksep,0){\psxyzlabel{\rA}}%
\fi%
- }%
-% \ifnum\psk@ThreeDplot@Alpha=0\else
- \pst@dimy=\psk@ThreeDplot@yMax\p@%
- \pst@dima=\psk@ThreeDplot@yThreeDunit\p@%
- \pst@dima=\psk@ThreeDplot@deltay\pst@dima%
- \divide\pst@dimy by \pst@dima%
- \pst@cnty=\number\pst@dimy\advance\pst@cnty by -1%
- \mmultido{\rA=0.0+\psk@Dy,\rB=0.0+\psk@ThreeDplot@yThreeDunit}{\pst@cnty}{%
- \pstThreeDLine[arrows=-](-\psk@IIIDticksize,\rB,0)(\psk@IIIDticksize,\rB,0)%
- \ifPst@IIIDlabels%
- \pstPlanePut[plane=\psk@IIIDyTicksPlane](\psk@IIIDyticksep,\rB,0){\psxyzlabel{\rA}}%
+ }% end of multido
+ \pst@dimx=\psk@ThreeDplot@xMin\p@
+ \pst@dima=\psk@ThreeDplot@xThreeDunit\p@
+ \divide\pst@dimx by \pst@dima
+ \ifdim\psk@ThreeDplot@xMin pt<\p@ \pst@cntx=-\number\pst@dimx
+ \else\pst@cntx=\number\pst@dimx
\fi%
- }%
- \pst@dimy=\psk@ThreeDplot@yMin\p@%
- \pst@dima=\psk@ThreeDplot@yThreeDunit\p@%
- \divide\pst@dimy by \pst@dima%
- \ifdim\psk@ThreeDplot@yMin pt<\p@ \pst@cnty=-\number\pst@dimy%
- \else\pst@cnty=\number\pst@dimy%
- \fi%
- \multido{\rA=-\psk@Dy+-\psk@Dy,%
- \rB=-\psk@ThreeDplot@yThreeDunit+-\psk@ThreeDplot@yThreeDunit}{\pst@cnty}{%
- \pstThreeDLine[arrows=-](-\psk@IIIDticksize,\rB,0)(\psk@IIIDticksize,\rB,0)%
- \ifPst@IIIDlabels%
- \pstPlanePut[plane=\psk@IIIDyTicksPlane](\psk@IIIDyticksep,\rB,0){\psxyzlabel{\rA}}%
- \fi
- }%
-% \fi%
- \pst@dimz=\psk@ThreeDplot@zMax\p@%
- \pst@dima=\psk@ThreeDplot@zThreeDunit\p@%
- \divide\pst@dimz by \pst@dima%
- \pst@cntz=\number\pst@dimz\advance\pst@cntz by -1%
- \mmultido{\rA=0.0+\psk@Dz,\rB=0.0+\psk@ThreeDplot@zThreeDunit}{\pst@cntz}{%
- \pstThreeDLine[arrows=-](0,-\psk@IIIDticksize,\rB)(0,\psk@IIIDticksize,\rB)%
- \ifPst@IIIDlabels%
- \pstPlanePut[plane=\psk@IIIDzTicksPlane](0,\psk@IIIDzticksep,\rB){\psxyzlabel{\rA}}%
+ \multido{\rA=-\psk@Dx+-\psk@Dx,
+ \rB=-\psk@ThreeDplot@xThreeDunit+-\psk@ThreeDplot@xThreeDunit}
+ {\pst@cntx}{%
+ \pstThreeDLine[arrows=-](\rB,-\psk@IIIDticksize,0)(\rB,\psk@IIIDticksize,0)%
+ \ifPst@IIIDlabels%
+ \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\psk@IIIDxticksep,0){\psxyzlabel{\rA}}%
+ \fi%
+ }% end of multido and the x ticks and labels
+%------------ y ticks and labels --------------------------
+ \pst@dimy=\psk@ThreeDplot@yMax\p@
+ \pst@dima=\psk@ThreeDplot@yThreeDunit\p@
+ \pst@dima=\psk@ThreeDplot@deltay\pst@dima
+ \divide\pst@dimy by \pst@dima
+ \pst@cnty=\number\pst@dimy\advance\pst@cnty by -1
+ \multido{\rA=\psk@Dy+\psk@Dy,\rB=\psk@ThreeDplot@deltay+\psk@ThreeDplot@deltay}{\pst@cnty}{% 0.0+\psk@ThreeDplot@yThreeDunit}{\pst@cnty}{%
+ \pstThreeDLine[arrows=-](-\psk@IIIDticksize,\rB,0)(\psk@IIIDticksize,\rB,0)%
+ \ifPst@IIIDlabels%
+ \pstPlanePut[plane=\psk@IIIDyTicksPlane](\psk@IIIDyticksep,\rB,0){\psxyzlabel{\rA}}%
+ \fi%
+ }% end of multido
+ \pst@dimy=\psk@ThreeDplot@yMin\p@%
+ \pst@dima=\psk@ThreeDplot@yThreeDunit\p@%
+ \divide\pst@dimy by \pst@dima%
+ \ifdim\psk@ThreeDplot@yMin pt<\p@ \pst@cnty=-\number\pst@dimy%
+ \else\pst@cnty=\number\pst@dimy
\fi%
- }%
- \pst@dimz=\psk@ThreeDplot@zMin\p@%
- \pst@dima=\psk@ThreeDplot@zThreeDunit\p@%
- \pst@dima=\psk@ThreeDplot@deltaz\pst@dima%
- \divide\pst@dimz by \pst@dima%
- \ifdim\psk@ThreeDplot@zMin pt<\p@ \pst@cntz=-\number\pst@dimz%
- \else\pst@cntz=\number\pst@dimz%
- \fi%
- \multido{\rA=-\psk@Dz+-\psk@Dz,%
- \rB=-\psk@ThreeDplot@zThreeDunit+-\psk@ThreeDplot@zThreeDunit}{\pst@cntz}{%
- \pstThreeDLine[arrows=-](0,-\psk@IIIDticksize,\rB)(0,\psk@IIIDticksize,\rB)%
- \ifPst@IIIDlabels%
- \pstPlanePut[plane=\psk@IIIDzTicksPlane](0,\psk@IIIDzticksep,\rB){\psxyzlabel{\rA}}%
+ \multido{\rA=-\psk@Dy+-\psk@Dy,%
+ \rB=-\psk@ThreeDplot@yThreeDunit+-\psk@ThreeDplot@yThreeDunit}{\pst@cnty}{%
+ \pstThreeDLine[arrows=-](-\psk@IIIDticksize,\rB,0)(\psk@IIIDticksize,\rB,0)%
+ \ifPst@IIIDlabels%
+ \pstPlanePut[plane=\psk@IIIDyTicksPlane](\psk@IIIDyticksep,\rB,0){\psxyzlabel{\rA}}%
+ \fi
+ }% end of multido and y ticks and labels
+%------------ z ticks and labels --------------------------
+ \pst@dimz=\psk@ThreeDplot@zMax\p@%
+ \pst@dima=\psk@ThreeDplot@zThreeDunit\p@%
+ \divide\pst@dimz by \pst@dima%
+ \pst@cntz=\number\pst@dimz\advance\pst@cntz by -1%
+ \multido{\rA=0.0+\psk@Dz,\rB=0.0+\psk@ThreeDplot@zThreeDunit}{\pst@cntz}{%
+ \pstThreeDLine[arrows=-](0,-\psk@IIIDticksize,\rB)(0,\psk@IIIDticksize,\rB)%
+ \ifPst@IIIDlabels%
+ \pstPlanePut[plane=\psk@IIIDzTicksPlane](0,\psk@IIIDzticksep,\rB){\psxyzlabel{\rA}}%
+ \fi%
+ }%
+ \pst@dimz=\psk@ThreeDplot@zMin\p@%
+ \pst@dima=\psk@ThreeDplot@zThreeDunit\p@%
+ \pst@dima=\psk@ThreeDplot@deltaz\pst@dima%
+ \divide\pst@dimz by \pst@dima%
+ \ifdim\psk@ThreeDplot@zMin pt<\p@ \pst@cntz=-\number\pst@dimz
+ \else\pst@cntz=\number\pst@dimz
\fi%
- }%
- \fi\fi%
+ \multido{\rA=-\psk@Dz+-\psk@Dz,%
+ \rB=-\psk@ThreeDplot@zThreeDunit+-\psk@ThreeDplot@zThreeDunit}{\pst@cntz}{%
+ \pstThreeDLine[arrows=-](0,-\psk@IIIDticksize,\rB)(0,\psk@IIIDticksize,\rB)%
+ \ifPst@IIIDlabels%
+ \pstPlanePut[plane=\psk@IIIDzTicksPlane](0,\psk@IIIDzticksep,\rB){\psxyzlabel{\rA}}%
+ \fi%
+ }%
+ \fi
+ \fi%
\endgroup%
\ignorespaces%
}