summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-02 23:49:51 +0000
committerKarl Berry <karl@freefriends.org>2017-01-02 23:49:51 +0000
commitaccc73bc080e1e460e175e63e1e849cae60d5740 (patch)
treef5d73793dd6df1eb163e0e811a6d76b4af2a8107 /Master/texmf-dist/tex
parentf33fc9ae623f40e3abacf423ce95a28486eb5059 (diff)
pst-shell (28dec16)
git-svn-id: svn://tug.org/texlive/trunk@42840 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pst-shell/pst-shell.tex74
1 files changed, 49 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/generic/pst-shell/pst-shell.tex b/Master/texmf-dist/tex/generic/pst-shell/pst-shell.tex
index 0c1ecd3d5bb..533a76322c6 100644
--- a/Master/texmf-dist/tex/generic/pst-shell/pst-shell.tex
+++ b/Master/texmf-dist/tex/generic/pst-shell/pst-shell.tex
@@ -8,7 +8,7 @@
%% Manuel Luque <manuel.luque27@gmail.com> (France)
%% Herbert Voss <hvoss@tug.org> (Germany)
%%
-%% December 22, 2016
+%% December 27, 2016
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -24,8 +24,8 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
\ifx\PSTGradLoaded\endinput \else\input pst-solides3d.tex\fi
%\ifx\PSTXKeyLoaded\endinput \else\input pst-xkey.tex \fi
-\def\fileversion{0.02}
-\def\filedate{2016/12/23}
+\def\fileversion{0.03}
+\def\filedate{2016/12/27}
\message{`PST' v\fileversion, \filedate}
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -47,8 +47,10 @@
\define@key[psset]{pst-shell}{W1}[1]{\def\pst@shell@Wi{#1 }} %
\define@key[psset]{pst-shell}{W2}[1]{\def\pst@shell@Wii{#1 }}
\define@key[psset]{pst-shell}{N}[0]{\def\pst@shell@N{#1 }}
+\define@boolkey[psset]{pst-shell}[Pst@]{writedata}[true]{}
%%%
-\psset[pst-shell]{D=1,A=25,alpha=83,beta=42,mu=10,Omega=30,phi=70,a=12,b=20,L=1,P=1,W1=1,W2=1,N=0}
+\psset[pst-shell]{D=1,A=25,alpha=83,beta=42,mu=10,Omega=30,phi=70,a=12,b=20,L=1,P=1,W1=1,W2=1,N=0,
+ writedata=false}
%
\pstheader{pst-shell.pro}
%
@@ -69,41 +71,63 @@
/shell@N \pst@shell@N def
}
%
-\newpsstyle[pst-shell]{Argonauta}{alpha=80,beta=90,phi=0,mu=0,Omega=0,A=2,a=2,b=1.5,
- L=0.3,W1=150,W2=20,P=5,N=30}%
-\newpsstyle[pst-shell]{Epiteonium}{D=1,A=9.5,alpha=85.9,beta=9,mu=0,Omega=0,
- phi=81,a=2.1,b=1.6,L=1.3,P=-60,W1=200,W2=20,N=8.3}
-\newpsstyle[pst-shell]{Lyria}{D=1,A=50,alpha=83.9,beta=-19,mu=1,Omega=-2,
- phi=45,a=40,b=14,L=4,P=0,W1=6,W2=27,N=8}
-\newpsstyle[pst-shell]{Turritella}{D=1,A=22.2,alpha=88.9,beta=4,mu=0,Omega=0,
- phi=55,a=1.3,b=1.5,L=0,P=0,W1=1,W2=1,N=0}
-\newpsstyle[pst-shell]{Tonna}{D=1,A=70,alpha=82.4,beta=0,mu=10,Omega=0,phi=0,
- a=58,b=50,L=0,P=0,W1=1,W2=1,N=0}
-\newpsstyle[pst-shell]{Achatina}{D=1,A=109,alpha=86.6,beta=8.5,mu=0,Omega=0,
- phi=0,a=32,b=48,L=0,P=0,W1=1,W2=1,N=0}
-\newpsstyle[pst-shell]{Oxystele}{D=1,A=47,alpha=84.9,beta=7,mu=0,Omega=0,phi=-36,
- a=40,b=19,L=0,P=0,W1=1,W2=1,N=0}
-\newpsstyle[pst-shell]{Conus}{D=1,A=7,alpha=87,beta=7,mu=0,Omega=0,phi=78,
- a=4.3,b=1,L=0,P=0,W1=1,W2=1,N=0}
-\newpsstyle[pst-shell]{Nautilus}{D=-1,A=2,alpha=80,beta=90,mu=0,Omega=0,phi=0,
- a=2,b=1.5,L=0,P=0,W1=0,W2=0,N=0}
+\newpsstyle[pst-shell]{Achatina}%
+ {D=1,A=109,alpha=86.6,beta=8.5,mu=0,Omega=0,phi=0,a=32,b=48,L=0,P=0,W1=1,W2=1,N=0}
+\newpsstyle[pst-shell]{Ammonite}%
+ {alpha=83,beta=90,phi=1,mu=1,Omega=1,A=2.5,a=1,b=0.9,L=0.5,W1=100,W2=20,P=10,N=15}
+\newpsstyle[pst-shell]{Argonauta}%
+ {alpha=80,beta=90,phi=0,mu=0,Omega=0,A=2,a=2,b=1.5,L=0.3,W1=150,W2=20,P=5,N=30}%
+\newpsstyle[pst-shell]{Codakia}%
+ {alpha=37,beta=90,phi=0,mu=1,Omega=1,A=10500,a=10000,b=10500,L=0,W1=0,W2=0,P=0,N=0}
+\newpsstyle[pst-shell]{Conus}%
+ {D=1,A=7,alpha=87,beta=7,mu=0,Omega=0,phi=78,a=4.3,b=1,L=0,P=0,W1=0,W2=0,N=0}
+\newpsstyle[pst-shell]{Epiteonium}%
+ {D=1,A=9.5,alpha=85.9,beta=9,mu=0,Omega=0,phi=81,a=2.1,b=1.6,L=1.3,P=-60,W1=200,W2=20,N=8.3}
+\newpsstyle[pst-shell]{Escalaria}%
+ {alpha=86,beta=10,phi=45,mu=5,Omega=1,A=90,a=20,b=20,L=14,W1=180,W2=0.4,P=40,N=180}
+\newpsstyle[pst-shell]{Helcion}%
+ {alpha=18,beta=90,phi=0,mu=0,Omega=-40,A=450,a=400,b=310,L=0,W1=0,W2=0,P=0,N=0}
+\newpsstyle[pst-shell]{Lyria}%
+ {D=1,A=50,alpha=83.9,beta=-19,mu=1,Omega=-2,phi=45,a=40,b=14,L=4,P=0,W1=6,W2=27,N=8}
+\newpsstyle[pst-shell]{Natalina}%
+ {alpha=80,beta=40,phi=55,mu=10,Omega=30,A=25,a=12,b=16,L=0,W1=0,W2=0,P=0,N=0}
+\newpsstyle[pst-shell]{Nautilus}%
+ {D=-1,A=2,alpha=80,beta=90,mu=0,Omega=0,phi=0,a=2,b=1.5,L=0,P=0,W1=0,W2=0,N=0}
+\newpsstyle[pst-shell]{Oxystele}%
+ {D=1,A=47,alpha=84.9,beta=7,mu=0,Omega=0,phi=-36,a=40,b=19,L=0,P=0,W1=1,W2=1,N=0}
+\newpsstyle[pst-shell]{Planorbis}%
+ {alpha=84,beta=85,phi=10,mu=45,Omega=5,A=45,a=20,b=30,L=0,W1=0,W2=0,P=0,N=0}
+\newpsstyle[pst-shell]{Tonna}%
+ {D=1,A=70,alpha=82.4,beta=0,mu=10,Omega=0,phi=0,a=58,b=50,L=0,P=0,W1=1,W2=1,N=0}
+\newpsstyle[pst-shell]{Turritella}%
+ {D=1,A=22.2,alpha=88.9,beta=4,mu=1,Omega=-2,phi=55,a=1.3,b=1.5,L=0,P=0,W1=0,W2=0,N=0}
%
+%[alpha=86, beta=10, phi=-45, mu=5, Omega=1, A=90, a=20, b=20, L=14, P=40, W1=180, W2=.4, N=180]
+%Escalária Preciosa (forma de saca-rolhas, [2, p. 53])
+%
+% Mollusc ¦ ,° ¦ ,°¦ ,°¦ µ, ¦ ,°¦smin ¦smax ¦ A ¦ a ¦ b ¦ P ¦ W1 ¦ W2 ¦ N ¦ L
+%+---------+------+----+----+----+----+-----+-----+-----+----+------+----+----+----+----+---+
+%Codakia ¦ 37 ¦ 90 ¦ 0 ¦ 1 ¦ 1 ¦-180 ¦ 180 ¦10500¦10000¦10500¦ 0 ¦ 0 ¦ 0 ¦ 0 ¦ 0
\def\psShell{\pst@object{psShell}}
\def\psShell@i{\@ifnextchar(\psShell@ii{\psShell@ii(0,0,0)}}
\def\psShell@ii(#1){%
\begin@SpecialObj
- \if$\pst@solides@file$
+ \if$\pst@solides@file$ % no data file
\addto@pscode{ tx@ShellDict begin \pst@shell@variables }%
\defFunction{pst@coquillage}(uu,vu){xShell}{yShell}{zShell}
\psSolid[object=surfaceparametree,function=pst@coquillage](#1)
\showpointsfalse
\addto@pscode{ end }% of tx@ShellDict %
\else
- \psSolid[object=datfile](#1)
+ \ifPst@writedata
+ \psSolid[action=writesolid](#1)%
+ \else
+ \psSolid[object=datfile](#1)%
+ \fi
\fi
\end@SpecialObj
\ignorespaces}%
%
\catcode`\@=\TheAtCode\relax
%
-\endinput \ No newline at end of file
+\endinput