summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-08-28 00:18:28 +0000
committerKarl Berry <karl@freefriends.org>2009-08-28 00:18:28 +0000
commit7bd9b1903189de6f39e6f6bcc94b5fc146a57f79 (patch)
tree111535c0d3e70937f369b4c2b67bb1404c774a96 /Master/texmf-dist
parent61ad76838e8dec8c83a9695add3b60afcf226874 (diff)
pst-3dplot 1.85
git-svn-id: svn://tug.org/texlive/trunk@14897 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdfbin2163613 -> 2184461 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex25
-rw-r--r--Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro22
-rw-r--r--Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex33
5 files changed, 50 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
index d3346195138..b93e5108498 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
@@ -14,6 +14,7 @@ pst-3dplot.pro --------
pst-3dplot.tex --------
+1.85 2009-08-14 - add option Hincrement for \psCylinder, preset to 0.5
1.84 2009-07-28 - add option showgrid for sphere, paraboloid
and cylinder
- fix bug with \psBox
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 a8f0f56df85..b1f8bfdd4f1 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 383b65a9801..21854316ad1 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 107 2009-03-12 17:25:46Z herbert $
+%% $Id: pst-3dplot-doc.tex 123 2009-08-27 06:53:23Z herbert $
\listfiles
\begin{filecontents}{data3D.Roessler}
2.0, 0.0, 0.0
@@ -495,7 +495,8 @@ It is also important that after \LPack{pst-3dplot} no package is loaded, which u
\vfill\noindent
Thanks for feedback and contributions to:\\
-Bruce Burlton, Christophe Jorssen, Markus Krebs, Chris Kuklewicz, Darrell Lamm, Rolf Niepraschk,
+Bruce Burlton, Bernhard Elsner, Christophe Jorssen, Markus Krebs, Chris Kuklewicz, Darrell Lamm,
+Rolf Niepraschk,
Michael Sharpe, Uwe Siart, Thorsten Suhling, Maja Zaloznik
\end{abstract}
@@ -630,8 +631,8 @@ also to the left.
The value of the perpendicular projected z coordinate is $z^{*}=z\cdot cos\beta$. With
figure~\ref{Abb0-3} we see, that the point $P(x,y,z)$ runs on an elliptical curve when
-$\beta$ is constant and $\alpha$ changes continues. The vertical alteration of $P$ id
-the difefrence of the two "`perpendicular"' lines $y\cdot\cos\alpha$ and $x\cdot\sin\alpha$.
+$\beta$ is constant and $\alpha$ changes continues. The vertical alteration of $P$ is
+the difference of the two "`perpendicular"' lines $y\cdot\cos\alpha$ and $x\cdot\sin\alpha$.
These lines are rotated by the angle $\beta$, so we have them to multiply with $\sin\beta$ to
get the vertical part. We get the following transformation equations:
@@ -699,7 +700,7 @@ listed options with the predefined values.
{
\ttfamily
\begin{longtable}{lll}
-\caption{All new parameters for \texttt{pst-plot}\label{tab:coor}}\\[-5pt]
+\caption{All new parameters for \texttt{pst-3dplot}\label{tab:coor}}\\
\textrm{Name} & \textrm{Type} & \textrm{Default}\\\hline
\endfirsthead
\textrm{Name} & \textrm{Type} & \textrm{Default}\\\hline
@@ -824,7 +825,7 @@ Cartesian coordinate system.
\subsection{Ticks and labels}
With the option \Lkeyword{IIIDticks} the axes get ticks and with \Lkeyword{IIIDlabels} labels.
-Without ticks are not possible.
+Without ticks also labels 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
@@ -2045,7 +2046,9 @@ The syntax is
\end{BDef}
\verb+(x,y,z)+ defines the center of the lower part of the cylinder. If it is
-missing, then \verb+(0,0,0)+ are taken into account.
+missing, then \verb+(0,0,0)+ are taken into account. With \Lkeyval{increment} for
+the angle step and \Lkeyword{Hincrement} for the height step, the number of
+segemnts can be defined. They are preset to 10 and 0.5.
\begin{LTXexample}[width=7cm]
\begin{pspicture}(-3,-2)(3,7)
@@ -2056,6 +2059,14 @@ missing, then \verb+(0,0,0)+ are taken into account.
\end{LTXexample}
\begin{LTXexample}[width=7cm]
+\begin{pspicture}(-3,-2)(3,2)
+\psset{Beta=10}
+\pstThreeDCoor[zMax=1]
+ \psCylinder[increment=5,Hincrement=0.1]{2}{0.5}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=7cm]
\begin{pspicture}(-3,-2)(3,6)
\psset{Beta=60}
\pstThreeDCoor[zMax=9]
diff --git a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
index 867363aee98..e347fde46cf 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 113 2009-04-20 16:07:36Z herbert $
+%% $Id: pst-3dplot.pro 123 2009-08-27 06:53:23Z herbert $
%%
%% This is file `pst-3dplot.pro',
%%
@@ -626,13 +626,21 @@ tx@3DPlotDict begin
{ setColorLight % expects 4 values on stack C M Y K
/Depth ED /Height ED /Width ED
/CZ ED /CY ED /CX ED } if
-%
-% Normal vector of the center
+%
+% Normal vector of the box center
/PlaneSet [
- [ Width 2 div CX add CY Height 2 div CZ add ] % normal back
- [ CX Depth 2 div CY add Height 2 div CZ add ] % normal right
- [ Width CX add Depth 2 div CY add Height 2 div CZ add ] % normal left
- [ Width 2 div CX add Depth CY add Height 2 div CZ add ] % normal front
+ [ Width 2 div CX add
+ CY
+ Height 2 div CZ add ] % normal back
+ [ CX
+ Depth 2 div CY add
+ Height 2 div CZ add ] % normal right
+ [ Width CX add
+ Depth 2 div CY add
+ Height 2 div CZ add ] % normal left
+ [ Width 2 div CX add
+ Depth CY add
+ Height 2 div CZ add ] % normal front
] def
PlaneSequence length 0 eq { % user defined?
Alpha abs cvi 360 mod /iAlpha ED
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 662a740dda1..a6857d694de 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 121 2009-07-28 18:03:37Z herbert $
+%% $Id: pst-3dplot.tex 123 2009-08-27 06:53:23Z herbert $
%%
%% This is file `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.84}
-\def\filedate{2009/04/20}
+\def\fileversion{1.85}
+\def\filedate{2009/07/29}
\message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -147,16 +147,12 @@
%
\define@key[psset]{pst-3dplot}{xPlotpoints}{\def\psk@ThreeDplot@xPlotpoints{#1}}
\define@key[psset]{pst-3dplot}{yPlotpoints}{\def\psk@ThreeDplot@yPlotpoints{#1}}
-\define@key[psset]{pst-3dplot}{beginAngle}{% for ellipse/circle arc
- \def\psk@ThreeDplot@beginAngle{#1}}
-\define@key[psset]{pst-3dplot}{endAngle}{% for ellipse/circle arc
- \def\psk@ThreeDplot@endAngle{#1}}
-\define@key[psset]{pst-3dplot}{linejoin}{% how lines come together 0,1,2
- \def\psk@ThreeDplot@linejoin{#1 }}
-\define@key[psset]{pst-3dplot}{plane}{% xy,xz,yz
- \edef\psk@ThreeDplot@plane{#1}} % must be expanded
-\define@key[psset]{pst-3dplot}{pOrigin}{% combination of (lr)(tBb)
- \def\psk@ThreeDplot@pOrigin{#1}}
+\define@key[psset]{pst-3dplot}{beginAngle}{\def\psk@ThreeDplot@beginAngle{#1}}% for ellipse/circle arc
+\define@key[psset]{pst-3dplot}{endAngle}{\def\psk@ThreeDplot@endAngle{#1}}% for ellipse/circle arc
+\define@key[psset]{pst-3dplot}{linejoin}{\def\psk@ThreeDplot@linejoin{#1 }}% how lines come together 0,1,2
+\define@key[psset]{pst-3dplot}{plane}{\edef\psk@ThreeDplot@plane{#1}}% xy,xz,yz
+% must be expanded
+\define@key[psset]{pst-3dplot}{pOrigin}{\def\psk@ThreeDplot@pOrigin{#1}}% combination of (lr)(tBb)
\define@key[psset]{pst-3dplot}{IIIDdAlpha}{\def\psk@IIIDdAlpha{#1 }}
\def\ThreeDplot@planeXY{xy}
\def\ThreeDplot@planeXZ{xz}
@@ -220,6 +216,7 @@
\define@boolkey[psset]{pst-3dplot}[PstThreeDplot@]{showInside}[true]{}
\define@key[psset]{pst-3dplot}{SegmentColor}{\pst@getcolor{#1}\psk@ThreeDplot@SegmentColor}
\define@key[psset]{pst-3dplot}{increment}{\pst@checknum{#1}\psk@ThreeDplot@increment}
+\define@key[psset]{pst-3dplot}{Hincrement}{\pst@checknum{#1}\psk@ThreeDplot@Hincrement}
%\define@key[psset]{pst-3dplot}{CMYK}{\def\psk@ThreeDplot@CMYK{#1}}
\define@key[psset]{pst-3dplot}{xyzLight}{\def\psk@ThreeDplot@xyzLight{#1 }}
%
@@ -265,7 +262,8 @@
planecorr=none,
planeGrid=xy,planeGridOffset=0,%subticks=10,
leftHanded=false,coorType=0,IIIDdAlpha=0,
- xyzLight=1 1 2,showInside=true,SegmentColor={[cmyk]{0.2,0.6,1,0}},increment=10
+ xyzLight=1 1 2,showInside=true,SegmentColor={[cmyk]{0.2,0.6,1,0}},
+ increment=10,Hincrement=0.5,
}%
\def\pst@linetype{2}% to prevent an unknown linetyp with dash
}
@@ -481,7 +479,8 @@
\pst@getlength\psk@planeGridOffset\pst@dima
\pst@cntx=\psk@xsubticks \advance\pst@cntx by \@ne
\pst@cnty=\psk@ysubticks \advance\pst@cnty by \@ne
- \psset{unit=1pt,planeGridOffset=\pst@dima}% we need everything in pt
+ \psset{unit=1pt}
+ \psset[pst-3dplot]{planeGridOffset=\pst@dima}% we need everything in pt
\ifx\psk@planeGrid\ThreeDplot@planeXY
\multido{\rA=\strip@pt\pst@dimz+\strip@pt\pst@dx}{\pst@cntx}{%
\pstThreeDLine(\rA,\strip@pt\pst@dimx,\psk@planeGridOffset)%
@@ -1295,7 +1294,7 @@
\pst@number\pst@dima \pst@number\psxunit div % Radius
\pst@number\pst@dimb \pst@number\psyunit div % Height
\psk@ThreeDplot@increment % angle increment
- 0.5 % height increment
+ \psk@ThreeDplot@Hincrement % height increment
/cmyk {} def % we need only the values
\psk@ThreeDplot@SegmentColor\space
%
@@ -1354,7 +1353,7 @@
\IIIDplot@variables
\psk@ThreeDplot@linejoin setlinejoin
%
- #1 #2 #3
+ #1 2 div #2 2 div #3 2 div % wieso 1/2 ????
\pst@number\pst@dima \pst@number\psxunit div % Width
\pst@number\pst@dimb \pst@number\psyunit div % Height
\pst@number\pst@dimc \pst@number\psyunit div % Depth