summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-30 22:52:51 +0000
committerKarl Berry <karl@freefriends.org>2010-09-30 22:52:51 +0000
commit5e73061354b9063464c594ac370a3f48076f4442 (patch)
tree91666f59a182155e27ba7e0145f7bb178da6ef14 /Master/texmf-dist/tex/generic
parentba58543d6158e8189d68dd5457e736d8f386bbc7 (diff)
pst-solides3d (29sep10)
git-svn-id: svn://tug.org/texlive/trunk@19959 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex62
1 files changed, 34 insertions, 28 deletions
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 044a6de99b0..617dc7c0af1 100644
--- a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
+++ b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
@@ -33,8 +33,8 @@
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
% JPV & ML & AS & HV
-\def\fileversion{4.20}
-\def\filedate{2010/07/23}
+\def\fileversion{4.23}
+\def\filedate{2010/09/22}
\message{`PSTSOLIDESIIID' v\fileversion, \filedate}
%
\pstheader{pst-solides3d.pro}
@@ -177,6 +177,8 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp
\psset{biface=true}%
\define@boolkey[psset]{pst-solides3d}[Pst@]{axesboxed}[true]{}
\psset{axesboxed=false}%
+\define@boolkey[psset]{pst-solides3d}[Pst@]{showAxes}[true]{}
+\psset{showAxes=true}%
\define@boolkey[psset]{pst-solides3d}[Pst@]{planmarks}[true]{}
\psset{planmarks=false}%
\define@boolkey[psset]{pst-solides3d}[Pst@]{plangrid}[true]{}
@@ -245,6 +247,7 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp
%% maillage de l'utilisateur
\define@key[psset]{pst-solides3d}{ngrid}{\def\pst@solides@ngrid{#1}}
\psset[pst-solides3d]{ngrid=}% pas de faces par defaut
+%\psset[pst-solides3d]{ngrid=20 20}% pas de faces par defaut
% source de la lumiere :
\define@key[psset]{pst-solides3d}{lightsrc}{\def\pst@solides@CoordinatesLight{#1}}
@@ -352,7 +355,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
\psPoint(\pst@minus\ix,#4,\pst@solides@@Zmin){X1}%
\psPoint(\pst@minus\ix,#4 \psk@solides@ticklength\space add,\pst@solides@@Zmin){X2}%
\psline(X1)(X2)%
- \uput[\pst@solides@@spotX](X1){\small\pst@minus\ix}}%
+ \uput[\pst@solides@@spotX](X1){\pst@solides@axesIIID@emph\pst@minus\ix}}%
\ifnum#2<0 \pst@cnta=-#2 \def\pst@minus{-}\else\pst@cnta=#2 \def\pst@minus{}\fi
\divide\pst@cnta by \psk@solides@stepX%
\advance\pst@cnta by \@ne
@@ -360,7 +363,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
\psPoint(\pst@minus\ix,#4,\pst@solides@@Zmin){X1}
\psPoint(\pst@minus\ix,#4 \psk@solides@ticklength\space add,\pst@solides@@Zmin){X2}
\psline(X1)(X2)
- \uput[\pst@solides@@spotX](X1){\small\pst@minus\ix}}
+ \uput[\pst@solides@@spotX](X1){\pst@solides@axesIIID@emph\pst@minus\ix}}
%
\ifnum#3<0 \pst@cnta=-#3 \def\pst@minus{-}\else\pst@cnta=#3 \def\pst@minus{}\fi
\divide\pst@cnta by \psk@solides@stepY
@@ -368,7 +371,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
\psPoint(#2,\pst@minus\iy,\pst@solides@@Zmin){Y1}
\psPoint(#2 \psk@solides@ticklength\space add,\pst@minus\iy,\pst@solides@@Zmin){Y2}
\psline(Y1)(Y2)
- \uput[\pst@solides@@spotY](Y1){\small\pst@minus\iy}}
+ \uput[\pst@solides@@spotY](Y1){\pst@solides@axesIIID@emph\pst@minus\iy}}
\ifnum#4<0 \pst@cnta=-#4 \def\pst@minus{-}\else\pst@cnta=#4 \def\pst@minus{}\fi
\divide\pst@cnta by \psk@solides@stepY
\advance\pst@cnta by \@ne
@@ -376,7 +379,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
\psPoint(#2,\pst@minus\iy,\pst@solides@@Zmin){Y1}
\psPoint(#2 \psk@solides@ticklength\space add,\pst@minus\iy,\pst@solides@@Zmin){Y2}
\psline(Y1)(Y2)
- \uput[\pst@solides@@spotY](Y1){\small\pst@minus\iy}}
+ \uput[\pst@solides@@spotY](Y1){\pst@solides@axesIIID@emph\pst@minus\iy}}
%
\pst@cnta=\pst@solides@@Zmin \pst@cntb=\pst@solides@@Zmax
\ifnum\pst@cnta=\pst@cntb\else% same z values?
@@ -388,7 +391,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
\psPoint(#2,#3,\pst@minus\iz){Z1}
\psPoint(#2,#3 \psk@solides@ticklength\space sub,\pst@minus\iz){Z2}
\psline(Z1)(Z2)
- \uput[\pst@solides@@spotZ](Z1){\small\pst@minus\iz}}
+ \uput[\pst@solides@@spotZ](Z1){\pst@solides@axesIIID@emph\pst@minus\iz}}
\pst@cnta=\pst@solides@@Zmax %
\ifnum\pst@cnta<0 \pst@cnta=-\pst@pst@cnta \def\pst@minus{-}
\else\def\pst@minus{}\fi%
@@ -398,27 +401,29 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
\psPoint(#2,#3,\pst@minus\iz){Z1}
\psPoint(#2,#3 \psk@solides@ticklength\space sub,\pst@minus\iz){Z2}
\psline(Z1)(Z2)
- \uput[\pst@solides@@spotZ](Z1){\small\pst@minus\iz}}
+ \uput[\pst@solides@@spotZ](Z1){\pst@solides@axesIIID@emph\pst@minus\iz}}
\fi
\fi% \ifPst@planmarks
%
- \psPoint(0,0,\pst@solides@@Zmax #7 add){Z'}
- \psPoint(#2 #5 add,0,0){X'}
- \psPoint(0,#4 #6 add, 0){Y'}
- \psPoint(0,0,\pst@solides@@Zmax){Z}
- \psPoint(#2,0,0){X}
- \psPoint(0,#4,0){Y}
- \psPoint(0,0,0){O}
- \uput[\pst@solides@@spotY](X'){$x$}
- \uput[\pst@solides@@spotX](Y'){$y$}
- \uput[u](Z'){$z$}
- \ifPst@showOrigin
- \psline[linestyle=dashed](O)(X)
- \psline[linestyle=dashed](O)(Y)
- \psline[linestyle=dashed](O)(Z)
- \fi
+ \ifPst@showAxes
+ \psPoint(0,0,\pst@solides@@Zmax #7 add){Z'}
+ \psPoint(#2 #5 add,0,0){X'}
+ \psPoint(0,#4 #6 add, 0){Y'}
+ \psPoint(0,0,\pst@solides@@Zmax){Z}
+ \psPoint(#2,0,0){X}
+ \psPoint(0,#4,0){Y}
+ \psPoint(0,0,0){O}
+ \uput[\pst@solides@@spotY](X'){$x$}
+ \uput[\pst@solides@@spotX](Y'){$y$}
+ \uput[u](Z'){$z$}
+ \ifPst@showOrigin
+ \psline[linestyle=dashed](O)(X)
+ \psline[linestyle=dashed](O)(Y)
+ \psline[linestyle=dashed](O)(Z)
+ \fi
%\psset{linewidth=2\pslinewidth}
- \psline{->}(Z)(Z')\psline{->}(Y)(Y')\psline{->}(X)(X')
+ \psline{->}(Z)(Z')\psline{->}(Y)(Y')\psline{->}(X)(X')
+ \fi%
\endgroup%
\ignorespaces%
}
@@ -560,8 +565,8 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
%
\let\composeSolid\use@pscode
\let\endpspictureS@lid\endpspicture% redefine \endpspicture (hv)
-\def\endpspicture{\ifPst@solidmemory\use@pscode\fi\endpspictureS@lid}
-
+\def\endpspicture{\ifPst@solidmemory\use@pscode\fi\endpspictureS@lid\global\Pst@solidmemoryfalse}
+%
\def\psSolid{\pst@object{psSolid}}
\def\psSolid@i{\@ifnextchar({\psSolid@ii}{\psSolid@iv{ 0. 0. 0. }}}
\def\psSolid@ii(#1){\expandafter\psSolid@iii#1,,,\@nil}
@@ -571,6 +576,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\pst@killglue%
\ifPst@solidmemory\begingroup\use@par\else\begin@ClosedObj\fi%
\addto@pscode{
+ \tx@setTransparency
1 setlinejoin
\tx@optionssolides
SolidesDict begin
@@ -659,7 +665,6 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
%% les axes IIId
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% axisemph
-%% thanks to Herbert Voss
\define@boolkey[psset]{pst-solides3d}[Pst@]{showOrigin}[true]{}
\define@boolkey[psset]{pst-solides3d}[Pst@]{mathLabel}[true]{}
@@ -725,7 +730,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
%% mul div sub 0.75 1] (sethsbcolor) astr2str} for}
\pst@killglue%
\begingroup%
- \psset{planmarks,#1}%
+ \psset{axisemph=\small,planmarks,#1}%
\init@pscode%
\addto@pscode{
1 setlinejoin
@@ -1028,6 +1033,7 @@ RotZ=0,RotX=0,RotY=0,Decran=50,% valeurs par defaut
section=\Sol@Section,% coordonnees des sommets de la section
showbase=false,%
showBase=false,%
+showAxes=true,
showOrigin,
show=,% pas de pointage par defaut
solidmemory=false,