summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-11-02 19:53:50 +0000
committerKarl Berry <karl@freefriends.org>2023-11-02 19:53:50 +0000
commitab64d493666bf6d39c85917075d7ef5e25748a83 (patch)
treea3963460e08264eaad092fdd0b07e56855463027 /Master/texmf-dist/tex
parent319d913eb9bbc2c2438aa257f7c458f3e45e1355 (diff)
pst-solides3d (2nov23)
git-svn-id: svn://tug.org/texlive/trunk@68728 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex102
-rw-r--r--Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty2
2 files changed, 53 insertions, 51 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 9620eefed11..d9adf6525e9 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.34a}
-\def\filedate{2018/12/27}
+\def\fileversion{4.35}
+\def\filedate{2023/11/02}
\message{`PSTSOLIDESIIID' v\fileversion, \filedate}
%
\pstheader{pst-solides3d.pro}
@@ -194,8 +194,8 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp
\define@key[psset]{pst-solides3d}{solidname}{\def\pst@solides@solidname{#1}}
\psset[pst-solides3d]{solidname=}% pas de nom par defaut
%% nom du fichier externe
-\define@key[psset]{pst-solides3d}{file}{\def\pst@solides@file{#1}}
-\psset[pst-solides3d]{file=}% pas de fichier par defaut
+\define@key[psset]{pst-solides3d}{filename}{\def\pst@solides@filename{#1}}
+\psset[pst-solides3d]{filename=}% pas de fichier par defaut
%% nom de l'objet de type plan
\define@key[psset]{pst-solides3d}{planname}{\def\pst@solides@planname{#1}}
\psset[pst-solides3d]{planname=}% pas de nom par defaut
@@ -279,7 +279,7 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp
% nature de l'objet
\def\pst@solides@list@object{%
-tore,cube,tetrahedron,octahedron,icosahedron,dodecahedron,sphere,%
+tore,cube,tetrahedron,octahedron,icosahedron,dodecahedron,sphere,ellipsoid,%
cylindre,cylindrecreux,cone,conecreux,tronccone,troncconecreux,%
grille,prisme,anneau,parallelepiped,prismecreux,ruban,calottesphere,face,%
Surface,Surface*,surface,calottespherecreuse,polygoneregulier,fusion,new,chemin,courbeR2,courbe,%
@@ -336,15 +336,16 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
\def\gridIIID@i(#1,#2)(#3,#4){%
\@ifnextchar[{\gridIIID@ii(#1,#2)(#3,#4)}{\gridIIID@ii(#1,#2)(#3,#4)[2,2,3]}}
\def\gridIIID@ii(#1,#2)(#3,#4)[#5,#6,#7]{%
- \pst@killglue%
+ \pst@killglue
\addbefore@par{planmarks}%
- \begingroup%
- \use@par%
- \psSolid[object=parallelepiped,
+ \begingroup
+ \psset[pst-solides3d]{object=parallelepiped,
intersectiontype=-1,
a={#2 #1 sub},b={#4 #3 sub},
c={\pst@solides@@Zmax\space \pst@solides@@Zmin\space sub},
- action=draw](#1 #2 add 2 div,#3 #4 add 2 div,\pst@solides@@Zmax \pst@solides@@Zmin add 2 div )%
+ action=draw}
+ \use@par
+ \psSolid(#1 #2 add 2 div,#3 #4 add 2 div,\pst@solides@@Zmax \pst@solides@@Zmin add 2 div )%
\ifPst@planmarks
\ifnum#1<0 \pst@cnta=-#1 \def\pst@minus{-}\else\pst@cnta=#1 \def\pst@minus{}\fi
\divide\pst@cnta by \psk@solides@stepX
@@ -511,7 +512,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
\ifx\pst@solides@plansepare\@empty\else/plansepare {\pst@solides@plansepare} def\fi
\ifx\pst@solides@transform\@empty \else/pst-transformoption { \pst@solides@transform} def\fi
\ifx\pst@solides@name\@empty \else/solidname (\pst@solides@name) def\fi
-\ifx\pst@solides@file\@empty \else/solidfilename (\pst@solides@file) def\fi
+\ifx\pst@solides@filename\@empty \else/solidfilename (\pst@solides@filename) def\fi
\ifx\pst@solides@planname\@empty \else/solidplanname (\pst@solides@planname) def\fi
\ifx\pst@solides@load\@empty \else/solidloadname {\pst@solides@load} def\fi
\ifx\pst@solides@fcolor\@empty \else/solidfcolor (\pst@solides@fcolor) def\fi
@@ -636,10 +637,11 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
% \begin@SpecialObj
\pnode(!
\tx@optionssolides
- SolidesDict begin
+% SolidesDict begin
#1 #2 #3
3dto2d cm_1 exch cm_1 exch
- end){#4}%
+% end
+){#4}%
% \end@SpecialObj
}\ignorespaces%
}
@@ -740,7 +742,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\addto@pscode{
1 setlinejoin
\tx@optionssolides
- SolidesDict begin
+% SolidesDict begin
/CX 0 def /CY 0 def /CZ 0 def
/base [ #2 #4 #3 #5 ] def
\ifPst@algebraic
@@ -754,7 +756,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
fonction end
} def
\if@star pst-Surface* \else pst-Surface \fi
- end
+% end
}% fin du code ps
\@starfalse
\ifPst@axesboxed\gridIIID(#2,#4)(#3,#5)\fi
@@ -848,29 +850,29 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
%% transcription et inclusion des variables dans le fichier postscript
\pst@def{psProjection}<%
-/projectionsifacevisible \ifPst@visibility true \else false \fi def
-/isolatin \ifPst@isolatin true \else false \fi def
-/solidlinewidth {\pst@number\pslinewidth} def
-/PSfont {\pst@solides@PSfont} def
-/normale {\pst@solides@normal} bind def
-/fontsize {\pst@solides@fontsize\space \pst@number\psunit mul 28.45 div } def
-/origin {\pst@solides@origin} def
-/RotationAngleText {\pst@solides@RotationAngleText} def
-/range [ \pst@solides@range ] def
-/path { \pst@solides@path } def
-/function { \pst@solides@function } def
-/texte (\pst@solides@text) def
-/pos (\pst@solides@pos) def
-/proj-definition (\pst@solides@definition) def
-/proj-args { \pst@solides@args} def
-/proj-action (\pst@solides@action) def
-\ifx\pst@solides@name\@empty \else/solidname (\pst@solides@name) def\fi
-\ifx\pst@solides@name\@empty \else/projname (\pst@solides@name) def \fi
-\ifx\pst@solides@plan\@empty \else/planprojpst \pst@solides@plan \space def \fi
-\ifx\pst@solides@solidname\@empty\else/solidprojname {\pst@solides@solidname\space} def \fi
-/noface \pst@solides@no\space def % no de la face du solide
-%/resolution \pst@solides@resolution\space def % pour le nb de points par courbe
-\pst@solides@resolution setresolution % ------ hv 20110713
+ /projectionsifacevisible \ifPst@visibility true \else false \fi def
+ /isolatin \ifPst@isolatin true \else false \fi def
+ /solidlinewidth {\pst@number\pslinewidth} def
+ /PSfont {\pst@solides@PSfont} def
+ /normale {\pst@solides@normal} bind def
+ /fontsize {\pst@solides@fontsize\space \pst@number\psunit mul 28.45 div } def
+ /origin {\pst@solides@origin} def
+ /RotationAngleText {\pst@solides@RotationAngleText} def
+ /range [ \pst@solides@range ] def
+ /path { \pst@solides@path } def
+ /function { \pst@solides@function } def
+ /texte (\pst@solides@text) def
+ /pos (\pst@solides@pos) def
+ /proj-definition (\pst@solides@definition) def
+ /proj-args { \pst@solides@args} def
+ /proj-action (\pst@solides@action) def
+ \ifx\pst@solides@name\@empty \else/solidname (\pst@solides@name) def\fi
+ \ifx\pst@solides@name\@empty \else/projname (\pst@solides@name) def \fi
+ \ifx\pst@solides@plan\@empty \else/planprojpst \pst@solides@plan \space def \fi
+ \ifx\pst@solides@solidname\@empty\else/solidprojname {\pst@solides@solidname\space} def \fi
+ /noface \pst@solides@no\space def % no de la face du solide
+ %/resolution \pst@solides@resolution\space def % pour le nb de points par courbe
+ \pst@solides@resolution setresolution % ------ hv 20110713
>
%\makeatletter
@@ -885,7 +887,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\addto@pscode{%
\tx@optionssolides
\pst@prepscode
- SolidesDict begin
+% SolidesDict begin
\tx@psProjection
/CX 0 def
/CY 0 def
@@ -898,7 +900,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\fi
% nature du solide : texte, chemin, courbe
gsave proj-\psk@solides@object\space
- end
+% end
}%<- fin du code ps
\psk@fillstyle
\pst@stroke
@@ -929,7 +931,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\def\lineIIID@ii{%
\addto@pscode{%
\tx@optionssolides
- SolidesDict begin
+% SolidesDict begin
counttomark
/n exch def /n3 n 3 div cvi def
n3 {
@@ -938,7 +940,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
xunit mul exch xunit mul exch
/n n 1 sub def
} repeat
- end
+% end
\pst@cp\space \psline@iii\space \tx@Line
}%
\end@OpenObj%
@@ -957,7 +959,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\def\polygonIIID@ii{%
\addto@pscode{%
\tx@optionssolides
- SolidesDict begin
+% SolidesDict begin
counttomark
/n exch def /n3 n 3 div cvi def
n3 {
@@ -966,7 +968,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
xunit mul exch xunit mul exch
/n n 1 sub def
} repeat
- end
+% end
\pst@cp\space \psline@iii\space \tx@Polygon
}%
\end@ClosedObj%
@@ -1061,11 +1063,11 @@ end
/Atan { /atan load stopped { pop pop 0 } if } def
save
\tx@optionssolides
- SolidesDict begin
+% SolidesDict begin
/cm {\pst@number\psunit mul } bind def
/cm_1 {\pst@number\psunit div } bind def
/unit_image \psk@solides@unitPicture def
-/fichier (\pst@solides@file) def
+/fichier (\pst@solides@filename) def
/Normale {\pst@solides@normal\space unitaire3d } bind def
/ND \psk@solides@divisions def
/NDC {\psk@solides@divisions 3 mul} bind def
@@ -1106,7 +1108,7 @@ fichier run
end
grestore
} if
-end
+%end
restore
}%
\ifPst@solidmemory\else\end@ClosedObj\fi}\ignorespaces%
@@ -1128,7 +1130,7 @@ restore
\else
/ImplFunction { \pst@solides@ImplFunction } def
\fi
- SolidesDict begin
+% SolidesDict begin
MarchingCubes
/plagesXYZ [% min max dx
[\pst@solides@XMinMax][\pst@solides@YMinMax][\pst@solides@ZMinMax]
@@ -1147,7 +1149,7 @@ restore
Sommets iP get aload pop
} for
} def
- end
+% end
}%
\psSolid[object=new,faces={Faces aload pop},sommets=lesPoints](#1)%
\end@SpecialObj
@@ -1179,7 +1181,7 @@ dualreg=false,
faces={},% valeurs par defaut
fcolor=,% pas de couleur par defaut
fcol=,% pas de faces par defaut
-file=,% pas de fichier par defaut
+filename=,% pas de fichier par defaut
function=,% pas de valeur par defaut
geode=false,
grid=true,
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 8c04f965978..0827f9fe95a 100644
--- a/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
+++ b/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
@@ -4,7 +4,7 @@
\ProvidesFile{pst-solides3d.tex}
[\filedate\space v\fileversion\space `PST-solides3D']
\IfFileExists{pst-solides3d.pro}{%
- \ProvidesFile{pst-solides3d.pro}[2018/12/27 v. 4.27, PostScript prologue file]
+ \ProvidesFile{pst-solides3d.pro}[2023/11/02 v. 4.28, PostScript prologue file]
\@addtofilelist{pst-solides3d.pro}}{}%
\IfFileExists{pst-implicitsurface.pro}{%
\ProvidesFile{pst-implicitsurface.pro}[2016/12/10 v. 0.01, PostScript prologue file]