diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-3dplot/Changes | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-3dplot/README.TEXLIVE | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib | 17 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf | bin | 2250617 -> 2250631 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex | 59 | ||||
| -rw-r--r-- | Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro | 31 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex | 76 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty | 4 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/ctan2tds | 1 |
9 files changed, 119 insertions, 78 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes index 55fcfc45286..6b9387a9357 100644 --- a/Master/texmf-dist/doc/generic/pst-3dplot/Changes +++ b/Master/texmf-dist/doc/generic/pst-3dplot/Changes @@ -1,4 +1,5 @@ pst-3dplot.pro -------- +0.26 2007-01-03 - add routine for vector length 0.25 2007-12-22 - add code for special rotating (Darrell Lamm) 0.24 2007-08-30 - add code for special node calculating 0.23 2007-08-18 - add coorType 0,1,2,3 code for convertTo2D @@ -11,6 +12,8 @@ pst-3dplot.pro -------- pst-3dplot.tex -------- +1.79 2008-01-03 - add option algebraic for 3d plots + - fix bug with ellipse phi=f(alpha)! 1.78 2007-10-11 - fix bug in \parametricPlotThreeD - add option Debug=false|true for addtional comments written into the log file diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/README.TEXLIVE b/Master/texmf-dist/doc/generic/pst-3dplot/README.TEXLIVE new file mode 100644 index 00000000000..472d3162675 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-3dplot/README.TEXLIVE @@ -0,0 +1,6 @@ +The following files have been removed in the TeX Live installation of +the current package, typically due to duplication, lack of space, or +missing source code. You can find these files on CTAN. If questions or +concerns, email tex-live.org. + + tb72voss3d.pdf diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib index 6d51864b381..721cd671185 100644 --- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib +++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib @@ -38,15 +38,6 @@ } -@Manual{pstlens:2001, - Title = {PST-lens - {\PS} macros for Generic TeX}, - Author = {Denis Girou and Manuel Luque}, - Organization = {}, - Address = {\url{ftp://ftp.dante.de/tex-archive/graphics/pstricks/contrib/pst-lens/}}, - Note = {}, - year = 2001, -} - @Manual{vue3d:2002, Title = {Vue en 3D}, Author = {Manuel Luque}, @@ -117,14 +108,6 @@ address = {Heidelberg/Hamburg} } -@Book{voss:math, - author = {Herbert Vo\ss}, - title = {\LaTeX\ in {M}athematik und {N}aturwissenschaften}, - publisher = {{Franzis-Verlag}}, - year = {2006}, - address = {Poing} -} - @Book{LaTeXRef, author = {Herbert Vo\ss}, title = {\LaTeX\ Referenz}, 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 Binary files differindex 10560d50bad..f1d6b6278e3 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 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 d0113649230..ca0cde0d2c4 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,3 +1,4 @@ +%% $Id: pst-3dplot-doc.tex 9 2008-01-03 20:22:50Z herbert $ \listfiles \documentclass[11pt,a4paper]{article} @@ -1863,10 +1864,10 @@ In the following example the circle is drawn with only $20$ plotpoints and the \begin{pspicture}(-2,-1.25)(2,2.25) \pstThreeDCoor[xMax=2,yMax=2,zMax=2,linecolor=black] \psset{linecolor=red,linewidth=2pt,plotpoints=20,showpoints=true} - \pstThreeDCircle(1.6,+0.6,1.7)(0.8,0.4,0.8)(0.8,-0.8,-0.4) - \pstThreeDDot[drawCoor=true,linecolor=blue](1.6,+0.6,1.7) - \pstThreeDCircle[RotY=15,linecolor=blue](1.6,+0.6,1.7)(0.8,0.4,0.8)(0.8,-0.8,-0.4) - \pstThreeDDot[RotY=15,drawCoor=true,linecolor=blue](1.6,+0.6,1.7) + \pstThreeDCircle(1.6,0.6,1.7)(0.8,0.4,0.8)(0.8,-0.8,-0.4) + \pstThreeDDot[drawCoor=true,linecolor=red](1.6,0.6,1.7) + \pstThreeDCircle[linecolor=blue](1.6,1.6,1.7)(0.8,0.4,0.8)(0.8,-0.8,-0.4) + \pstThreeDDot[drawCoor=true,linecolor=blue](1.6,1.6,1.7) \end{pspicture} \end{LTXexample} @@ -2191,20 +2192,22 @@ otherwise \verb|xcolor| cannot read the values. A white color is given by \verb| - - \section{Mathematical functions} There are two macros for plotting mathematical functions, which work similiar to the one from \verb|pst-plot|. \subsection{Function $f(x,y)$} -The macro for plotting functions does not have the same syntax as the one from \verb|pst-plot|\cite{dtk02.1:voss:mathematischen}, but it is used in the same way: +The macro for plotting functions does not have the same syntax as the one from +\verb|pst-plot|\cite{dtk02.1:voss:mathematischen}, but it is used in the same way: \begin{verbatim} \psplotThreeD[<options>](xMin,xMax)(yMin,yMax){<the function>} \end{verbatim} -The function has to be written in \PS{} code and the only valid variable names are \verb|x| and \verb|y|, f.ex: \verb|{x dup mul y dup mul add sqrt}| for the math expression $\sqrt{x^2 + y^2}$. The macro has the same plotstyle options as \verb|psplot|, except the \verb|plotpoints|-option which is split into one for \verb|x| and one for \verb|y| (table \ref{tab:lineOptions}). +The function has to be written in \PS{} code and the only valid variable names are \verb|x| +and \verb|y|, f.ex: \verb|{x dup mul y dup mul add sqrt}| for the math expression $\sqrt{x^2 + y^2}$. +The macro has the same plotstyle options as \verb|psplot|, except the \verb|plotpoints|-option which is +split into one for \verb|x| and one for \verb|y| (table \ref{tab:lineOptions}). \begin{table}[htb] \centering @@ -2227,7 +2230,8 @@ The function has to be written in \PS{} code and the only valid variable names a & \verb|yLines|\\ & \verb|xyLines|\\ & \verb|yxLines|\\ -\verb|hiddenLine| & default is false +\verb|hiddenLine| & default is false\\ +\verb|algebraic| & default is false \end{tabular} \end{table} @@ -2282,15 +2286,13 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. \begin{figure*} \centering \begin{pspicture}(-6,-4)(6,5) - \psset{Beta=15} - \psplotThreeD[% - plotstyle=curve,% - yPlotpoints=50,xPlotpoints=50,% - linewidth=0.5pt](-4,4)(-4,4){% - x 3 exp x y 4 exp mul add x 5 div sub 10 mul - 2.729 x dup mul y dup mul add neg exp mul - 2.729 x 1.225 sub dup mul y dup mul add neg exp add} - \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] + \psset{Beta=15} + \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] + \psplotThreeD[ + algebraic, + plotstyle=curve, + yPlotpoints=50,xPlotpoints=50, + linewidth=0.5pt](-4,4)(-4,4){10*(x^3+x*y^4-x/5)*Euler^(-x^2-y^2)+Euler^(-((x-1.225)^2+y^2))} \end{pspicture} \caption{Plot of the equation \ref{eq:3dfunc}}\label{fig:3dfunc} \end{figure*} @@ -2299,8 +2301,8 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. \begin{figure*} \centering \begin{pspicture}(-6,-4)(6,5) - \psset{Alpha=45,Beta=15} + \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \psplotThreeD[% plotstyle=curve,% yPlotpoints=50,xPlotpoints=50,% @@ -2308,7 +2310,6 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. x 3 exp x y 4 exp mul add x 5 div sub 10 mul 2.729 x dup mul y dup mul add neg exp mul 2.729 x 1.225 sub dup mul y dup mul add neg exp add} - \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \end{pspicture} \caption{Plot of the equation \ref{eq:3dfunc} with the \texttt{hiddenLine=true} option}\label{fig:3dfunc-hidden} \end{figure*} @@ -2318,8 +2319,8 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. \begin{figure*} \centering \begin{pspicture}(-6,-4)(6,5) - \psset{Alpha=45,Beta=15} + \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \psplotThreeD[% plotstyle=line,% drawStyle=yLines,% @@ -2328,7 +2329,6 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. x 3 exp x y 4 exp mul add x 5 div sub 10 mul 2.729 x dup mul y dup mul add neg exp mul 2.729 x 1.225 sub dup mul y dup mul add neg exp add} - \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \end{pspicture} \caption{Plot of the equation \ref{eq:3dfunc} with the \texttt{drawStyle=yLines} option} \end{figure*} @@ -2336,8 +2336,8 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. \begin{figure*} \centering \begin{pspicture}(-6,-4)(6,5) - \psset{Alpha=45,Beta=15} + \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \psplotThreeD[% plotstyle=curve,% drawStyle=yLines,% @@ -2347,7 +2347,6 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. x 3 exp x y 4 exp mul add x 5 div sub 10 mul 2.729 x dup mul y dup mul add neg exp mul 2.729 x 1.225 sub dup mul y dup mul add neg exp add} - \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \end{pspicture} \caption{Plot of the equation \ref{eq:3dfunc} with the \texttt{drawStyle=yLines} and \texttt{hiddenLine=true} option} @@ -2359,8 +2358,8 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. \begin{figure*} \centering \begin{pspicture}(-6,-4)(6,5) - \psset{Alpha=45,Beta=15} + \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \psplotThreeD[% plotstyle=line,% drawStyle=xyLines,% @@ -2369,7 +2368,6 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. x 3 exp x y 4 exp mul add x 5 div sub 10 mul 2.729 x dup mul y dup mul add neg exp mul 2.729 x 1.225 sub dup mul y dup mul add neg exp add} - \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \end{pspicture} \caption{Plot of the equation \ref{eq:3dfunc} with the \texttt{drawStyle=xyLines} option} \end{figure*} @@ -2377,8 +2375,8 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. \begin{figure*}[htbp] \centering \begin{pspicture}(-6,-4)(6,5) - \psset{Alpha=45,Beta=15} + \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \psplotThreeD[% plotstyle=curve,% drawStyle=xLines,% @@ -2388,7 +2386,6 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. x 3 exp x y 4 exp mul add x 5 div sub 10 mul 2.729 x dup mul y dup mul add neg exp mul 2.729 x 1.225 sub dup mul y dup mul add neg exp add} - \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \end{pspicture} \caption{Plot of the equation \ref{eq:3dfunc} with the \texttt{drawStyle=xLines} and \texttt{hiddenLine=true} option} @@ -2397,8 +2394,8 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. \begin{figure*}[htbp] \centering \begin{pspicture}(-6,-4)(6,5) - \psset{Alpha=45,Beta=15} + \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \psplotThreeD[% plotstyle=curve,% drawStyle=yLines,% @@ -2408,7 +2405,6 @@ figure~\ref{fig:3dfunc}, only with the option \verb|hiddenLine=true|. x 3 exp x y 4 exp mul add x 5 div sub 10 mul 2.729 x dup mul y dup mul add neg exp mul 2.729 x 1.225 sub dup mul y dup mul add neg exp add} - \pstThreeDCoor[xMin=-1,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5] \end{pspicture} \caption{Plot of the equation \ref{eq:3dfunc} with the \texttt{drawStyle=yLines} and \texttt{hiddenLine=true} option} @@ -2454,10 +2450,10 @@ which is the same as \verb|(0,0)| for the parameter \verb|u|. \begin{LTXexample}[width=6.75cm] \begin{pspicture}(-3.25,-2.25)(3.25,5.25) + \pstThreeDCoor[zMax=5] \parametricplotThreeD[xPlotpoints=200,linecolor=blue,% linewidth=1.5pt,plotstyle=curve](0,2160){% 2.5 t cos mul 2.5 t sin mul t 600 div} - \pstThreeDCoor[zMax=5] \end{pspicture} \end{LTXexample} @@ -2499,7 +2495,6 @@ and at last both together is also not a problem when having these parametric fun \begin{figure}[htbp] {\psset{xunit=1.75cm,yunit=1.75cm} \begin{pspicture}(-1,-1)(1,1) - \setIIIDplotDefaults %\pstThreeDCoor[xMin=-1,xMax=1,yMin=-1,yMax=1,zMin=-1,zMax=1] \parametricplotThreeD[plotstyle=curve](0,360)(0,360){% diff --git a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro index 251f0612ff5..6cd943f344c 100644 --- a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro +++ b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro @@ -1,3 +1,4 @@ +%% $Id: pst-3dplot.pro 9 2008-01-03 20:22:50Z herbert $ %% %% This is file `pst-3dplot.pro', %% @@ -15,7 +16,7 @@ %% `pst-3dplot' is a PSTricks package to draw 3d curves and graphical objects %% %% -%% version 0.25 / 2007-12-22 Herbert Voss <voss _at_ PSTricks.de> +%% version 0.26 / 2008-01-03 Herbert Voss <voss _at_ PSTricks.de> %% with contributions of Darrell Lamm <darrell.lamm _at_ gtri.gatech.edu< %% % @@ -836,6 +837,34 @@ end } def ] end } def % + +% [x y z ... ] -> r +% watch out for overflow + +/vector-length { 1 dict begin +dup +% find maximum entry +/max 0 def +{ % max + abs dup max gt { + % if abs gt max + /max exch def + } { + pop + } ifelse +} forall + +max 0 ne { + 0 exch + { % 0 v[i] + max div dup mul add + } forall + sqrt + max mul +} { + pop 0 +} ifelse +end } def % end % tx@3DPlotDict 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 8669b0e7433..8e12de2b028 100644 --- a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex +++ b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex @@ -1,3 +1,4 @@ +%% $Id: pst-3dplot.tex 9 2008-01-03 20:22:50Z herbert $ %% %% This is file `pst-3dplot.tex', %% @@ -26,8 +27,8 @@ \ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi % -\def\fileversion{1.78} -\def\filedate{2007/12/22} +\def\fileversion{1.79} +\def\filedate{2008/01/03} \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -125,6 +126,8 @@ \define@key[psset]{pst-3dplot}{zCoor}{\pst@checknum{#1}\psk@ThreeDplot@zCoor } \psset[pst-3dplot]{zCoor=0} % +\define@boolkey[psset]{pst-3dplot}[Pst@]{algebraic}[true]{}% same as in pstricks-add +\psset[pst-3dplot]{algebraic=false} \def\drawStyle@xLines{xLines}% 0 \def\drawStyle@yLines{yLines}% 1 \def\drawStyle@xyLines{xyLines}% 2 @@ -880,21 +883,32 @@ \pst@tempB\space \tx@ConvertToCartesian /zB \tx@Z def /yB \tx@Y def /xB \tx@X def % b \else - \pst@tempC\space /zM exch def /yM exch def /xM exch def % center - \pst@tempA\space /zA exch def /yA exch def /xA exch def % a - \pst@tempB\space /zB exch def /yB exch def /xB exch def % b + \pst@tempC\space /zM ED /yM ED /xM ED % center + \pst@tempA\space /zA ED /yA ED /xA ED % a + \pst@tempB\space /zB ED /yB ED /xB ED % b \fi /aStart \psk@ThreeDplot@beginAngle\space def % /aEnd \psk@ThreeDplot@endAngle\space dup aStart lt { 360 add } if def % /da aEnd aStart sub \psk@plotpoints\space div abs def /aEnd \psk@ThreeDplot@endAngle\space def /da aEnd aStart sub \psk@plotpoints\space div def + \pst@3ddict + /vecA [xA yA zA] vector-length def + /vecB [xB yB zB] vector-length def + end /xyz { - xM xA angle cos mul add xB angle sin mul add - yM yA angle cos mul add yB angle sin mul add - zM zA angle cos mul add zB angle sin mul add - \pst@3ddict saveCoor ConvertTo2D - x2D \pst@number\psxunit mul y2D \pst@number\psyunit mul end + \pst@3ddict % +% +% the angle in the parameter equation is not proportional to the real angle! +% phi=atan(b*tan(angle)/a)+floor(angle/180+0.5)*180 +% + /phi angle cvi 90 mod 0 eq { angle } { vecA angle tan mul vecB atan + angle 180 div .5 add floor 180 mul add } ifelse def + xM xA phi cos mul add xB phi sin mul add + yM yA phi cos mul add yB phi sin mul add + zM zA phi cos mul add zB phi sin mul add + saveCoor ConvertTo2D + x2D \pst@number\psxunit mul y2D \pst@number\psyunit mul end } def /angle aStart def }% @@ -905,14 +919,15 @@ \ignorespaces} % \def\pstThreeDEllipse@ii{% - \addto@pscode{% + \addto@pscode{% xyz \@nameuse{beginqp@\psplotstyle} \psk@plotpoints 1 sub { /angle angle da add def xyz \@nameuse{doqp@\psplotstyle} } repeat /angle aEnd def - xyz \@nameuse{doqp@\psplotstyle}}% + xyz \@nameuse{doqp@\psplotstyle} + }% \@nameuse{endqp@\psplotstyle}} \def\pstThreeDEllipse@iii{% @@ -927,7 +942,8 @@ } repeat /angle aEnd def xyz - n 2 roll}% + n 2 roll + }% \@nameuse{endplot@\psplotstyle}} % \def\pstThreeDCircle{\pstThreeDEllipse} @@ -1308,6 +1324,8 @@ \if@pst% lines and dots \addto@pscode{ \variablesIIID + /func { #5 } def + \ifPst@algebraic /Func ( #5 ) tx@addDict begin AlgParser end cvx def \fi /xMin #1 def /x xMin def /x1 #2 def @@ -1315,10 +1333,9 @@ /y1 #4 def /dx x1 x sub \psk@ThreeDplot@xPlotpoints\space dup 0 gt {div}{pop} ifelse def /dy y1 y sub \psk@ThreeDplot@yPlotpoints\space dup 0 gt {div}{pop} ifelse def - /func {#5} def /xyz { - x \psk@ThreeDplot@zCoor\space 0 gt { func }{ y } ifelse - \psk@ThreeDplot@zCoor\space 0 gt { \psk@ThreeDplot@zCoor }{ func } ifelse + x \psk@ThreeDplot@zCoor\space 0 gt { \ifPst@algebraic Func \else func \fi }{ y } ifelse + \psk@ThreeDplot@zCoor\space 0 gt { \psk@ThreeDplot@zCoor }{ \ifPst@algebraic Func \else func \fi } ifelse tx@3DPlotDict begin saveCoor ConvertTo2D @@ -1332,16 +1349,17 @@ \@nameuse{beginplot@\psplotstyle}% \addto@pscode{ \variablesIIID + /func { #5 } def + \ifPst@algebraic /Func ( #5 ) tx@addDict begin AlgParser end cvx def \fi /xMin #1 def /x xMin def /x1 #2 def /dx x1 x sub \psk@ThreeDplot@xPlotpoints\space dup 0 gt {div}{pop} ifelse def /dy #4\space #3\space sub \psk@ThreeDplot@yPlotpoints\space dup 0 gt {div}{pop} ifelse def /y #3\space \n@Y\space dy mul add def - /func {#5} def /xyz { - x \psk@ThreeDplot@zCoor\space 0 gt { func }{ y } ifelse - \psk@ThreeDplot@zCoor\space 0 gt { \psk@ThreeDplot@zCoor }{ func } ifelse + x \psk@ThreeDplot@zCoor\space 0 gt { \ifPst@algebraic Func \else func \fi }{ y } ifelse + \psk@ThreeDplot@zCoor\space 0 gt { \psk@ThreeDplot@zCoor }{ \ifPst@algebraic Func \else func \fi } ifelse tx@3DPlotDict begin saveCoor ConvertTo2D @@ -1402,6 +1420,8 @@ \if@pst% lines and dots \addto@pscode{% \variablesIIID + /func { #5 } def + \ifPst@algebraic /Func (#5) tx@addDict begin AlgParser end cvx def \fi /x #1 def /x1 #2 def /yMin #3 def @@ -1409,10 +1429,9 @@ /y1 #4 def /dx x1 x sub \psk@ThreeDplot@xPlotpoints\space dup 0 gt {div}{pop} ifelse def /dy y1 y sub \psk@ThreeDplot@yPlotpoints\space dup 0 gt {div}{pop} ifelse def - /func {#5} def /xyz { - x \psk@ThreeDplot@zCoor\space 0 gt { func }{ y } ifelse - \psk@ThreeDplot@zCoor\space 0 gt { \psk@ThreeDplot@zCoor }{ func } ifelse + x \psk@ThreeDplot@zCoor\space 0 gt { \ifPst@algebraic Func \else func \fi }{ y } ifelse + \psk@ThreeDplot@zCoor\space 0 gt { \psk@ThreeDplot@zCoor }{ \ifPst@algebraic Func \else func \fi } ifelse tx@3DPlotDict begin saveCoor ConvertTo2D @@ -1426,16 +1445,17 @@ \@nameuse{beginplot@\psplotstyle}% \addto@pscode{% \variablesIIID + /func { #5 } def + \ifPst@algebraic /Func (#5) tx@addDict begin AlgParser end cvx def \fi /yMin #3 def /y yMin def /y1 #4 def /dy y1 y sub \psk@ThreeDplot@yPlotpoints\space dup 0 gt {div}{pop} ifelse def /dx #2\space #1\space sub \psk@ThreeDplot@xPlotpoints\space dup 0 gt {div}{pop} ifelse def /x #1\space \n@X\space dx mul add def - /func { #5 } def % func=f(x,y) /xyz { - x \psk@ThreeDplot@zCoor\space 0 gt { func }{ y } ifelse - \psk@ThreeDplot@zCoor\space 0 gt { \psk@ThreeDplot@zCoor }{ func } ifelse + x \psk@ThreeDplot@zCoor\space 0 gt { \ifPst@algebraic Func \else func \fi }{ y } ifelse + \psk@ThreeDplot@zCoor\space 0 gt { \psk@ThreeDplot@zCoor }{ \ifPst@algebraic Func \else func \fi } ifelse tx@3DPlotDict begin saveCoor ConvertTo2D @@ -1503,6 +1523,7 @@ \def\pslinetype{0}% \addto@pscode{% \variablesIIID + \ifPst@algebraic /Func (#5) tx@addDict begin AlgParser end cvx def \fi /tMin #1 def /t tMin def /t1 #2 def @@ -1512,7 +1533,7 @@ { 1 sub div }{ pop pop 0 } ifelse def % step for t /du u1 u sub \psk@ThreeDplot@yPlotpoints\space dup 1 gt % { 1 sub div }{ pop pop 0 } ifelse def % step for u - /xyz { #5 + /xyz { \ifPst@algebraic Func \else #5 \fi tx@3DPlotDict begin saveCoor ConvertTo2D @@ -1527,6 +1548,7 @@ \@nameuse{beginplot@\psplotstyle}% \addto@pscode{% \variablesIIID + \ifPst@algebraic /Func (#5) tx@addDict begin AlgParser end cvx def \fi /tMin #1 def /t tMin def /t1 #2 def @@ -1536,7 +1558,7 @@ /du #4\space #3\space sub \psk@ThreeDplot@yPlotpoints\space dup 1 gt % { 1 sub div }{ pop pop 0 } ifelse def % step for t /u #3\space \n@Y\space du mul add def - /xyz { #5 + /xyz { \ifPst@algebraic Func \else #5 \fi tx@3DPlotDict begin saveCoor ConvertTo2D 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 8412e97f3b3..d7f9f778d45 100644 --- a/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty +++ b/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty @@ -1,11 +1,13 @@ +%% $Id: pst-3dplot.sty 9 2008-01-03 20:22:50Z herbert $ \RequirePackage{pstricks} \ProvidesPackage{pst-3dplot}[2006/02/07 package wrapper for pst-3dplot.tex (hv)] \input{pst-3dplot.tex} \IfFileExists{pst-3dplot.pro}{% \ProvidesFile{pst-3dplot.pro} - [2007/12/22 v. 0.24, PostScript prologue file (hv)] + [2008/01/03 v. 0.25, PostScript prologue file (hv)] \@addtofilelist{pst-3dplot.pro}}{}% \ProvidesFile{pst-3dplot.tex} [\filedate\space v\fileversion\space `PST-3dplot' (hv)] \endinput + diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds index c11c9b74fef..f0194985da0 100755 --- a/Master/tlpkg/bin/ctan2tds +++ b/Master/tlpkg/bin/ctan2tds @@ -1234,6 +1234,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot' 'libertine' => 'libertinedoku.pdf', # no source 'linguex' => 'cgloss4e.sty', # symlink 'piechartmp' => 'piechartmp.pdf', + 'pst-3dplot' => 'tb72voss3d.pdf', # no source 'stubs' => 'stubs.pdf', 'susy' => 'susy.pdf', # no source 'xskak' => 'xskak.pdf', # no source |