diff options
30 files changed, 471 insertions, 771 deletions
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check index edacb56c94c..3c0ffd51812 100755 --- a/Build/tools/tpm-ctan-check +++ b/Build/tools/tpm-ctan-check @@ -88,7 +88,8 @@ my @WorkingTPM = qw( pst-fr3d pst-func pst-geo pst-grad pst-infixplot pst-labo pst-lens pst-math pst-optic pst-osci pst-pdf pst-pdgr - pst-slpe pst-uml pstricks pstricks-add + pst-slpe pst-uml pst-vue3d + pstricks pstricks-add qcm qstest qtree randbild rccol rcsinfo refstyle regcount register resume robustcommand robustindex rsc rtkinenc rtklage diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/Changes b/Master/texmf-dist/doc/generic/pst-vue3d/Changes index 9e28d9dbd0c..350622c0f7d 100644 --- a/Master/texmf-dist/doc/generic/pst-vue3d/Changes +++ b/Master/texmf-dist/doc/generic/pst-vue3d/Changes @@ -1,10 +1,13 @@ +----- pst-vue3d.tex +1.23 2007-03-26 hv: load pst-vue3d.pro instead of 3d.pro +1.22 2005-05-10 hv: make the unit option available 1.21 2005-02-21 hv: use always pst-xkey and using \def instead of \edef for the parameter definitions 1.2 2004-09-12 hv: use always \pst@object for the definition of the 3d objects 1.1 2004-08-23 hv: use the default macro style of pstricks 1.0i 2004-06-05 hv: fixed bug -1.0h 2004-01-05 ml: added dedecaedron +1.0h 2004-01-05 ml: added dodecaedron 1.0g 2003-12-21 hv: fixed a bug in \pNodeThreeD 1.0f 2003-12-20 hv: added two eye macros, drop the options for CX,CY,CZ and Xorigine,... @@ -12,3 +15,8 @@ macros to use it 1.0e 2003-12-18 hv: edit the \AxesThreeD macro 1.0d 2003-12-18 hv: fix bug in truncated pyramid + + +----- pst-vue3d.pro +33 2007-03-26 hv: renamed to pst-vue3d.pro +32 2005-05-10 hv: make the unit option available diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/README b/Master/texmf-dist/doc/generic/pst-vue3d/README index 5fb550e90c1..12ea4dd201d 100644 --- a/Master/texmf-dist/doc/generic/pst-vue3d/README +++ b/Master/texmf-dist/doc/generic/pst-vue3d/README @@ -1,16 +1,48 @@ %% Package `pst-vue3d.tex' %% -%% 2005-02-21 +%% Herbert Voss <voss _at_ pstricks.de> (Germany) %% +%% 2007-03-26 +%% + +PSTricks offers excellent macros to insert more or less complex +graphics into a document. pstricks.tex itself is the base for several +other additional packages, which are mostly named pst-xxxx, +like pst-vue3d. There exists several packages for plotting three +dimensional graphical objects. pst-vue3d is similiar to the +pst-plot package for two dimensional objects and mathematical functions. + Save the files -pst-vue3.sty -pst-vue3.tex -3d.pro -> texmf/dvips/pstricks/ +pst-vue3d.sty +pst-vue3d.tex +pst-vue3d.pro in any place, where latex or any other TeX program will find it. -Pay attention, that you cannot run the documentation with -pdflatex, PSTricks is PosTScript Tricks. -Use latex->dvips->ps2pdf or have a look at -http://PSTricks.de/pdf/pdfoutput.phtml
\ No newline at end of file +The pro file should go into $TEXMF$/dvips/pstricks/. + +pst-vue3d uses the extended version of the keyval package. So +be sure that you +- have installed xkeyval with the special pst-xkey + (CTAN: tex-archive/macros/latex/contrib/xkeyval/) +- do not load another package after pst-vue3d, which loads + the old keyval.sty or pst-key.tex + + +If you like to get the documentation file in another format run + +latex pst-vue3d-doc.tex +bibtex pst-vue3d.doc +latex pst-vue3d-doc.tex +dvips pst-vue3d-doc.dvi + +to get a PostScript file. But pay attention, that the pst-vue3d +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-vue3d/examples/ChaiseDemo.pdf b/Master/texmf-dist/doc/generic/pst-vue3d/examples/ChaiseDemo.pdf Binary files differdeleted file mode 100644 index 426b0741a34..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/ChaiseDemo.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/ChaiseDemo.tex b/Master/texmf-dist/doc/generic/pst-vue3d/examples/ChaiseDemo.tex deleted file mode 100644 index 8cca398d509..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/ChaiseDemo.tex +++ /dev/null @@ -1,36 +0,0 @@ -\documentclass[a4paper]{article} -\usepackage{geometry} -\parindent=0pt -\usepackage{pstricks,pst-vue3d} -% -\definecolor{marron}{rgb}{1,0.55,0} -\def\Sol{% - \psset{normaleLongitude=90,normaleLatitude=90} - \FrameThreeD[fillcolor=lightgray,fillstyle=solid](0,0,-2)(2,-2)(-2,2) - \QuadrillageThreeD[grille=.5,linecolor=red](0,0,-2)(-2,-2)(2,2)% - \QuadrillageThreeD[grille=0.75,linecolor=cyan](0,0,-2)(-2,-2)(2,2)% -} -\def\chaise{% - \FrameThreeD[normaleLatitude=0,normaleLongitude=0,% - fillcolor=marron,fillstyle=solid](-0.8,1,2)(0.2,0)(1.8,1) - \CubeThreeD[A=.1,B=0.1,C=0.9](0.9,-0.9,-1.1) - \CubeThreeD[A=.1,B=0.1,C=0.9](0.9,0.9,-1.1) - \CubeThreeD[A=.1,B=0.1,C=2](-0.9,0.9,0) - \CubeThreeD[A=.1,B=0.1,C=2](-0.9,-0.9,0) - \CubeThreeD[A=0.9,B=1,C=0.1](0.1,0,-0.1) -} -\begin{document} - -\begin{center} - \begin{pspicture}(-5.5,-7)(5,4.5) - \psset{THETA=30,PHI=20,Dobs=10,Decran=20} - \Sol\chaise - \pNodeThreeD(-0.5,-0.3,0){littleChair} - \rput[lC](littleChair){% - \psset{THETA=30,PHI=20,Dobs=100,Decran=20} - \Sol\chaise% - } - \end{pspicture} -\end{center} - -\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/CoorDemo.pdf b/Master/texmf-dist/doc/generic/pst-vue3d/examples/CoorDemo.pdf Binary files differdeleted file mode 100644 index aef6fe88b44..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/CoorDemo.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/CoorDemo.tex b/Master/texmf-dist/doc/generic/pst-vue3d/examples/CoorDemo.tex deleted file mode 100644 index 11a009fb95d..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/CoorDemo.tex +++ /dev/null @@ -1,25 +0,0 @@ -\documentclass[12pt]{article} -\usepackage{pstricks} -\usepackage{pst-vue3d} -\SpecialCoor -\makeatletter -% -\makeatother -\begin{document} - -\psset{unit=3} -\begin{pspicture}(-1.5,-0.75)(2.5,2.25) - \AxesThreeD(20) - \pNodeThreeD(15,18,15){P}% cartesian - \uput[0](P){P} - \psset{linecolor=red} - \qdisk(P){3pt} - \showCoorThreeD[linecolor=red](15,18,15) - \psset{linecolor=blue} - \pNodeThreeD(20;60;40){Q}% spherical - \uput[0](Q){Q} - \qdisk(Q){3pt} - \showCoorThreeD[linecolor=blue](20;60;40) -\end{pspicture} - -\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/FrameDemo.pdf b/Master/texmf-dist/doc/generic/pst-vue3d/examples/FrameDemo.pdf Binary files differdeleted file mode 100644 index 3c64334088c..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/FrameDemo.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/FrameDemo.tex b/Master/texmf-dist/doc/generic/pst-vue3d/examples/FrameDemo.tex deleted file mode 100644 index b21e6794ccf..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/FrameDemo.tex +++ /dev/null @@ -1,58 +0,0 @@ -\documentclass[12pt]{article} % Herbert Voss 2003-12-20 -\usepackage{pst-vue3d,multido} -\begin{document} - -\fbox{\begin{pspicture}(-1.3,-0.75)(2,1.1) -\FrameThreeD[% - normaleLatitude=0,% - normaleLongitude=0,% - fillcolor=green,fillstyle=solid](0,0,0)(-10,-5)(10,5)% -\AxesThreeD[linecolor=red](20,15,10) -\end{pspicture}% -} -\hfill -\fbox{\begin{pspicture}(-1.3,-0.75)(2,1.1) -\FrameThreeD[% - normaleLatitude=90,% - normaleLongitude=0,% - fillcolor=green,fillstyle=solid](0,0,0)(-10,-5)(10,5)% -\AxesThreeD[linecolor=red](20,15,10) -\end{pspicture}% -}% -\hfill -\fbox{\begin{pspicture}(-1.3,-0.75)(2,1.1) -\FrameThreeD[% - normaleLatitude=0,% - normaleLongitude=90,% - fillcolor=green,fillstyle=solid](0,0,0)(-10,-5)(10,5)% -\AxesThreeD[linecolor=red](20,15,10) -\end{pspicture} -} - - - -\fbox{\begin{pspicture}(-1.3,-0.75)(2,1.1) -\psset{normaleLatitude=0,normaleLongitude=0,linewidth=0.5pt} -\FrameThreeD[fillcolor=cyan,fillstyle=solid](0,0,0)(-10,-5)(10,5)% -\QuadrillageThreeD[grille=2.5,linecolor=black,pas=5](0,0,0)(-10,-5)(10,5)% -\AxesThreeD[linecolor=red](20,15,10) -\end{pspicture}% -} -\hfill -\fbox{\begin{pspicture}(-1.3,-0.75)(2,1.1) -\psset{normaleLatitude=90,normaleLongitude=0,linewidth=0.5pt} -\FrameThreeD[fillcolor=cyan,fillstyle=solid](0,0,0)(-10,-5)(10,5)% -\QuadrillageThreeD[grille=2.5,linecolor=black](0,0,0)(-10,-5)(10,5)% -\AxesThreeD[linecolor=red](20,15,10) -\end{pspicture}% -}% -\hfill -\fbox{\begin{pspicture}(-1.3,-0.75)(2,1.1) -\psset{normaleLatitude=0,normaleLongitude=90,linewidth=0.5pt} -\FrameThreeD[fillcolor=cyan,fillstyle=solid](0,0,0)(-10,-5)(10,5)% -\QuadrillageThreeD[grille=2.5,linecolor=black](0,0,0)(-10,-5)(10,5)% -\AxesThreeD[linecolor=red](20,15,10) -\end{pspicture} -} - -\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/Line3d.pdf b/Master/texmf-dist/doc/generic/pst-vue3d/examples/Line3d.pdf Binary files differdeleted file mode 100644 index ae2b3652466..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/Line3d.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/Line3d.tex b/Master/texmf-dist/doc/generic/pst-vue3d/examples/Line3d.tex deleted file mode 100644 index 1796dd659f8..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/Line3d.tex +++ /dev/null @@ -1,66 +0,0 @@ -\documentclass[12pt,a4paper]{article} -\usepackage{pstricks} -\usepackage{pst-vue3d} -\usepackage{multido} -\usepackage{geometry} -% -\begin{document} - - \psset{unit=1cm} - \begin{pspicture}(-3,-3)(3,4) - \psset{THETA=70,PHI=30,Dobs=150,Decran=10} - \AxesThreeD[linecolor=red,linestyle=dashed](50,60,50) - \pNodeThreeD(25,-25,25){A} - \pNodeThreeD(25,25,25){B} - \pNodeThreeD(25,25,-25){C} - \pNodeThreeD(25,-25,-25){D} - \pNodeThreeD(-25,-25,25){E} - \pNodeThreeD(-25,25,25){F} - \pNodeThreeD(-25,25,-25){G} - \pNodeThreeD(-25,-25,-25){H} - \pspolygon(A)(B)(C)(D) - \pspolygon(E)(F)(G)(H) - \psline(A)(E) - \psline(B)(F) - \psline(C)(G) - \psline(D)(H) - \psset{linestyle=dashed} - \psline(A)(G) - \psline(B)(H) - \psline(C)(E) - \psline(D)(F) -% routine page 49 in "présentation de PSTricks" -% D.Girou "cahier 16 Gutengerg" - \newcounter{lettre} - \multido{\i=1+1}{8}{% - \setcounter{lettre}{\i} - \psdot[linecolor=red](\Alph{lettre}) - \uput[90](\Alph{lettre}){\Alph{lettre}} - } -\end{pspicture} - - - - \begin{pspicture}(-2.5,-3.5)(3.5,1.5) - \psset{THETA=50,PHI=50,Dobs=250,Decran=10} - \multido{\iX=-70+10}{15}{% - \pNodeThreeD(\iX,0,0){X1} - \pNodeThreeD(\iX,50,0){X2} - \psline(X1)(X2) - } - \multido{\iY=0+10}{6}{% - \pNodeThreeD(-70,\iY,0){Y1} - \pNodeThreeD(70,\iY,0){Y2} - \psline(Y1)(Y2)% - } - \psset{normaleLongitude=0,normaleLatitude=90} - \multido{\iXorigine=-65+10}{14}{% - \multido{\iYorigine=5+10}{5}{% - \CircleThreeD[linecolor=red](\iXorigine,\iYorigine,0){5}% - }% - } - \end{pspicture}% - - - -\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo.pdf b/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo.pdf Binary files differdeleted file mode 100644 index e82f795d86e..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo.tex b/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo.tex deleted file mode 100644 index 1e0608c2b11..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo.tex +++ /dev/null @@ -1,69 +0,0 @@ -\documentclass[a4paper]{article} -\usepackage{geometry} -\parindent=0pt -\usepackage{pstricks,pst-grad,multido,pst-plot,pst-vue3d} -% -\input realcalc -% -\psset{dimen=middle} -\newcommand{\cables}{% - \multido{\iY=-2+4}{2}{% - \parametricplot[linewidth=3\pslinewidth]{-5}{5}{% - \variablesTroisD - /Xabscisse t def - /Yordonnee \iY\space def - /Zcote 0.1 Xabscisse dup mul mul def - tx@3DDict begin - formulesTroisD - Xi Yi - end - } - \multido{\nCable=-4.5+0.5}{20}{% - \Rmul\cote\nCable\nCable - \Rmul\cote\cote{0.1} - \LineThreeD(\nCable,\iY,\cote)(\nCable,\iY,0) - }% - }% - \LineThreeD[linewidth=3\pslinewidth](-9,-2,0)(-5,-2,2.5) - \LineThreeD[linewidth=3\pslinewidth](9,-2,0)(5,-2,2.5) - \LineThreeD[linewidth=3\pslinewidth](-9,2,0)(-5,2,2.5) - \LineThreeD[linewidth=3\pslinewidth](9,2,0)(5,2,2.5) -} -\def\bridge(#1)(#2){{% -\begin{pspicture}(#1)(#2) - \FrameThreeD[normaleLongitude=90,normaleLatitude=90,% the river - linestyle=none,fillstyle=gradient,gradbegin=white,% - gradend=blue,gradangle=45](0,0,-2)(-4,-9)(4,9) - {\psset{fracHeight=0.62, fillstyle=solid, % - ColorFaceA=lightgray,ColorFaceB=gray} - \PyramideThreeD[A=.4,B=.4,C=.4](-5,-2,-2){7}% Bridge - \PyramideThreeD[A=.5,B=.5,C=.5](5,-2,-2){7}} - \CubeThreeD[normaleLongitude=90,% the street - normaleLatitude=90,fillstyle=solid,A=9,B=2,C=0.05](0,0,0) - \multido{\nL=-8.8+0.2}{89}{% - \LineThreeD[linecolor=lightgray](\nL,-2,0)(\nL,2,0) - } - \AxesThreeD[linestyle=dashed,arrowsize=0.2,linecolor=red](6) - \cables - \psset{fracHeight=0.62, fillstyle=solid, % - ColorFaceA=lightgray,ColorFaceB=gray} - \PyramideThreeD[A=.4,B=.4,C=.4](-5,2,-2){7}% Bridge - \PyramideThreeD[A=.5,B=.5,C=.5](5,2,-2){7} -\end{pspicture} -}} - -\begin{document} -\begin{center} -\psset{PHI=30,THETA=45,Dobs=15,Decran=10} -\bridge(-7.5,-8.5)(7.5,4.5) - -\clearpage -\makebox[\linewidth]{ -\psset{PHI=0,THETA=0,Dobs=15} -\bridge(-8,-2.5)(8,4.25) -} - -\psset{PHI=90,THETA=0,Dobs=15} -\bridge(-5,-6)(5,6) -\end{center} -\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo2.pdf b/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo2.pdf Binary files differdeleted file mode 100644 index 51d99979148..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo2.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo2.tex b/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo2.tex deleted file mode 100644 index 8e59c4abcb2..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo2.tex +++ /dev/null @@ -1,173 +0,0 @@ -\documentclass[a4paper]{article} -% Manuel Luque <MLuque@aol.com> -% Herbert Voss <voss@perce.de> - 2003/12/20 -\usepackage{pstricks} -\usepackage{pst-node} -\usepackage{pst-plot} -\usepackage{pst-grad} -\usepackage{pst-vue3d} - -\input random - -\definecolor{pelouse}{cmyk}{0.14,0.42,0.56,0} -\definecolor{base}{rgb}{1,0.8,0} -\newpsstyle{surface}{fillstyle=vlines,hatchcolor=marron,% - hatchwidth=0.2\pslinewidth,hatchsep=1\pslinewidth} -\newpsstyle{sol}{fillstyle=vlines,hatchcolor=lightgray,% - hatchwidth=0.2\pslinewidth,hatchsep=1\pslinewidth} -\SpecialCoor - -\def\fleuve{% - \FrameThreeD[normaleLatitude=90,normaleLongitude=90,% - linestyle=none,fillstyle=gradient,% - gradbegin=blue,gradend=white](0,0,-2.5)(-12,-14)(12,14) -} -\newcommand{\tablier}{% - \FrameThreeD[normaleLatitude=90,normaleLongitude=90,% - linestyle=none,fillstyle=gradient,% - gradbegin=blue,gradend=white](0,0,0)(-\Xcinf,-2)(\Xcinf,2)% - \multido{\nL=-\Xcinf+0.2}{196}{% - \LineThreeD[linecolor=lightgray](\nL,-2,0)(\nL,2,0)% - }% -} -\newcommand\rembardes{% - \multido{\iY=-2+4}{2}{% - \LineThreeD[linecolor=red](-\Xcinf,\iY,0.5)(\Xcinf,\iY,0.5) - \multido{\rX=-\Xcinf+0.4}{98}{% - \LineThreeD[linecolor=red](\rX,\iY,0)(\rX,\iY,0.5)% - }% - }% -} -\newcommand\bases{% - \multido{\iYpos=-2+4}{2}{% - \multido{\rXpos=-\Xc+\twoXc}{2}{% - \parametricplot[fillstyle=solid,fillcolor=base]{0}{360}{% - /Xabscisse t cos 1.5 mul \rXpos\space add def - /Zcote -2.5 def - /Yordonnee t sin 1.5 mul \iYpos\space add def - tx@3DDict begin - formulesTroisD - Xi Yi - end - }% - }% - }% -} -\newcommand\Berges{% - \pNodeThreeD(-\Xcinf,-14,-2){B1} - \pNodeThreeD(-12,-14,-2.5){B2} - \pNodeThreeD(-\Xcinf,14,-2){B4} - \pNodeThreeD(-12,14,-2.5){B3} - \pspolygon[fillstyle=solid,fillcolor=pelouse](B1)(B2)(B3)(B4) - \pNodeThreeD(\Xcinf,-14,-2){B1} - \pNodeThreeD(12,-14,-2.5){B2} - \pNodeThreeD(\Xcinf,14,-2){B4} - \pNodeThreeD(12,14,-2.5){B3} - \pspolygon[fillstyle=solid,fillcolor=pelouse](B1)(B2)(B3)(B4)% -} -\pagestyle{empty} - -\def\Radius{14} -\def\Xc{6.5} -\newdimen\tempXc -\tempXc=\Xc pt -\multiply\tempXc by 3 -\def\Xcinf{\pointless\tempXc} -\newdimen\temptwoXc -\temptwoXc=\Xc pt -\multiply\temptwoXc by 2 -\def\twoXc{\pointless\temptwoXc} - -\begin{document} - -\psset{PHI=40,THETA=-70,Dobs=30,Decran=8} - -\begin{pspicture}(-8,-10)(15,10) -\pNodeThreeD(0,0,0){fictif} -\fleuve% -\Berges\bases% -\multido{\iY=-2+4}{2}{% - \pnode(! - /Xc \Xc\space def - /Radius \Radius\space def - /radius1 Xc 2 Radius mul add Xc Radius mul Radius dup mul add - sqrt 2 mul sub def - /X1 radius1 def - /Hpile Radius 1 1 Xc 2 mul dup mul 4 Radius dup mul mul div - sub sqrt sub mul neg def - X1 radius1){PointInitial} - \LineThreeD(-\Xcinf,\iY,-2)(-\Xcinf,\iY,0) - \LineThreeD(\Xcinf,\iY,-2)(\Xcinf,\iY,0) - \LineThreeD(-19.5,\iY,0)(19.5,\iY,0) - \LineThreeD(-\Xc,\iY,-2.5)(-\Xc,\iY,0) - \LineThreeD(\Xc,\iY,0)(\Xc,\iY,-2.5) - \multido{\nX=-13+13}{3}{% - \parametricplot{62.336}{117.664}{% - /Xabscisse t cos Radius mul \nX\space add def - /Zcote t sin Radius mul Radius sub def - /Yordonnee \iY\space def - tx@3DDict begin - formulesTroisD - Xi Yi - end - } - \parametricplot{0}{360}{% - /Xabscisse t cos radius1 mul radius1 add Xc sub \nX\space add def - /Zcote t sin radius1 mul radius1 add neg def - /Yordonnee \iY\space def - tx@3DDict begin - formulesTroisD - Xi Yi - end - } - \parametricplot{0}{360}{% - /Xabscisse t cos radius1 mul radius1 add neg Xc 2 mul add \nX\space add Xc sub def - /Zcote t sin radius1 mul radius1 add neg def - /Yordonnee \iY\space def - tx@3DDict begin - formulesTroisD - Xi Yi - end - } - \multido{\i=0+1}{30}{% - \pnode(! - /B Radius X1 mul Xc radius1 mul sub neg def - /A Radius radius1 sub def - /C X1 X1 mul Radius mul Xc Xc mul radius1 mul sub def - /Discriminant B B mul A C mul sub sqrt def - /X2 B neg Discriminant add A div def - /radius2 X2 X1 sub 2 exp 4 radius1 mul div def - X2 radius2){fictif1} - \multido{\nX=-13+13}{3}{% - \parametricplot{0}{360}{% - /Xabscisse t cos radius2 mul X2 add Xc sub \nX\space add def - /Zcote t sin radius2 mul radius2 add neg def - /Yordonnee \iY\space def - tx@3DDict begin - formulesTroisD - Xi Yi - end - } - \parametricplot{0}{360}{% - /Xabscisse t cos radius2 mul X2 add neg Xc 2 mul add Xc sub \nX\space add def - /Zcote t sin radius2 mul radius2 add neg def - /Yordonnee \iY\space def - tx@3DDict begin - formulesTroisD - Xi Yi - end - }% - } - \pnode(! - /X1 X2 def - /radius1 radius2 def - X1 radius1){fictif2} - } - }% -} -\tablier -\rembardes -\AxesThreeD[linestyle=dashed,arrowsize=0.2](21,16,10) -\end{pspicture} - -\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo3.pdf b/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo3.pdf Binary files differdeleted file mode 100644 index 6b3116a610f..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo3.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo3.tex b/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo3.tex deleted file mode 100644 index ececb1d3531..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PontDemo3.tex +++ /dev/null @@ -1,170 +0,0 @@ -\documentclass[a4paper]{article} -% Manuel Luque <MLuque@aol.com> -% Herbert Voss <voss@perce.de> - 2003/12/20 -\usepackage{pstricks} -\usepackage{pst-node} -\usepackage{pst-plot} -\usepackage{pst-grad} -\usepackage{pst-vue3d} -\usepackage{multido} - -\input random - -\definecolor{pelouse}{cmyk}{0.14,0.42,0.56,0} -\definecolor{base}{rgb}{1,0.8,0} -\newpsstyle{surface}{fillstyle=vlines,hatchcolor=marron,% - hatchwidth=0.2\pslinewidth,hatchsep=1\pslinewidth} -\newpsstyle{sol}{fillstyle=vlines,hatchcolor=lightgray,% - hatchwidth=0.2\pslinewidth,hatchsep=1\pslinewidth} - -\SpecialCoor - -\def\fleuve{% - \FrameThreeD[normaleLatitude=90,normaleLongitude=90,% - linestyle=none,fillstyle=gradient,% - gradbegin=blue,gradend=white](0,0,-2.5)(-12,-14)(12,14) -} -\newcommand{\tablier}{% - \FrameThreeD[normaleLatitude=90,normaleLongitude=90,% - linestyle=none,fillstyle=gradient,% - gradbegin=gray,gradend=white](0,0,0)(-\Xcinf,-2)(\Xcinf,2)% - \multido{\nL=-\Xcinf+0.2}{196}{% - \LineThreeD[linecolor=lightgray](\nL,-2,0)(\nL,2,0)% - }% -} -\newcommand\rembardes{% - \multido{\iY=-2+4}{2}{% - \LineThreeD[linecolor=red](-\Xcinf,\iY,0.5)(\Xcinf,\iY,0.5) - \multido{\rX=-\Xcinf+0.4}{98}{% - \LineThreeD[linecolor=red](\rX,\iY,0)(\rX,\iY,0.5)% - }% - }% -} -\newcommand\bases{% - \multido{\iYpos=-2+4}{2}{% - \multido{\rXpos=-\Xc+\twoXc}{2}{% - \parametricplot[fillstyle=solid,fillcolor=base]{0}{360}{% - /Xabscisse t cos 1.5 mul \rXpos\space add def - /Zcote -2.5 def - /Yordonnee t sin 1.5 mul \iYpos\space add def - tx@3DDict begin - formulesTroisD - Xi Yi - end - }% - }% - }% -} -\newcommand\Berges{% - \pNodeThreeD(-\Xcinf,-14,-2){B1} - \pNodeThreeD(-12,-14,-2.5){B2} - \pNodeThreeD(-\Xcinf,14,-2){B4} - \pNodeThreeD(-12,14,-2.5){B3} - \pspolygon[fillstyle=solid,fillcolor=pelouse](B1)(B2)(B3)(B4) - \pNodeThreeD(\Xcinf,-14,-2){B1} - \pNodeThreeD(12,-14,-2.5){B2} - \pNodeThreeD(\Xcinf,14,-2){B4} - \pNodeThreeD(12,14,-2.5){B3} - \pspolygon[fillstyle=solid,fillcolor=pelouse](B1)(B2)(B3)(B4)% -} - -\pagestyle{empty} - -\def\Radius{14} -\def\Xc{6.5} -\newdimen\tempXc -\tempXc=\Xc pt -\multiply\tempXc by 3 -\def\Xcinf{\pointless\tempXc} -\newdimen\temptwoXc -\temptwoXc=\Xc pt -\multiply\temptwoXc by 2 -\def\twoXc{\pointless\temptwoXc} - -\begin{document} - -\begin{pspicture}(-4,-10)(15,10) -\psset{PHI=20,THETA=-30,Dobs=30,Decran=10} -\pNodeThreeD(0,0,0){fictif} -\fleuve\Berges\bases% -\multido{\iY=-2+4}{2}{% - \pnode(! - /Xc \Xc\space def - /Radius \Radius\space def - /radius1 Xc 2 Radius mul add Xc Radius mul Radius dup mul add - sqrt 2 mul sub def - /X1 radius1 def - /Hpile Radius 1 1 Xc 2 mul dup mul 4 Radius dup mul mul div - sub sqrt sub mul neg def - X1 radius1){PointInitial} - \LineThreeD(-\Xcinf,\iY,-2)(-\Xcinf,\iY,0) - \LineThreeD(\Xcinf,\iY,-2)(\Xcinf,\iY,0) - \LineThreeD(-19.5,\iY,0)(19.5,\iY,0) - \LineThreeD(-\Xc,\iY,-2.5)(-\Xc,\iY,0) - \LineThreeD(\Xc,\iY,0)(\Xc,\iY,-2.5) - \multido{\nX=-13+13}{3}{% - \parametricplot{62.336}{117.664}{% - /Xabscisse t cos Radius mul \nX\space add def - /Zcote t sin Radius mul Radius sub def - /Yordonnee \iY\space def - tx@3DDict begin - formulesTroisD - Xi Yi - end - } - \parametricplot{0}{360}{% - /Xabscisse t cos radius1 mul radius1 add Xc sub \nX\space add def - /Zcote t sin radius1 mul radius1 add neg def - /Yordonnee \iY\space def - tx@3DDict begin - formulesTroisD - Xi Yi - end - } - \parametricplot{0}{360}{% - /Xabscisse t cos radius1 mul radius1 add neg Xc 2 mul add \nX\space add Xc sub def - /Zcote t sin radius1 mul radius1 add neg def - /Yordonnee \iY\space def - tx@3DDict begin - formulesTroisD - Xi Yi - end - } - } - \multido{\i=0+1}{30}{% - \pnode(! - /B Radius X1 mul Xc radius1 mul sub neg def - /A Radius radius1 sub def - /C X1 X1 mul Radius mul Xc Xc mul radius1 mul sub def - /Discriminant B B mul A C mul sub sqrt def - /X2 B neg Discriminant add A div def - /radius2 X2 X1 sub 2 exp 4 radius1 mul div def - X2 radius2){fictif1} - \multido{\nX=-13+13}{3}{% - \parametricplot{0}{360}{% - /Xabscisse t cos radius2 mul X2 add Xc sub \nX\space add def - /Zcote t sin radius2 mul radius2 add neg def - /Yordonnee \iY\space def - tx@3DDict begin - formulesTroisD - Xi Yi - end - } - \parametricplot{0}{360}{% - /Xabscisse t cos radius2 mul X2 add neg Xc 2 mul add Xc sub \nX\space add def - /Zcote t sin radius2 mul radius2 add neg def - /Yordonnee \iY\space def - tx@3DDict begin - formulesTroisD - Xi Yi - end - }% - } - \pnode(! /X1 X2 def /radius1 radius2 def X1 radius1){fictif2} - }% -} -\tablier -\rembardes -\AxesThreeD[linestyle=dashed,arrowsize=0.2](21,16,10) -\end{pspicture} -\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PyramidDemo.pdf b/Master/texmf-dist/doc/generic/pst-vue3d/examples/PyramidDemo.pdf Binary files differdeleted file mode 100644 index 7dc446803ca..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PyramidDemo.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PyramidDemo.tex b/Master/texmf-dist/doc/generic/pst-vue3d/examples/PyramidDemo.tex deleted file mode 100644 index b0cf19da007..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/PyramidDemo.tex +++ /dev/null @@ -1,17 +0,0 @@ -\documentclass{article} -\usepackage{pst-vue3d} -\begin{document} - \psset{THETA=30,PHI=30,Dobs=400,Decran=30,fillstyle=solid} - \begin{pspicture}(-2.5,-2)(2.5,12) - \PyramideThreeD[fracHeight=0.5,A=10](0,0,0){150}% - \psset{A=5} - \PyramideThreeD(0,0,75){5}% - \end{pspicture}% - % - \begin{pspicture}(-2.5,-2)(2.5,12) - \CubeThreeD[A=15,B=15,C=15](0,0,15)% - \PyramideThreeD[fracHeight=0.5,A=10](0,0,30){150}% - \psset{A=5} - \PyramideThreeD(0,0,105){5}% - \end{pspicture}% -\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/SphereDemo0.pdf b/Master/texmf-dist/doc/generic/pst-vue3d/examples/SphereDemo0.pdf Binary files differdeleted file mode 100644 index 908c16af5d2..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/SphereDemo0.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/examples/SphereDemo0.tex b/Master/texmf-dist/doc/generic/pst-vue3d/examples/SphereDemo0.tex deleted file mode 100644 index ec86ad42a83..00000000000 --- a/Master/texmf-dist/doc/generic/pst-vue3d/examples/SphereDemo0.tex +++ /dev/null @@ -1,57 +0,0 @@ -\documentclass[12pt]{article} -\usepackage{pstricks} -\usepackage{pst-grad} -\usepackage{pst-vue3d} - -\newpsstyle{GradGrayWhite}{fillstyle=gradient,% - gradbegin=blue,gradend=white,linewidth=0.1mm}% - -\begin{document} - -\begin{pspicture}(-3.75,-3.25)(5,5.5) - \AxesThreeD(45,40,50) - \psset{PortionSphereTHETA=60,PortionSpherePHI=45,linewidth=0.1pt} - \SphereThreeD[fillstyle=solid,fillcolor=cyan,linewidth=0.1pt](0,0,0){30} - \PortionSphereThreeD[fillstyle=solid,fillcolor=red](0,0,0){30} - \LineThreeD[SphericalCoor,linestyle=dashed](0,0,0)(30,70,35) - \LineThreeD[SphericalCoor,linestyle=dashed](0,0,0)(30,50,35) - \LineThreeD[SphericalCoor,linestyle=dashed](0,0,0)(30,70,55) - \LineThreeD[SphericalCoor,linestyle=dashed](0,0,0)(30,50,55) - \LineThreeD[SphericalCoor](30,70,35)(50,70,35) - \LineThreeD[SphericalCoor](30,50,35)(50,50,35) - \LineThreeD[SphericalCoor](30,70,55)(50,70,55) - \LineThreeD[SphericalCoor](30,50,55)(50,50,55) - \PortionSphereThreeD[fillstyle=solid,fillcolor=red](0,0,0){50} - \psset{linestyle=dashed,linecolor=red,linewidth=\pslinewidth} - \LineThreeD(0,0,0)(30,0,0) - \LineThreeD(0,0,0)(0,30,0) - \LineThreeD(0,0,0)(0,0,30) -\end{pspicture} - -\begin{pspicture}(-3,-3.5)(3,5)% - \psset{THETA=30,PHI=30,Dobs=100,Decran=10}% - \SphereThreeD[fillstyle=solid,fillcolor=cyan,linewidth=0.1pt](0,0,0){20} - \AxesThreeD(25) - \PortionSphereThreeD[fillstyle=solid,fillcolor=gray](0,0,0){20}% - \pNodeThreeD(20;10;10){C1}% - \pNodeThreeD(40;10;10){D1}% - \psline(C1)(D1)% - \pNodeThreeD(20;10;-10){C2}% - \pNodeThreeD(40;10;-10){D2}% - \psline(C2)(D2)% - \pNodeThreeD(20;-10;-10){C3}% - \pNodeThreeD(40;-10;-10){D3}% - \psline(C3)(D3)% - \pNodeThreeD(20;-10;10){C4}% - \pNodeThreeD(40;-10;10){D4}% - \psline(C4)(D4)% -% - \PortionSphereThreeD[style=GradGrayWhite](0,0,0){40}% - \psset{linecolor=white,PhiCercle=45}% - \SphereCercleThreeD(0,0,0){20}% - \SphereMeridienThreeD[ThetaMeridien=45](0,0,0){20}% - \SphereCercleThreeD[PhiCercle=0](0,0,0){20}% - \SphereMeridienThreeD[THETA=30,PHI=30,ThetaMeridien=0](0,0,0){20}% -\end{pspicture} - -\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.bib b/Master/texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.bib new file mode 100644 index 00000000000..3b785845e22 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.bib @@ -0,0 +1,129 @@ +@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } + +@Book{PostScript, + Author = {Kollock, Nikolai G.}, + Title = {PostScript richtig eingesetzt: vom Konzept zum + praktischen Einsatz}, + Publisher = {IWT}, + Address = {Vaterstetten}, + year = 1989, +} + +@Manual{pstricks, + Title = {PSTricks - {\PS} macros for Generic TeX}, + Author = {Timothy Van Zandt}, + Organization = {}, + Address = {\url{http://www.tug.org/application/PSTricks}}, + Note = {}, + year = 1993, +} + + +@Manual{pdftricks, + Title = {PSTricks Support for pdf}, + Author = {Herbert Voss}, + Organization = {}, + Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}}, + Note = {}, + year = 2002, +} + +@Manual{miwi, + Title = {References for \TeX{} and Friends}, + Author = {Michael Wiedmann and Peter Karp}, + Organization = {}, + Address = {\url{http://www.miwie.org/tex-refs/}}, + Note = {}, + year = 2003, +} + + +@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}, + Organization = {}, + Address = {\url{http://members.aol.com/Mluque5130/vue3d16112002.zip}}, + Note = {}, + year = 2002, +} + +@Article{dtk02.2:jackson.voss:plot-funktionen, + author = {Laura E. Jackson and Herbert Vo{\ss}}, + title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}}, + journal = dtk, + year = 2002, + volume = {2/02}, + altvolume = 2, + altnumber = 14, + month = jun, + pages = {27--34}, + annote = bretter, + keywords = {}, + abstract = { Im letzten Heft wurden die mathematischen Funktionen von + \PS~im Zusammenhang mit dem {\LaTeX}-Paket + \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben + und durch Beispiele erl{\"a}utert. In diesem Teil werden + die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r + externe Daten behandelt. } +} + +@Article{dtk02.1:voss:mathematischen, + author = {Herbert Vo{\ss}}, + title = {Die mathematischen {F}unktionen von {P}ostscript}, + journal = dtk, + year = 2002, + volume = {1/02}, + altvolume = 1, + altnumber = 14, + month = mar, + pages = {40-47}, + annote = bretter, + keywords = {}, + abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im + Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es + darum geht zu beurteilen, was es denn nun im eigentlichen + Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass + sich mit den \PS-Funktionen viele Dinge erledigen lassen, + bei denen sonst auf externe Programme zur{\"u}ckgegriffen + wird. Dies wird im Folgenden f{\"u}r die mathematischen + Funktionen im Zusammenhang mit dem Paket \texttt{pst-plot} + gezeigt. } +} + + +@Book{companion, + author = {Michel Goosens and Frank Mittelbach and Alexander + Samarin}, + title = {The {\LaTeX} {G}raphics {C}ompanion}, + publisher = {{Addison-Wesley Publishing Company}}, + year = {2004}, + edition = {2.}, + address = {Reading, Mass.} +} + +@Book{PSTricks2, + author = {Herbert Vo\ss}, + title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, + edition = {4.}, + publisher = {DANTE -- Lehmanns}, + year = {2007}, + 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} +} + diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.pdf b/Master/texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.pdf Binary files differnew file mode 100644 index 00000000000..8f43cdafea1 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-vue3d/vue3d-e.tex b/Master/texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.tex index 12862908874..e0808473fc1 100644 --- a/Master/texmf-dist/doc/generic/pst-vue3d/vue3d-e.tex +++ b/Master/texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.tex @@ -3,27 +3,29 @@ \usepackage[T1]{fontenc} \usepackage[latin1]{inputenc} \usepackage{lmodern}% only for PDF output +%\usepackage[scaled=0.9]{luximono} \usepackage[a4paper,bmargin=2cm,tmargin=2cm]{geometry} \usepackage{url} \usepackage{morefloats} \setcounter{totalnumber}{10} \setcounter{dbltopnumber}{10} \renewcommand{\textfraction}{0} -\usepackage{subfigure} +\usepackage{subfig} % Mluque5130@aol.com % 17 octobre 2003 % Herbert Voss <voss@pstricks.de> -% September 2004 +% March 2007 \def\UrlFont{\small\ttfamily} \makeatletter -\def\verbatim@font{\footnotesize\normalfont\ttfamily} +\def\verbatim@font{\small\normalfont\ttfamily} \makeatother \usepackage[colorlinks,linktocpage]{hyperref} \usepackage[english]{babel} \usepackage{pstricks,multido,pst-grad} \usepackage{pst-vue3d} \let\VueFversion\fileversion -\usepackage{pst-example} +\usepackage{showexpl} +\def\PS{PostScript} % \definecolor{GrisClair} {rgb}{0.6,0.7,0.8} \definecolor{GrisTresClair} {rgb}{0.8,0.9,0.7} @@ -352,7 +354,7 @@ figure, the period of the grid is 10~units \begin{figure}[!htb] \centering -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=30,PHI=30,Dobs=200,Decran=12} \begin{pspicture}(-2.8,-3)(3.5,3.5) \PlansOXYZ @@ -371,13 +373,13 @@ figure, the period of the grid is 10~units \psline(G_Z)(G_YZ) \AxesThreeD{->}(55) \end{pspicture} -\end{Beispiel} +\end{LTXexample} \caption{\label{coordinates}Origin \texttt{(40,40,35)}} \end{figure} \begin{figure}[!ht] \centering -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=30,PHI=30,Dobs=200,Decran=12} \begin{pspicture}(-2.8,-3)(3.5,3.5) \PlansOXYZ @@ -398,7 +400,7 @@ figure, the period of the grid is 10~units \DieThreeD(40,40,35)% \AxesThreeD{->}(55) \end{pspicture} -\end{Beispiel} +\end{LTXexample} \caption{\label{CubeOne}The placed cube.} \end{figure} @@ -406,7 +408,7 @@ figure, the period of the grid is 10~units To make it rotate of around $OX$ , one adds the parameter \verb+RotX=90+(figure~\ref{RotX}). \begin{figure}[!ht] -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=30,PHI=30,Dobs=200,Decran=12} \begin{pspicture}(-2.8,-3)(3.5,3.5) \PlansOXYZ @@ -425,7 +427,7 @@ To make it rotate of around $OX$ , one adds the parameter \verb+RotX=90+(figur \psline(G)(G_YZ) \DieThreeD(40,40,35)% \end{pspicture} -\end{Beispiel} +\end{LTXexample} \caption{\label{RotX} 90\textsuperscript{o} rotation around $OX$ and plane projections.} \end{figure} @@ -433,14 +435,14 @@ To make it rotate of around $OX$ , one adds the parameter \verb+RotX=90+(figur Three successive rotations around three axes with: \verb+RotX=60,RotY=20,RotZ=110+, are illustrate in figure~\ref{RotXYZ}. \begin{figure}[!ht] -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=30,PHI=30,Dobs=200,Decran=12} \begin{pspicture}(-2.8,-3)(3.5,3.5) \PlansOXYZ \AxesThreeD(55) \DieThreeD[A=5,B=5,C=5,RotX=30,RotY=20,RotZ=150](40,40,35)% \end{pspicture} -\end{Beispiel} +\end{LTXexample} \caption{\label{RotXYZ}rotations around $OX$, $OY$ et $OZ$: \texttt{RotX=60,RotY=20,RotZ=110}.} \end{figure} @@ -473,39 +475,39 @@ Maxwell, Bohr etc. \begin{figure}[ht] -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=15,PHI=50,Dobs=200,Decran=15} \hexagon -\end{Beispiel} +\end{LTXexample} \caption{\label{hexagone}hexagon.} \end{figure} \begin{figure}[ht] -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=15,PHI=50,Dobs=200,Decran=15}% \stardodecagon -\end{Beispiel} +\end{LTXexample} \caption{\label{dodecagone}star dodecagon.} \end{figure} \begin{figure}[ht] -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=-15,PHI=50,Dobs=200,Decran=15} \pentagon -\end{Beispiel} +\end{LTXexample} \caption{\label{pentagone}pentagon.} \end{figure} \begin{figure}[ht] -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=-15,Decran=10,Dobs=100,PHI=75} \stardecagon -\end{Beispiel} +\end{LTXexample} \caption{\label{decagone}star decagon.} \end{figure} \begin{figure}[ht] -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=20,PHI=75,Decran=10,Dobs=100} \begin{pspicture*}(-2.5,-2.5)(2.5,2) \Table @@ -514,30 +516,30 @@ Maxwell, Bohr etc. \CubeThreeD[RotZ=-120](3.94338,6.83,5)%2 \CubeThreeD[RotZ=120](3.94338,-6.83,5)%3 \end{pspicture*} -\end{Beispiel} +\end{LTXexample} \caption{\label{triangle}triangle.} \end{figure} \begin{figure}[ht] -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=-15,PHI=50,Decran=10,Dobs=150} \octogon -\end{Beispiel} +\end{LTXexample} \caption{\label{octogone}octogon.} \end{figure} \begin{figure}[ht] -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=-15,Decran=10,Dobs=150,PHI=75} \starhexadecagon -\end{Beispiel} +\end{LTXexample} \caption{\label{hexadecagon}star hexadecagon.} \end{figure} \begin{figure}[ht] -\begin{Beispiel}[colwidth=0.45\linewidth] +\begin{LTXexample}[width=0.45\linewidth] \psset{THETA=-15,Decran=10,Dobs=150,PHI=75} \begin{pspicture}(-2.2,-1.75)(2.2,2.2) \Table @@ -559,7 +561,7 @@ Maxwell, Bohr etc. \DieThreeD[RotZ=-120,RotY=180](6.83,11.83,5)% \DieThreeD[RotZ=180](13.86,0,5)% \end{pspicture} -\end{Beispiel} +\end{LTXexample} \caption{\label{pentagoneDie}hexagon with dices.} \end{figure} @@ -1256,5 +1258,9 @@ The following option makes it possible to visualize the interior of the box, the \end{figure} +\nocite{*} + +\bibliographystyle{plain} +\bibliography{pst-vue3d-doc} \end{document} diff --git a/Master/texmf-dist/dvips/pst-vue3d/3D.pro b/Master/texmf-dist/dvips/pst-vue3d/pst-vue3d.pro index dc7bf00331d..b6e8d1289ab 100644 --- a/Master/texmf-dist/dvips/pst-vue3d/3D.pro +++ b/Master/texmf-dist/dvips/pst-vue3d/pst-vue3d.pro @@ -1,4 +1,4 @@ -%version 31 octobre 2003 +%version 33 march 2007 % /tx@3DDict 100 dict def tx@3DDict begin @@ -571,7 +571,10 @@ fill % /CalcCoordinates{% formulesTroisD - Xi 28.45 mul Yi 28.45 mul +% hv 2005-04-30 --->beg +% Xi 28.45 mul Yi 28.45 mul + Xi xUnit mul Yi yUnit mul +% hv 2005-04-30 <---beg } def % pour la 3D conventionnelle diff --git a/Master/texmf-dist/source/generic/pst-vue3d/Makefile b/Master/texmf-dist/source/generic/pst-vue3d/Makefile new file mode 100644 index 00000000000..1eac89064a6 --- /dev/null +++ b/Master/texmf-dist/source/generic/pst-vue3d/Makefile @@ -0,0 +1,48 @@ + +# `Makefile' for `pst-3dplot.pdf', hv, 2007/03/17 + +.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps + +PACKAGE = pst-vue3d + +MAIN = $(PACKAGE)-doc + +LATEX = latex + +ARCHNAME = $(MAIN)-$(shell date +%y%m%d) + +ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile + +all : doc clean +doc: $(MAIN).pdf + +$(MAIN).pdf : $(MAIN).ps + GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $< + +$(MAIN).ps : $(MAIN).dvi + dvips $< + +$(MAIN).dvi : $(MAIN).tex + $(LATEX) $< + $(LATEX) $< + if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi + if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi + makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ + $(basename $<).glo + makeindex -t $(basename $<).ilg -o $(basename $<).ind \ + $(basename $<).idx + bibtex $(basename $<) + $(LATEX) $< + $(LATEX) $< + +clean : + $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl ) + $(RM) $(addprefix $(MAIN), .dvi .ps) + +veryclean : clean + $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) + +arch : + zip $(ARCHNAME).zip $(ARCHFILES) + +# EOF diff --git a/Master/texmf-dist/tex/generic/pst-vue3d/pst-vue3d.tex b/Master/texmf-dist/tex/generic/pst-vue3d/pst-vue3d.tex index 07ae96eb41e..1b23e7b75c8 100644 --- a/Master/texmf-dist/tex/generic/pst-vue3d/pst-vue3d.tex +++ b/Master/texmf-dist/tex/generic/pst-vue3d/pst-vue3d.tex @@ -1,4 +1,3 @@ - %% This is file `pst-vue3d.tex', %% %% IMPORTANT NOTICE: @@ -23,14 +22,14 @@ % Require PSTricks and pst-node packages \ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi \ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi -\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi +\ifx\PSTthreeDLoaded\endinput\else\input pst-3d.tex\fi +\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey\fi % -\def\fileversion{1.21}% -\def\filedate{2005/02/21}% -\message{`PST-VUE3D v\fileversion, \filedate\space (ML)(hv)}% -\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax +\def\fileversion{1.23}% +\def\filedate{2007/03/26}% +\message{`pst-vue3d v\fileversion, \filedate\space (ML)(hv)}% +\edef\PstAtCode{\the\catcode`\@}\catcode`\@=11\relax \pst@addfams{pst-vue3d}% for pst-xkey - %%%% \define@key[psset]{pst-vue3d}{scale}{\def\psk@TroisD@scale{#1}} % echelle \define@key[psset]{pst-vue3d}{RotX}{\def\psk@TroisD@RotX{#1}} % rotation autour de Ox en degrés @@ -107,6 +106,10 @@ % \def\variablesTroisD{% 0 0 translate +% hv 2005-04-30 --->beg + /xUnit \pst@number\psxunit def + /yUnit \pst@number\psyunit def +% hv 2005-04-30 <---end /reduction \psk@TroisD@scale\space def /RotX \psk@TroisD@RotX\space def /RotY \psk@TroisD@RotY\space def @@ -161,7 +164,7 @@ % hv 2003-12-20 % -------------- Utilities ----------------- \SpecialCoor -\pstheader{3D.pro} +\pstheader{pst-vue3d.pro} \def\face{% \pscurve(1;160)(0.8;180)(1;200) @@ -298,10 +301,10 @@ } % % -\def\CubeThreeD{\pst@object{CubeThreeD}} +\def\CubeThreeD{\def\pst@par{}\pst@object{CubeThreeD}} \def\CubeThreeD@i(#1,#2,#3){{ \begin@ClosedObj - \use@par +% \use@par \addto@pscode{% \variablesTroisD \ifPst@SphericalCoor @@ -324,7 +327,7 @@ /CubeColorFaceFour {\psk@TroisD@CubeColorFaceFour} def /CubeColorFaceSix {\psk@TroisD@CubeColorFaceSix} def tx@3DDict begin - /Condition1 {PS1 0 le } def + /Condition1 { PS1 0 le } def Cube end }% fin du code ps @@ -666,6 +669,34 @@ end){\@NodeNameThreeD}% } % + +\iffalse +% hv 2005-12-04 +\def\pnodeThreeD{\pst@object{pnodeThreeD}} +\def\pnodeThreeD@i(#1,#2,#3)#4{% + \pst@killglue + \begingroup + \use@par + \pnode(! + \psk@embedangle + \psk@viewpoint + \psk@viewangle + \tx@SetMatrixThreeD + \ifPst@SphericalCoor + /Radius #1 def + /longitude #2 def + /latitude #3 def + Radius longitude cos mul latitude cos mul % x + Radius longitude sin mul latitude cos mul % y + Radius latitude sin mul % z + \else + #1 #2 #3 + \fi + \tx@ProjThreeD){#4}% + \endgroup} +% +\let\pNodeThreeD\pnodeThreeD +\fi % \def\TetraedreThreeD{\pst@object{TetraedreThreeD}} \def\TetraedreThreeD@i(#1,#2,#3){{% @@ -1016,7 +1047,7 @@ % % \def\ConeThreeD{\pst@object{ConeThreeD}} -\def\ConeThreeD@i(#1,#2,#3)#4#5{{% +\def\ConeThreeD@i(#1,#2,#3)#4#5{% % Le centre de la base sera placé avec % (#2,#3,#4) les paramètres CX,CY et CZ % #5 rayon @@ -1047,7 +1078,7 @@ }% fin du code ps \showpointsfalse \end@ClosedObj -}\ignorespaces}% +\ignorespaces}% % \def\CircleThreeD{\pst@object{CircleThreeD}} \def\CircleThreeD@i(#1,#2,#3)#4{{% @@ -1245,6 +1276,147 @@ \end@OpenObj }\ignorespaces}% % fin de la commande PSTricks % +\newif\ifPstThreeDplot@showInside +\define@key[psset]{pst-vue3d}{showInside}[true]{\@nameuse{PstThreeDplot@showInside@#1}} +\define@key[psset]{pst-vue3d}{SegmentColor}{\pst@getcolor{#1}\psk@ThreeDplot@SegmentColor} +\define@key[psset]{pst-vue3d}{increment}{\pst@getint{#1}\psk@ThreeDplot@increment} +\psset[pst-vue3d]{showInside,SegmentColor={[cmyk]{0.2,0.6,1,0}},increment=10} +% +\def\ParaboloidThreeD{\pst@object{ParaboloidThreeD}} +\def\ParaboloidThreeD@i#1#2{% +\begin@SpecialObj% +\addto@pscode{% + \psk@embedangle + \psk@viewpoint + \psk@viewangle + \tx@SetMatrixThreeD +% Vecteur ViewPoint + \psk@viewpoint + /vZ ED + /vY ED + /vX ED + /increment \psk@ThreeDplot@increment\space def + /height #1 def + /radius #2 #1 sqrt div def + /cmyk {} def + 1 setlinejoin + % les rayons de lumière + /xLight 1 def + /yLight 0.1 def + /zLight 0.2 def + % précision du tracé + /pas 0.5 def + /pas10 {pas 10 div} bind def +% + /NormeLight {xLight dup mul yLight dup mul zLight dup mul add add sqrt} bind def +% l'ellipse du plan de coupe : le contour + /calculate2DPoint { % four values on stack; x2D y2D are returned + /V0 ED /Z0 ED /U20 ED /U10 ED + U10 cos V0 mul radius mul \pst@number\psunit mul + U20 sin V0 mul radius mul \pst@number\psunit mul + Z0 \pst@number\psunit mul \tx@ProjThreeD + } def + /PlanCoupe { + /Z height store + /V {Z sqrt} bind def + /TableauxPoints [ + 0 1 359 { + /U exch def [ U U Z V caclculate2DPoint ] % on décrit le cercle + } for + ] def + newpath + TableauxPoints 0 get aload pop moveto + 0 1 359 { + /compteur exch def + TableauxPoints compteur get aload pop + lineto } for + closepath + } def +% + /facette { + newpath + U U Z V calculate2DPoint moveto + U 1 U increment add {% + /U1 exch def + U1 U1 Z V calculate2DPoint lineto + } for + Z pas10 Z pas add pas10 add{ + /Z1 exch def + /V {Z1 sqrt} bind def + U1 U1 Z1 V calculate2DPoint lineto + } for + U increment add -1 U {% + /U2 exch def + U2 U2 Z pas add V calculate2DPoint lineto + } for + Z pas add pas10 sub pas10 neg Z pas10 sub{ + /Z2 exch def + /V {Z2 abs sqrt} bind def + U U Z2 V calculate2DPoint lineto + } for + closepath + } def % facette +% + /MaillageParaboloid { + 0 pas height pas sub{% + /Z ED + /V {Z sqrt} bind def + 0 increment 360 increment sub {% + /U exch def +% Centre de la facette + /Ucentre {U increment 2 div add} bind def + /Vcentre {Z pas 2 div add sqrt} bind def +% normale à la facette + /nXfacette {2 Vcentre dup mul mul Ucentre cos mul radius mul} bind def + /nYfacette {2 Vcentre dup mul mul Ucentre sin mul radius mul} bind def + /nZfacette {Vcentre neg radius dup mul mul} bind def + /NormeN { + nXfacette dup mul + nYfacette dup mul + nZfacette dup mul + add add sqrt} bind def + NormeN 0 eq {/NormeN 1e-10 def} if +% test de visibilité + /PSfacette vX nXfacette mul + vY nYfacette mul add + vZ nZfacette mul add def + condition { + facette + /cosV {1 xLight nXfacette mul + yLight nYfacette mul + zLight nZfacette mul + add add + NormeLight + NormeN mul div sub} bind def + \psk@ThreeDplot@SegmentColor\space + cosV mul 4 1 roll cosV mul 4 1 roll cosV dup mul mul 4 1 roll cosV dup mul mul 4 1 roll + setcmykcolor fill + 0 setgray + facette + stroke + } if + } for + } for + } def + /conditionGE {PSfacette 0 ge} def + /conditionLE {PSfacette 0 le} def + \ifPstThreeDplot@showInside + /condition {conditionGE} def + MaillageParaboloid + vZ 0 ge {% + PlanCoupe 1 0.5 0.5 setrgbcolor fill + PlanCoupe 0 setgray stroke} if + \else + /condition {conditionLE} def + MaillageParaboloid + /condition {conditionGE} def + MaillageParaboloid% + \fi +} +% fin du code ps +\showpointsfalse +\end@SpecialObj} +% % % 11 novembre \def\DemiSphereThreeD{\pst@object{DemiSphereThreeD}} @@ -1463,6 +1635,8 @@ \end@ClosedObj% }\ignorespaces}% % fin de la commande PSTricks % +\catcode`\@=\PstAtCode\relax +% %% END: pst-vue3D.tex \endinput diff --git a/Master/texmf-dist/tex/latex/pst-vue3d/pst-vue3d.sty b/Master/texmf-dist/tex/latex/pst-vue3d/pst-vue3d.sty index 30875625bb8..3895513e2af 100644 --- a/Master/texmf-dist/tex/latex/pst-vue3d/pst-vue3d.sty +++ b/Master/texmf-dist/tex/latex/pst-vue3d/pst-vue3d.sty @@ -1,7 +1,8 @@ \RequirePackage{pstricks} -\ProvidesPackage{pst-vue3d}[2000/07/15 package wrapper for - pst-vue3d.tex (ML)] +\ProvidesPackage{pst-vue3d}[2007/03/26 package wrapper for + pst-vue3d.tex (hv)] \input{pst-vue3d.tex} +\IfFileExists{pst-vue3d.pro}{\@addtofilelist{pst-vue3d.pro}}{}% \ProvidesFile{pst-vue3d.tex} - [\filedate\space v\fileversion\space `PST-VUE3D' (ML)] + [\filedate\space v\fileversion\space `pst-vue3d' (ML,hv)] \endinput diff --git a/Master/texmf-dist/tpm/pst-vue3d.tpm b/Master/texmf-dist/tpm/pst-vue3d.tpm index 319a189bb45..d86372a7656 100644 --- a/Master/texmf-dist/tpm/pst-vue3d.tpm +++ b/Master/texmf-dist/tpm/pst-vue3d.tpm @@ -3,7 +3,7 @@ <rdf:Description about="http://texlive.dante.de/texlive/Package/pst-vue3d.zip"> <TPM:Name>pst-vue3d</TPM:Name> <TPM:Type>Package</TPM:Type> - <TPM:Date>2006/01/09 00:44:09</TPM:Date> + <TPM:Date>2007/03/26 14:26:10</TPM:Date> <TPM:Version>1.0e</TPM:Version> <TPM:Creator>rahtz</TPM:Creator> <TPM:Title> @@ -18,35 +18,20 @@ others can be viewed from different points. <TPM:Size>934693</TPM:Size> <TPM:License></TPM:License> <TPM:Build/> - <TPM:RunFiles size="100710"> -texmf-dist/dvips/pst-vue3d/3D.pro + <TPM:RunFiles size="105661"> +texmf-dist/dvips/pst-vue3d/pst-vue3d.pro texmf-dist/tex/generic/pst-vue3d/pst-vue3d.tex texmf-dist/tex/latex/pst-vue3d/pst-vue3d.sty texmf-dist/tpm/pst-vue3d.tpm </TPM:RunFiles> - <TPM:DocFiles size="833983"> + <TPM:DocFiles size="4633129"> texmf-dist/doc/generic/pst-vue3d/Changes texmf-dist/doc/generic/pst-vue3d/README -texmf-dist/doc/generic/pst-vue3d/examples/ChaiseDemo.pdf -texmf-dist/doc/generic/pst-vue3d/examples/ChaiseDemo.tex -texmf-dist/doc/generic/pst-vue3d/examples/CoorDemo.pdf -texmf-dist/doc/generic/pst-vue3d/examples/CoorDemo.tex -texmf-dist/doc/generic/pst-vue3d/examples/FrameDemo.pdf -texmf-dist/doc/generic/pst-vue3d/examples/FrameDemo.tex -texmf-dist/doc/generic/pst-vue3d/examples/Line3d.pdf -texmf-dist/doc/generic/pst-vue3d/examples/Line3d.tex -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo.pdf -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo.tex -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo2.pdf -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo2.tex -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo3.pdf -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo3.tex -texmf-dist/doc/generic/pst-vue3d/examples/PyramidDemo.pdf -texmf-dist/doc/generic/pst-vue3d/examples/PyramidDemo.tex -texmf-dist/doc/generic/pst-vue3d/examples/SphereDemo0.pdf -texmf-dist/doc/generic/pst-vue3d/examples/SphereDemo0.tex -texmf-dist/doc/generic/pst-vue3d/vue3d-e.tex +texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.bib +texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.pdf +texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.tex </TPM:DocFiles> + <TPM:SourceFiles size="1105">texmf-dist/source/generic/pst-vue3d/Makefile</TPM:SourceFiles> <TPM:Provides>Package/pst-vue3d</TPM:Provides> </rdf:Description> </rdf:RDF> diff --git a/Master/texmf/lists/pst-vue3d b/Master/texmf/lists/pst-vue3d index 70ed9c22d01..440a0521df1 100644 --- a/Master/texmf/lists/pst-vue3d +++ b/Master/texmf/lists/pst-vue3d @@ -1,26 +1,10 @@ texmf-dist/doc/generic/pst-vue3d/Changes texmf-dist/doc/generic/pst-vue3d/README -texmf-dist/doc/generic/pst-vue3d/examples/ChaiseDemo.pdf -texmf-dist/doc/generic/pst-vue3d/examples/ChaiseDemo.tex -texmf-dist/doc/generic/pst-vue3d/examples/CoorDemo.pdf -texmf-dist/doc/generic/pst-vue3d/examples/CoorDemo.tex -texmf-dist/doc/generic/pst-vue3d/examples/FrameDemo.pdf -texmf-dist/doc/generic/pst-vue3d/examples/FrameDemo.tex -texmf-dist/doc/generic/pst-vue3d/examples/Line3d.pdf -texmf-dist/doc/generic/pst-vue3d/examples/Line3d.tex -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo.pdf -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo.tex -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo2.pdf -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo2.tex -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo3.pdf -texmf-dist/doc/generic/pst-vue3d/examples/PontDemo3.tex -texmf-dist/doc/generic/pst-vue3d/examples/PyramidDemo.pdf -texmf-dist/doc/generic/pst-vue3d/examples/PyramidDemo.tex -texmf-dist/doc/generic/pst-vue3d/examples/SphereDemo0.pdf -texmf-dist/doc/generic/pst-vue3d/examples/SphereDemo0.tex -texmf-dist/doc/generic/pst-vue3d/vue3d-e.tex - -texmf-dist/dvips/pst-vue3d/3D.pro +texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.bib +texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.pdf +texmf-dist/doc/generic/pst-vue3d/pst-vue3d-doc.tex +texmf-dist/source/generic/pst-vue3d/Makefile +texmf-dist/dvips/pst-vue3d/pst-vue3d.pro texmf-dist/tex/generic/pst-vue3d/pst-vue3d.tex texmf-dist/tex/latex/pst-vue3d/pst-vue3d.sty texmf-dist/tpm/pst-vue3d.tpm |