From 459273b097e74fa6a8b49179febc2dc305704586 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 3 Mar 2017 23:15:13 +0000 Subject: pst-solides3d (3mar17) git-svn-id: svn://tug.org/texlive/trunk@43390 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/generic/pst-solides3d/Changes | 7 +- .../generic/pst-solides3d/pst-solides3d-doc.pdf | Bin 6391191 -> 6867578 bytes .../generic/pst-solides3d/pst-solides3d-doc.tex | 1 + .../generic/pst-solides3d/text/par-surfaces-en.tex | 80 +++++++++++++++++++++ .../dvips/pst-solides3d/pst-solides3d.pro | 8 +-- .../tex/generic/pst-solides3d/pst-solides3d.tex | 13 ++-- .../tex/latex/pst-solides3d/pst-solides3d.sty | 4 +- 7 files changed, 97 insertions(+), 16 deletions(-) diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/Changes b/Master/texmf-dist/doc/generic/pst-solides3d/Changes index dae458719e2..9388c5fa819 100644 --- a/Master/texmf-dist/doc/generic/pst-solides3d/Changes +++ b/Master/texmf-dist/doc/generic/pst-solides3d/Changes @@ -1,4 +1,5 @@ pst-solides3d.tex --- +4.32 2017-03-03 - added optional argument translate for \psSurface* 4.31 2016-12-08 - added macro psImplicitSurface for F(x,y,z)=0 - added pro file pst-implicitplot.pro 4.30 2015-12-17 - use linewidth in object line (pst-solides3d) @@ -24,12 +25,8 @@ pst-solides3d.tex --- 4.15 2009-07-03 - allow names for the origin coordidates for \psSolid (hv) -pst-solides3d.sty --- -2016-12-10 - added message for pst-implicitplot.pro -2009-07-25 - current version (hv) - - pst-solides.pro --- +4.24 2017-03-03 - added Xtrans and Ytrans for solides* 4.23 2014-06-07 - added Rotations Sequence (ML) 4.22 2012-12-18 - translate french color names to english 4.21 2011-07-13 - take value of resolution into account diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf index 4d6cf9741d8..b412184cf8c 100644 Binary files a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf and b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex index 1c540b10743..e1c36674009 100644 --- a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex @@ -28,6 +28,7 @@ \pagestyle{scrheadings} \usepackage{makeidx} \makeindex +\usepackage{lscape} %\usepackage{arev} %\usepackage{manfnt} diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfaces-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfaces-en.tex index bf4e4923f00..8018632503f 100644 --- a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfaces-en.tex +++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfaces-en.tex @@ -3,6 +3,7 @@ The command has the following form: \begin{verbatim} \psSurface[options](xmin,ymin)(xmax,ymax){equation of the surface z=f(x,y)} +\psSurface*[options,r=...,xytranslate](xmin,ymin)(xmax,ymax){equation of the surface z=f(x,y)} \end{verbatim} with the same options which apply to solids, and these additional ones: @@ -21,6 +22,11 @@ ones: \item If \texttt{\Lkeyword{ngrid}=n}, with only one parameter value, the number of grids, or the incrementing steps, are identical on both axes. + \item \Lkeyword{r} defines the length of an origin vector (radius) which controls + the calculated points which must be inside the sphere, defined by the vector $\vec{r}$. + \item \Lkeyword{xytranslate}\verb|= x y| defines the translation of the vector in the + $x-y$-plane. + \end{itemize} \end{minipage} @@ -130,6 +136,80 @@ The grid lines are suppressed, when using in the option: \newpage +\section{Star version of \texttt{\textbackslash pstSurface}} + +\begin{lstlisting} +\psset{viewpoint=50 20 20 rtp2xyz,Decran=100,lightsrc=viewpoint} +\begin{pspicture}(-5,-4)(6,6) +\psSolid[object=grille,base=-2 2 -2 2,action=draw]% +\axesIIID(0,0,0)(2,2,1) +\psSurface*[ +fillcolor=cyan,r=1, +ngrid=.25 .25,incolor=yellow,grid, +algebraic](-1,-1)(1,1){ e^(x*y) } +\psSolid[object=cylindre,r=1,h=2,action=draw,ngrid=1 18] +\psPoint(0,0,1){O} +\psPoint(0,0,3){Z} +\psline{->}(O)(Z) +\uput[r](Z){$z$} +\psPoint(0.5,0.5,0){C} +\psdot[linecolor=red,dotstyle=x,dotscale=2](C) +\end{pspicture} +% +\begin{pspicture}(-5,-4)(6,10) +\psSolid[object=grille,base=-2 2 -2 2,action=draw]% +\axesIIID(0,0,0)(2,2,1) +\psSurface*[ +fillcolor=cyan,r=1,xytranslate=0.5 0.5, +ngrid=.25 .25,incolor=yellow,grid, +algebraic](-1,-1)(1,1){ e^(x*y) } +\psSolid[object=cylindre,r=1,h=4,action=draw,ngrid=1 18](0.5,0.5,0) +\psPoint(0,0,1){O} +\psPoint(0,0,5){Z} +\psline{->}(O)(Z) +\uput[r](Z){$z$} +\psPoint(0.5,0.5,0){C} +\psdot[linecolor=red,dotstyle=x,dotscale=2](C) +\end{pspicture} +\end{lstlisting} + +\begin{landscape} +\psset{viewpoint=50 20 20 rtp2xyz,Decran=100,lightsrc=viewpoint} +\begin{pspicture}(-5,-4)(6,6) +\psSolid[object=grille,base=-2 2 -2 2,action=draw]% +\axesIIID(0,0,0)(2,2,1) +\psSurface*[ +fillcolor=cyan,r=1, +ngrid=.25 .25,incolor=yellow,grid, +algebraic](-1,-1)(1,1){ e^(x*y) } +\psSolid[object=cylindre,r=1,h=2,action=draw,ngrid=1 18] +\psPoint(0,0,1){O} +\psPoint(0,0,3){Z} +\psline{->}(O)(Z) +\uput[r](Z){$z$} +\psPoint(0.5,0.5,0){C} +\psdot[linecolor=red,dotstyle=x,dotscale=2](C) +\end{pspicture} +% +\begin{pspicture}(-5,-4)(6,10) +\psSolid[object=grille,base=-2 2 -2 2,action=draw]% +\axesIIID(0,0,0)(2,2,1) +\psSurface*[ +fillcolor=cyan,r=1,xytranslate=0.5 0.5, +ngrid=.25 .25,incolor=yellow,grid, +algebraic](-1,-1)(1,1){ e^(x*y) } +\psSolid[object=cylindre,r=1,h=4,action=draw,ngrid=1 18](0.5,0.5,0) +\psPoint(0,0,1){O} +\psPoint(0,0,5){Z} +\psline{->}(O)(Z) +\uput[r](Z){$z$} +\psPoint(0.5,0.5,0){C} +\psdot[linecolor=red,dotstyle=x,dotscale=2](C) +\end{pspicture} +\end{landscape} + + + \section{Example 4: a \Index{sinusoidal wave}} \begin{LTXexample}[width=7.5cm] \psset{unit=0.35} diff --git a/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro b/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro index d3bef78a450..afa0ef61079 100644 --- a/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro +++ b/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro @@ -1,8 +1,8 @@ %! % PostScript prologue for pst-solides3d.tex. -% Version 4.30, 2015/12/17 +% Version 4.24, 2017/03/03 % -%% COPYRIGHT 2009-2013 by Jean-Paul Vignault +%% COPYRIGHT 2009-2017 by Jean-Paul Vignault %% opacity changes by Herbert Voss %% %% This program can be redistributed and/or modified under the terms @@ -8537,8 +8537,8 @@ end 1 1 ny { /i exch def /theta i 360 mul ny div def - theta cos r j mul nx div mul - theta sin r j mul nx div mul + theta cos r j mul nx div mul transX add + theta sin r j mul nx div mul transY add 2 copy f_surface } for } for diff --git a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex index 513d314b2e4..6d18285dba3 100644 --- a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex +++ b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex @@ -24,8 +24,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\MultidoLoaded\endinput\else \input multido.tex \fi % JPV & ML & AS & HV -\def\fileversion{4.31} -\def\filedate{2016/12/10} +\def\fileversion{4.32} +\def\filedate{2017/03/03} \message{`PSTSOLIDESIIID' v\fileversion, \filedate} % \pstheader{pst-solides3d.pro} @@ -44,9 +44,9 @@ % point de vue et rotations de l'objet % distance de l'ecran a l'observateur % -\define@key[psset]{pst-solides3d}{viewpoint}{\def\pst@solides@viewpoint{#1}}% position de l'observateur +\define@key[psset]{pst-solides3d}{viewpoint}{\def\pst@solides@viewpoint{#1 }}% position de l'observateur \psset[pst-solides3d]{viewpoint=10 10 10}% coordonnees cartesiennes -\define@key[psset]{pst-solides3d}{Decran}{\def\pst@solides@Decran{#1}}% distance de l'ecran +\define@key[psset]{pst-solides3d}{Decran}{\def\pst@solides@Decran{#1 }}% distance de l'ecran \define@key[psset]{pst-solides3d}{RotX}{\def\psk@solides@RotX{#1}}% rotation autour de Ox en degres \define@key[psset]{pst-solides3d}{RotY}{\def\psk@solides@RotY{#1}}% rotation autour de Oy en degres \define@key[psset]{pst-solides3d}{RotZ}{\def\psk@solides@RotZ{#1}}% rotation autour de Oz en degres @@ -328,7 +328,9 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle} %\define@key[psset]{pst-solides3d}{Dy}{\pst@checknum{#1}\psk@solides@Dy } %\define@key[psset]{pst-solides3d}{Dz}{\pst@checknum{#1}\psk@solides@Dz } \psset[pst-solides3d]{stepX=1,stepY=1,stepZ=1,ticklength=0.2}% the step for the axes labels - +\define@key[psset]{pst-solides3d}{xytranslate}{\def\pst@solides@xytranslate{#1 }} +\psset[pst-solides3d]{xytranslate=0 0} +% \def\gridIIID{\pst@object{gridIIID}} %% usage : \gridIIID[options](x_min,x_max)(y_min,y_max) \def\gridIIID@i(#1,#2)(#3,#4){% @@ -554,6 +556,7 @@ viewpointXYZ /ZpointVue ED /YpointVue ED /XpointVue ED /Dobs {XpointVue dup mul YpointVue dup mul add ZpointVue dup mul add sqrt} bind def % CoefficientsMT XpointVue YpointVue ZpointVue /viewpoint defpoint3d +\pst@solides@xytranslate /transY ED /transX ED > %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty b/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty index b5835272a13..640daf8f89f 100644 --- a/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty +++ b/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty @@ -1,12 +1,12 @@ \RequirePackage{pstricks} -\ProvidesPackage{pst-solides3d}[2016/12/10 package wrapper for +\ProvidesPackage{pst-solides3d}[2017/03/03 package wrapper for pst-solides3d] \input{pst-solides3d.tex} \ProvidesFile{pst-solides3d.tex} [\filedate\space v\fileversion\space `PST-solides3D'] \IfFileExists{pst-solides3d.pro}{% \ProvidesFile{pst-solides3d.pro} - [2014/06/07 v. 4.23, PostScript prologue file] + [2017/03/03 v. 4.24, PostScript prologue file] \@addtofilelist{pst-solides3d.pro}}{}% \IfFileExists{pst-implicitsurface.pro}{% \ProvidesFile{pst-implicitsurface.pro} -- cgit v1.2.3