summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pst-solides3d
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-12 17:36:45 +0000
committerKarl Berry <karl@freefriends.org>2010-04-12 17:36:45 +0000
commitd68dc2a80b6149839a67b6498294f1b774687157 (patch)
treeb846801b3f2b0a1c6590dda241807d9f38f0e3b8 /Master/texmf-dist/tex/generic/pst-solides3d
parenteb5da0fa2dab043786ca8eca9ed5df4453633c4f (diff)
pst-solides3d 4.18 (11apr10)
git-svn-id: svn://tug.org/texlive/trunk@17821 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-solides3d')
-rw-r--r--Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex90
1 files changed, 38 insertions, 52 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 0ca0e9f3c05..2ee7116c91e 100644
--- a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
+++ b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
@@ -1,4 +1,4 @@
-%%
+%%
%% COPYRIGHT 2008,2009 by Manuel Luque, Arnaud Schmittbuhl,
%% Jean-Paul Vignault, Herbert Voss.
%%
@@ -30,11 +30,11 @@
% Requires PSTricks, pst-xkey and pst-node packages
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
\ifx\PSTnodesLoaded\endinput\else\input pst-node \fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
-\ifx\MultidoLoaded\endinput\else\input multido.tex \fi
+\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
+\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
% JPV & ML & AS & HV
-\def\fileversion{4.16}
-\def\filedate{2009/08/11}
+\def\fileversion{4.18}
+\def\filedate{2010/04/07}
\message{`PSTSOLIDESIIID' v\fileversion, \filedate}
%
\pstheader{solides.pro}
@@ -109,14 +109,14 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp
\define@key[psset]{pst-solides3d}{tablez}{\def\pst@solides@tablez{#1}} %
\psset[pst-solides3d]{tablez=}%
-\def\Section{%
+\def\Sol@Section{%
R h 2 div neg % sommet 1
R h 2 div % sommet 2
r h 2 div % sommet 3
r h 2 div neg % sommet 4
}
\define@key[psset]{pst-solides3d}{section}{\def\pst@solides@section{#1}} % section de l'objet de revolution
-\psset[pst-solides3d]{section=\Section}% coordonnees des sommets de la section
+\psset[pst-solides3d]{section=\Sol@Section}% coordonnees des sommets de la section
%% decalage pourle prisme
\define@key[psset]{pst-solides3d}{decal}{\def\pst@solides@decal{#1}}
@@ -620,8 +620,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\ifx\relax#2\relax\psSolid@iv{#1}\else\psSolid@iv{#1 #2 #3}\fi}
\def\psSolid@iv#1{%
\pst@killglue%
- \begingroup
- \ifPst@solidmemory\use@par\else\begin@ClosedObj\fi%
+ \ifPst@solidmemory\begingroup\use@par\else\begin@ClosedObj\fi%
\addto@pscode{
1 setlinejoin
\tx@optionssolides
@@ -634,8 +633,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\psk@solides@object\space
end
}% fin du code ps
- \ifPst@solidmemory\else\end@ClosedObj\fi%
- \endgroup%
+ \ifPst@solidmemory\endgroup\else\end@ClosedObj\fi%
\ignorespaces}
@@ -713,6 +711,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% axisemph
%% thanks to Herbert Voss
+
\define@boolkey[psset]{pst-solides3d}[Pst@]{showOrigin}[true]{}
\define@boolkey[psset]{pst-solides3d}[Pst@]{mathLabel}[true]{}
\psset[pst-solides3d]{showOrigin,mathLabel}%
@@ -768,74 +767,61 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\endgroup%
\ignorespaces%
}
-
-
-% pour assurer la compatibilite avec PSTricks-add
-\define@boolkey[psset]{pst-solides3d}[Pst@]{algebraic}[true]{}
-\psset[pst-solides3d]{algebraic=false}%
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% la macro \psSurface
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\psSurface{\pst@object{psSurface}}
-\def\psSurface@i(#1,#2)(#3,#4)#5{{%
+\def\psSurface@i(#1,#2)(#3,#4)#5{%
%% \def\hue{0 1 #3 #1 sub \pst@solides@dx\space div
%% #4 #2 sub \pst@solides@dy\space div mul
%% {/iF ED iF [1 iF #3 #1 sub \pst@solides@dx\space div
%% #4 #2 sub \pst@solides@dy\space div
%% mul div sub 0.75 1] (sethsbcolor) astr2str} for}
-\ifPst@solidmemory\use@par\else\begin@ClosedObj\fi
- \addto@pscode{%
+ \ifPst@solidmemory\begingroup\use@par\else\begin@ClosedObj\fi
+ \addto@pscode{
1 setlinejoin
\tx@optionssolides
SolidesDict begin
-/CX 0 def /CY 0 def /CZ 0 def
-/base [ #1 #3 #2 #4 ] def
- \ifPst@algebraic
-/fonction
- (#5) tx@AlgToPs begin AlgToPs end cvx def
- \else
-/fonction { #5 } def
- \fi
-/f {2 dict begin
- /y exch def
- /x exch def
- fonction
-end } def
- pst-Surface
- end
-}% fin du code ps
- \ifPst@axesboxed
- \gridIIID(#1,#3)(#2,#4)
- \fi
-\ifPst@solidmemory
- \else
-\end@ClosedObj%
-\fi
-}}
-
+ /CX 0 def /CY 0 def /CZ 0 def
+ /base [ #1 #3 #2 #4 ] def
+ \ifPst@algebraic
+ /fonction (#5) tx@AlgToPs begin AlgToPs end cvx def
+ \else
+ /fonction { #5 } def
+ \fi
+ /f {2 dict begin
+ /y exch def
+ /x exch def
+ fonction end
+ } def
+ pst-Surface
+ end
+ }% fin du code ps
+ \ifPst@axesboxed\gridIIID(#1,#3)(#2,#4)\fi
+ \ifPst@solidmemory\endgroup\else\end@ClosedObj\fi%
+ \ignorespaces}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% la macro \defFunction
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\defFunction{\@ifnextchar[{\defFunction@i}{\defFunction@i[]}}%
-\def\defFunction@i[#1]#2(#3)#4#5#6{%
+\def\defFunction{\pst@object{defFunction}}%
+\def\defFunction@i#1(#2)#3#4#5{%
\pst@killglue
\global\Pst@solidmemorytrue
\begingroup
- \psset{#1}%
- \defFunction@ii{#3}\edef\@tempa{\the\toks@}%
+ \use@par%
+ \defFunction@ii{#2}\edef\@tempa{\the\toks@}%
\ifPst@algebraic
\toks@={}%
+ \def\@tempb{#3}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi
\def\@tempb{#4}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi
\def\@tempb{#5}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi
- \def\@tempb{#6}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi
\codejps{%
- /#2 { 3 dict begin \@tempa \the\toks@
+ /#1 { 3 dict begin \@tempa \the\toks@
gere_pst-deffunction end } def }% 20080625
\else
\codejps{%
- /#2 { 3 dict begin \the\toks@ #4 #5 #6
+ /#1 { 3 dict begin \the\toks@ #3 #4 #5
gere_pst-deffunction end } def }% 20080625
\fi
\endgroup}%