texlive[68728] Master/texmf-dist: pst-solides3d (2nov23)
commits+karl at tug.org
commits+karl at tug.org
Thu Nov 2 20:53:50 CET 2023
Revision: 68728
https://tug.org/svn/texlive?view=revision&revision=68728
Author: karl
Date: 2023-11-02 20:53:50 +0100 (Thu, 02 Nov 2023)
Log Message:
-----------
pst-solides3d (2nov23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf
trunk/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex
trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/chapter-2-en.tex
trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-couleurs-en.tex
trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-datfile-en.tex
trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-eclairageponctuel-en.tex
trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-geode-en.tex
trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-image2d-en.tex
trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-ligne3D-en.tex
trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-section-en.tex
trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfaces-en.tex
trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-tube-en.tex
trunk/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro
trunk/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
trunk/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -1,3 +1,6 @@
+%\RequirePackage{pdfmanagement-testphase}
+%\DeclareDocumentMetadata{}
+
\listfiles % Writes out the package versions in the log file
\documentclass[%
11pt, % normal font size (default, alias for fontsize=11pt)
@@ -14,16 +17,18 @@
1.1headlines, % set head height to 1.1\baselineskip of \normalsize
% (deprecated, use: headlines=1.1)
french,english,
+ usegeometry,
]{scrbook}
%\graphicspath{{images/}}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage[scale=0.95]{tgpagella}
-\usepackage[scale=0.92]{tgheros}
-\usepackage[scaled=0.83]{beramono}
+%\usepackage[T1]{fontenc}
+%\usepackage[scale=0.95]{tgpagella}
+%\usepackage[scale=0.92]{tgheros}
+%\usepackage[scaled=0.83]{beramono}
\usepackage{amsmath,amssymb} % allows multiple maths-environments
+\usepackage{libertinus}
+\usepackage[scaled=0.9]{beramono}
\usepackage[a4paper,hmargin=2cm,vmargin=3cm]{geometry} % Flexible and complete interface to document dimensions
\usepackage{scrlayer-scrpage}
\pagestyle{scrheadings}
@@ -31,7 +36,7 @@
\usepackage{babel}
\usepackage{makeidx}
\makeindex
-\usepackage{lscape}
+%\usepackage{lscape}
\usepackage{biblatex}
\addbibresource{pst-solides3d-doc.bib}
@@ -49,7 +54,6 @@
\usepackage{url} % Verbatim with URL-sensitive line breaks
\usepackage{framed} % Framed or shaded regions that can break across pages
\usepackage{ragged2e}
-\usepackage{titlesec} % Select alternative section titles
\usepackage{paralist}
@@ -138,19 +142,6 @@
\MakeFramed {\advance\hsize-\width \FrameRestore}}%
{\endMakeFramed}
-%%%%%%%
-%%%%%%% Setting the Chapter layout
-\titleformat{\chapter}[display] % {command}[shape]
- {\usekomafont{chapter}\Large \color{OrangeReddy}} % format
- { % label
- \LARGE\MakeUppercase{\chaptertitlename} \Huge \thechapter \filright%
- }%}
- {1pt} % sep (from chapternumber)
- {\titlerule \vspace{0.9pc} \filright \color{OrangeReddy}} % {before}[after] (before chaptertitle and after)
- [\color{OrangeReddy} \vspace{0.9pc} \filright {\titlerule}]
-
-
-%%%%%%%
%%%%%%% Highlight some expressions
\newcommand\Cadre[1]{\psframebox[fillstyle=solid,fillcolor=gray!20,linecolor=gray!20]{\texttt{#1}}}
@@ -278,7 +269,7 @@
pdfpagemode=UseOutlines, % Show Bookmarks in the Viewer
pdfpagelabels=true % set PDF page labels
}
-\usepackage{breakurl} % Line-breakable \url-like links in hyperref when compiling via dvips/ps2pdf
+%\usepackage{breakurl} % Line-breakable \url-like links in hyperref when compiling via dvips/ps2pdf
%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Herbert %%%%%%%%%%%%%%%%%%%%%%%%%%
\pagestyle{scrheadings}
@@ -325,6 +316,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\chapter{Setting the layout of the scenery}
\Input{chapter-2-en}
\Input{par-eclairageponctuel-en}
@@ -345,6 +337,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
\chapter{More options of \textbackslash{}psSolid}
\Input{par-commandestrace-en}
\Input{par-solidescreux-en}
@@ -365,6 +359,8 @@
\Input{par-lignedeniveau-en}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
\chapter{Usage of external files}
\Input{par-datfile-en}
@@ -396,6 +392,8 @@
\chapter{Surfaces defined by a function of the form $z=f(x,y)$}
\Input{par-surfaces-en}
+
+
\clearpage
\Input{par-implicitsurface-en}%% hc 2016-12-11
@@ -410,6 +408,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\chapter{Interaction with PSTricks}
\Input{par-positionnerpointconnu-en}
@@ -431,6 +430,9 @@
\Input{par-projectiondroite-en}
+
+
+
%\newpage
\Input{par-projectioncercle-en}
\Input{par-projectionpolygone-en}
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/chapter-2-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/chapter-2-en.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/chapter-2-en.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -137,19 +137,25 @@
args={[0 0 1 0] 180},
name=P1]%
\psset{fontsize=28.45,plan=P1}
-\psSolid[object=plan,
- args=P1,
- plangrid,action=none]
-\psProjection[object=texte,
- linecolor=red,
- text=pst-solides3d](0,3.5)
+\psSolid[object=plan,args=P1,plangrid,action=none]
+\psProjection[object=texte,linecolor=red,text=pst-solides3d](0,3.5)
+\defFunction[algebraic]{G1}(t){t}{0.25*t^2}{0}
+%\psSolid[object=calottesphere,r=3,ngrid=16 18,
+% fillcolor=cyan!50,incolor=yellow,theta=45,phi=-30,hollow,RotY=-80](-4,-4,0)
+%\psSolid[object=conecreux,h=5,r=2,fillcolor=white,mode=4,incolor=green!50](-4,-4,0)
+\psSolid[object=cone,function=G1,
+ range=0 3,ngrid=3 16,
+ incolor=green!50,
+ fillcolor=yellow!50,
+ origine=-4 -4 0]
+%\psSolid[object=cone,h=3,r=1,fillcolor=cyan,mode=4,ngrid=3 9](-4,4,0)
\psSolid[object=sphere,r=1,fillcolor=red!25,ngrid=18 36](4,4,1)
- \psSolid[object=cone,h=3,r=1,fillcolor=cyan,mode=5](-4,4,0)
\psSolid[object=cube,a=2,fillcolor=magenta!20](-4,-4,1)
\psSolid[object=cylindre,r=1,h=4,fillcolor=blue!20,ngrid=4 16](4,-4,0)
\axesIIID(0,0,0)(6,6,6)
\psPoint(0,0,0){O}
-\psdot(O)}
+\psdot(O)
+}
\begin{pspicture}(-3,-3)(3,3)
%\psframe(-5,-3)(4,4)
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-couleurs-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-couleurs-en.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-couleurs-en.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -22,7 +22,7 @@
\psframe(-1.2,-1)(1.2,1)
\psset{viewpoint=50 50 20 rtp2xyz,Decran=150,lightsrc=viewpoint}
\psSolid[object=datfile,
- file=data/cubecolor,
+ filename=data/cubecolor,
linewidth=0.07\pslinewidth,
linecolor=#1!50,
fillcolor=#1,
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-datfile-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-datfile-en.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-datfile-en.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -50,7 +50,7 @@
For example, let's look at the code below:
\begin{verbatim}
\psSolid[object=tore,
- file=montore,
+ filename=montore,
action=writesolid]
\end{verbatim}
@@ -75,7 +75,7 @@
\Lkeyword{file} to specify the name.
Now the code
\begin{verbatim}
-\psSolid[object=datfile, file=montore]
+\psSolid[object=datfile, filename=montore]
\end{verbatim}
will allow us to use the object---now saved in the \texttt{.dat} files generated---
as described in the previous paragraph.
@@ -97,7 +97,7 @@
For example, the code below:
\begin{verbatim}
\psSolid[object=tore,
- file=montore,
+ filename=montore,
action=writeobj]
\end{verbatim}
will produce a single file \texttt{montore.obj} (after compilation and
@@ -109,7 +109,7 @@
\Lkeyword{file} to specify the name of the file.
Now the following code
\begin{verbatim}
-\psSolid[object=objfile, file=montore]
+\psSolid[object=objfile, filename=montore]
\end{verbatim}
will allow to use the object---now saved in the \texttt{.obj} file generated---as
described in the previous paragraph.
@@ -120,7 +120,7 @@
\psframe*[linecolor=cyan!50](-3,-4)(1,3)
\psSolid[object=objfile,
unit=20,RotX=60,
- file=data/rocket]%
+ filename=data/rocket]%
\end{pspicture}
\end{LTXexample}
@@ -142,7 +142,7 @@
For example the code below:
\begin{verbatim}
\psSolid[object=tore,
- file=montore,
+ filename=montore,
action=writeoff]
\end{verbatim}
will produce the \texttt{montore.off} file (after compilation and
@@ -154,7 +154,7 @@
\Lkeyword{file} to specify the name of the file.
Now the following code
\begin{verbatim}
-\psSolid[object=offfile, file=montore]
+\psSolid[object=offfile, filename=montore]
\end{verbatim}
will allow to use the object---now saved in the \texttt{.off} file
generated---like described in the previous paragraph.
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-eclairageponctuel-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-eclairageponctuel-en.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-eclairageponctuel-en.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -64,7 +64,8 @@
Now it is clear, that if the view point is setup with the same coordiates as the light source, the object is illuminated uniquely.
-\encadre{In order to get some shadow regions to appear in the graphic---which emphasises the 3D character---we would suggest choosing the light source and the view point differently.}
+\encadre{In order to get some shadow regions to appear in the graphic---which
+emphasises the 3D character---we would suggest choosing the light source and the view point differently.}
\newpage
Here follow a few examples:
@@ -101,7 +102,7 @@
\begin{pspicture}(-6,-2)(6,2)
%\psframe(-6,-4)(6,4)
\psset{viewpoint=50 50 30 rtp2xyz,Decran=40,unit=0.6}
-\psSolid[object=datfile,file=data/tore1836,deactivatecolor]
+\psSolid[object=datfile,filename=data/tore1836,deactivatecolor]
%\psSolid[r1=3.5,r0=1,object=tore,ngrid=18 36,fillcolor={[rgb]{.372 .62 .628}}]%
\axesIIID(0,4.5,0)(6,6,4)
\end{pspicture}
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-geode-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-geode-en.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-geode-en.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -182,7 +182,7 @@
%% \psset{lightsrc=10 0 10,SphericalCoor=true,viewpoint=50 -20 30,Decran=100}
%% \begin{pspicture}(-2,-2)(2,2)
%% \psframe(-2,-2)(2,2)
-%% \psSolid[object=datfile,file=data/geodedual44]
+%% \psSolid[object=datfile,filename=data/geodedual44]
%% \end{pspicture}
%% \end{LTXexample}
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-image2d-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-image2d-en.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-image2d-en.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -8,7 +8,7 @@
The macro includes various options:
\begin{verbatim}
- \psImage[file=<filename with extension>,
+ \psImage[filename=<filename with extension>,
divisions=10,
normale=nx ny nz,
origine=xO yO zO,
@@ -42,15 +42,15 @@
\begin{pspicture}(-5,-5)(5,5)
\psset{solidmemory}
\psSolid[object=cube,a=8,action=draw,name=OBJECT,linecolor=red]%
-\psImage[file=tiger.eps,normal=OBJECT 0 solidnormaleface,
+\psImage[filename=tiger.eps,normal=OBJECT 0 solidnormaleface,
origine=OBJECT 0 solidcentreface,unitPicture=75]
-\psImage[file=tiger.eps,normal=OBJECT 1 solidnormaleface,
+\psImage[filename=tiger.eps,normal=OBJECT 1 solidnormaleface,
origine=OBJECT 1 solidcentreface,unitPicture=75]
-\psImage[file=tiger.eps,normal=OBJECT 4 solidnormaleface,
+\psImage[filename=tiger.eps,normal=OBJECT 4 solidnormaleface,
origine=OBJECT 4 solidcentreface,unitPicture=75]
-\psImage[file=tiger.eps,normal=OBJECT 3 solidnormaleface,
+\psImage[filename=tiger.eps,normal=OBJECT 3 solidnormaleface,
origine=OBJECT 3 solidcentreface,unitPicture=75]
-\psImage[file=tiger.eps,normal=OBJECT 2 solidnormaleface,
+\psImage[filename=tiger.eps,normal=OBJECT 2 solidnormaleface,
origine=OBJECT 2 solidcentreface,unitPicture=75]
\end{pspicture}
\end{verbatim}
@@ -63,7 +63,7 @@
\begin{pspicture}(-10,-4)(6,13)
\psframe(-10,-4)(6,13)
\psset{viewpoint=12 60 20 rtp2xyz,Decran=10,lightsrc=viewpoint}
-\psImage[file=images/tiger.eps,normal=1 0 0,origine=0 2 2](0,3)
+\psImage[filename=images/tiger.eps,normal=1 0 0,origine=0 2 2](0,3)
\psSolid[object=plan,
definition=normalpoint,
args={0.01 2 2 [1 0 0 90]},
@@ -71,7 +71,7 @@
planmarks,
showBase,
base=-2 2 -2 4]
-\psImage[file=images/tiger.eps,normal=0 1 0,origine=2 0 2]%(0,0)
+\psImage[filename=images/tiger.eps,normal=0 1 0,origine=2 0 2]%(0,0)
\psSolid[object=plan,
definition=normalpoint,
args={2 0.01 2 [0 1 0 180]},
@@ -79,7 +79,7 @@
planmarks,
showBase,
base=-2 2 -2 2]
-\psImage[file=images/tiger.eps,normal=0 0 1,origine=2 2 0](2,0)
+\psImage[filename=images/tiger.eps,normal=0 0 1,origine=2 2 0](2,0)
\psSolid[object=plan,
definition=normalpoint,
args={2 2 0.01 [0 0 1 90]},
@@ -87,7 +87,7 @@
planmarks,
showBase,
base=-2 3 -2 2]%
-\psImage[file=images/parrot.eps,normal=1 1 1,origine=5 5 5,unitPicture=75,phi=90]%(0,0)
+\psImage[filename=images/parrot.eps,normal=1 1 1,origine=5 5 5,unitPicture=75,phi=90]%(0,0)
\psSolid[object=plan,
definition=normalpoint,
args={5 5 5 [1 1 1 180]},
@@ -105,16 +105,16 @@
\psSolid[object=cube,a=8,name=OBJECT,linecolor=red,fillcolor=white%,numfaces=all,fontsize=100
]
\psset[pst-solides3d]{normal=OBJECT 0 solidnormaleface}
-\psImage[file=images/tiger.eps,origine=OBJECT 0 solidcentreface,phi=-90](0,0)
+\psImage[filename=images/tiger.eps,origine=OBJECT 0 solidcentreface,phi=-90](0,0)
%\psset[pst-solides3d]{normal=OBJECT 1 solidnormaleface}
-%\psImage[file=images/tiger.eps,
+%\psImage[filename=images/tiger.eps,
% origine=OBJECT 1 solidcentreface]
%\psset[pst-solides3d]{normal=OBJECT 4 solidnormaleface}
-%\psImage[file=images/tiger.eps,origine=OBJECT 4 solidcentreface]
+%\psImage[filename=images/tiger.eps,origine=OBJECT 4 solidcentreface]
\psset[pst-solides3d]{normal=OBJECT 3 solidnormaleface}
-\psImage[file=images/tiger.eps,origine=OBJECT 3 solidcentreface]
+\psImage[filename=images/tiger.eps,origine=OBJECT 3 solidcentreface]
\psset[pst-solides3d]{normal=OBJECT 2 solidnormaleface}
-\psImage[file=images/tiger.eps,origine=OBJECT 2 solidcentreface]
+\psImage[filename=images/tiger.eps,origine=OBJECT 2 solidcentreface]
\end{pspicture}
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-ligne3D-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-ligne3D-en.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-ligne3D-en.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -1,7 +1,7 @@
\section{Drawing a \Index{line}}
This command is adapted from the macro \verb+\pstThreeDLine+ from the package
-\texttt{pst-3dplot} of Herbert \textsc{Voss}%
+\texttt{pst-3dplot} of Herbert \textsc{Voss}.
We use \texttt{\textbackslash psLineIIID[options](x0,y0,z0)(x1,y1,z1)\ldots(xn,yn,zn)},
with the following possible options:
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-section-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-section-en.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-section-en.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -27,7 +27,8 @@
\begin{LTXexample}[width=7cm]
\begin{pspicture}(-3,-2)(3,7.5)
\psset{viewpoint=50 20 20 rtp2xyz,Decran=50}
-\psset{lightsrc=viewpoint} \psSolid[object=cylindre,
+\psset{lightsrc=viewpoint}
+\psSolid[object=cylindre,
ngrid=1 24,
r=2,
fillcolor=yellow!25,
@@ -243,7 +244,7 @@
[4 3 2]
[4 2 1]
[4 1 0]
-},file=data/Pyramid,fillcolor=yellow!50,
+},filename=data/Pyramid,fillcolor=yellow!50,
action=writesolid]
\end{verbatim}
@@ -252,7 +253,7 @@
\begin{verbatim}
\psSolid[object=datfile,
- file=data/Pyramid]
+ filename=data/Pyramid]
\end{verbatim}
\begin{center}
@@ -337,7 +338,7 @@
\begin{verbatim}
\psset{solidmemory}
\psSolid[object=datfile,
- file=data/Pyramid,
+ filename=data/Pyramid,
plansepare={[0 0 1 -2]},
name=firstSlice,
action=none]
@@ -350,10 +351,10 @@
load=secondSlice0]
\psSolid[object=load,
load=secondSlice0,
- file=data/slicePyramid,
+ filename=data/slicePyramid,
action=writesolid]
\psSolid[object=datfile,fillcolor=yellow!50,
- file=data/slicePyramid]
+ filename=data/slicePyramid]
\end{verbatim}
@@ -382,10 +383,10 @@
% [4 3 2]
% [4 2 1]
% [4 1 0]
-%},file=data/Pyramid,fillcolor=yellow!50,
+%},filename=data/Pyramid,fillcolor=yellow!50,
% action=writesolid]
\psSolid[object=datfile,
- file=data/Pyramid,
+ filename=data/Pyramid,
plansepare={[0 0 1 -2]},
name=firstSlice,
action=none]
@@ -402,10 +403,10 @@
% load=secondSlice0]
%\psSolid[object=load,
% load=secondSlice0,
-% file=data/slicePyramid,
+% filename=data/slicePyramid,
% action=writesolid]
\psSolid[object=datfile,fillcolor=yellow!50,
- file=data/slicePyramid]
+ filename=data/slicePyramid]
\psSolid[object=plan,
definition=equation,
args={[0 0 1 -2]},
@@ -421,9 +422,9 @@
base=-3 5 -3 5,
linecolor=gray]
\psSolid[object=datfile,fillcolor=yellow!50,
- file=data/slicePyramid]
+ filename=data/slicePyramid]
\psSolid[object=datfile,
- file=data/Pyramid,action=draw]
+ filename=data/Pyramid,action=draw]
\axesIIID[linecolor=blue](4,4,2)(5,5,6)
\end{pspicture}
\end{center}
@@ -666,7 +667,7 @@
fillcolor={[rgb]{0.7 1 0.7}},
name=C1,
action=none,
- file=data/cubeHexagone]
+ filename=data/cubeHexagone]
\end{verbatim}
@@ -682,7 +683,7 @@
\psSolid[object=datfile,
fcol=0 (Dandelion),
fillcolor={[rgb]{0.7 1 0.7}},
- file=data/cubeHexagone]
+ filename=data/cubeHexagone]
\axesIIID[linecolor=blue](2,2,2)(2.5,2.5,2.5)
\end{pspicture}
@@ -699,7 +700,7 @@
\psSolid[object=datfile,
fcol=0 (Dandelion),
fillcolor={[rgb]{0.7 1 0.7}},
- file=data/cubeHexagone]
+ filename=data/cubeHexagone]
\axesIIID[linecolor=blue](2,2,2)(2.5,2.5,2.5)
\end{pspicture}
@@ -714,7 +715,7 @@
\psSolid[object=datfile,
fcol=0 (Dandelion),
fillcolor={[rgb]{0.7 1 0.7}},
- file=data/cubeHexagone]
+ filename=data/cubeHexagone]
\axesIIID[linecolor=blue](0,0,0)(2.5,2.5,2.5)
\end{pspicture}
\hfil
@@ -732,7 +733,7 @@
fillcolor={[rgb]{0.7 1 0.7}},
name=C1,
action=none,
- file=data/cubeHexagone]
+ filename=data/cubeHexagone]
\codejps{C1 {-1.5 -1.5 0 translatepoint3d} solidtransform
drawsolid**
}
@@ -753,7 +754,7 @@
fillcolor={[rgb]{0.7 1 0.7}},
name=C1,
action=none,
- file=data/cubeHexagone]
+ filename=data/cubeHexagone]
\codejps{C1 {-1.5 -1.5 0 translatepoint3d} solidtransform
{0 0 45 rotateOpoint3d} solidtransform
drawsolid**
@@ -776,7 +777,7 @@
fillcolor={[rgb]{0.7 1 0.7}},
name=C1,
action=none,
- file=data/cubeHexagone]
+ filename=data/cubeHexagone]
\codejps{C1 {-1.5 -1.5 0 translatepoint3d} solidtransform
{0 0 45 rotateOpoint3d} solidtransform
{-35.2644 -90 add 0 0 rotateOpoint3d} solidtransform
@@ -872,7 +873,7 @@
%\psSolid[r1=3,r0=1.5,
% object=tore,
%% ngrid=18 60,
-% file=data/tore1860,action=writesolid]
+% filename=data/tore1860,action=writesolid]
%\end{pspicture}
\begin{center}
@@ -883,15 +884,15 @@
\psset{lightsrc=viewpoint}
\psframe[fillstyle=solid,fillcolor=gray!50](-6,-4)(6,4)
%\psset{solidmemory}
-%\psSolid[object=datfile,file=data/tore1860,
+%\psSolid[object=datfile,filename=data/tore1860,
% plansepare={[1 0 0 -1.5]},
% name=lemniscate,
% action=none](0,0,0)
%\psSolid[object=load,
% load=lemniscate1,
-% file=data/tore1860lemniscate,action=writesolid](0,0,0)
+% filename=data/tore1860lemniscate,action=writesolid](0,0,0)
\defFunction[algebraic]{lemniscate}(t){1.5}{Ampl*sin(t)/(1+cos(t)*cos(t))}{Ampl*sin(t)*cos(t)/(1+cos(t)*cos(t))}
-\psSolid[object=datfile,file=data/tore1860lemniscate,
+\psSolid[object=datfile,filename=data/tore1860lemniscate,
fcol=0 (0.5 0.72 0.5 setrgbcolor)
1 (0.5 0.72 0.5 setrgbcolor),
fillcolor=green!30,
@@ -919,7 +920,7 @@
\psset{lightsrc=viewpoint}
\psframe[fillstyle=solid,fillcolor=gray!50](-6,-4)(6,4)
\defFunction[algebraic]{lemniscate}(t){1.5}{Ampl*sin(t)/(1+cos(t)*cos(t))}{Ampl*sin(t)*cos(t)/(1+cos(t)*cos(t))}
-\psSolid[object=datfile,file=data/tore1860lemniscate,
+\psSolid[object=datfile,filename=data/tore1860lemniscate,
hollow,
rm=0 1,
fillcolor=green!30,incolor=yellow!50]
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfaces-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfaces-en.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfaces-en.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -139,7 +139,7 @@
\section{Star version of \texttt{\textbackslash pstSurface}}
-\begin{lstlisting}
+\begin{verbatim}
\psset{viewpoint=50 20 20 rtp2xyz,Decran=100,lightsrc=viewpoint}
\begin{pspicture}(-5,-4)(6,6)
\psSolid[object=grille,base=-2 2 -2 2,action=draw]%
@@ -156,7 +156,7 @@
\psPoint(0.5,0.5,0){C}
\psdot[linecolor=red,dotstyle=x,dotscale=2](C)
\end{pspicture}
-%
+
\begin{pspicture}(-5,-4)(6,10)
\psSolid[object=grille,base=-2 2 -2 2,action=draw]%
\axesIIID(0,0,0)(2,2,1)
@@ -172,9 +172,10 @@
\psPoint(0.5,0.5,0){C}
\psdot[linecolor=red,dotstyle=x,dotscale=2](C)
\end{pspicture}
-\end{lstlisting}
+\end{verbatim}
-\begin{landscape}
+\iffalse
+%\begin{landscape}
\psset{viewpoint=50 20 20 rtp2xyz,Decran=100,lightsrc=viewpoint}
\begin{pspicture}(-5,-4)(6,6)
\psSolid[object=grille,base=-2 2 -2 2,action=draw]%
@@ -191,7 +192,7 @@
\psPoint(0.5,0.5,0){C}
\psdot[linecolor=red,dotstyle=x,dotscale=2](C)
\end{pspicture}
-%
+
\begin{pspicture}(-5,-4)(6,10)
\psSolid[object=grille,base=-2 2 -2 2,action=draw]%
\axesIIID(0,0,0)(2,2,1)
@@ -207,10 +208,10 @@
\psPoint(0.5,0.5,0){C}
\psdot[linecolor=red,dotstyle=x,dotscale=2](C)
\end{pspicture}
-\end{landscape}
+%\end{landscape}
+\fi
-
\section{Example 4: a \Index{sinusoidal wave}}
\begin{LTXexample}[width=7.5cm]
\psset{unit=0.35}
@@ -268,7 +269,7 @@
\psset{viewpoint=50 20 30 rtp2xyz,Decran=50}
\psset{lightsrc=viewpoint,linewidth=0.5\pslinewidth}
\begin{pspicture}(-7,-8)(7,8)
-\psSolid[object=datfile,file=data/paraboloid,hue=0 1 0.5 1,incolor=yellow]
+\psSolid[object=datfile,filename=data/paraboloid,hue=0 1 0.5 1,incolor=yellow]
\gridIIID[Zmin=-4,Zmax=4,spotX=r](-4,4)(-4,4)
\defFunction{F}(t){t}{4 t div 4 min}{4}
\psSolid[object=courbe,range=1 4,r=0,
Modified: trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-tube-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-tube-en.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/doc/generic/pst-solides3d/text/par-tube-en.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -147,7 +147,7 @@
\begin{verbatim}
\psSolid[object=fusion,
base=H1 C1,
- file=horoptere,
+ filename=horoptere,
action=writesolid]
\end{verbatim}
The following sequence \Cadre{LaTeX fichier.tex->dvips->GSview
@@ -160,7 +160,7 @@
\end{itemize}
then read and execute the files with the command:
-\texttt{\textbackslash{}psSolid[object=datfile,file=horoptere]}, the time saved can be quite significant
+\texttt{\textbackslash{}psSolid[object=datfile,filename=horoptere]}, the time saved can be quite significant
@@ -184,7 +184,7 @@
\psset{viewpoint=100 60 20 rtp2xyz,
Decran=75}
\psframe*[linecolor=cyan!30](-4.5,-3)(3.5,3)
-\psSolid[object=datfile,file=data/horoptere]
+\psSolid[object=datfile,filename=data/horoptere]
\end{pspicture}
\end{LTXexample}
Modified: trunk/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro 2023-11-02 19:53:50 UTC (rev 68728)
@@ -1,18 +1,21 @@
%!
% PostScript prologue for pst-solides3d.tex.
-% Version 4.27, 2018/12/27
+% Version 4.29, 2023/11/02
%
%% COPYRIGHT 2009-2017 by Jean-Paul Vignault
-%% opacity changes and fixes by Herbert Voss
+%% opacity changes and fixes by Herbert Voss C 2021
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
%% archives in directory macros/latex/base/lppl.txt.
%
-/SolidesDict 100 dict def
-/SolidesbisDict 100 dict def
+
+/SolidesDict 200 dict def
SolidesDict begin
+systemdict /charpath known not { /charpath { pop pop } def } if
+
+
%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% %% les variables globales gerees par PSTricks %%
%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -33,7 +36,7 @@
%% /hauteurlignedeniveau 1 def
%% /couleurlignedeniveau {rouge} def
%% /linewidthlignedeniveau 4 def
-%% /solidgrid true def
+%%/solidgrid false def
/aretescachees true def
/defaultsolidmode 2 def
%
@@ -4800,12 +4803,8 @@
%% /couleurlignedeniveau {rouge} def
%% /linewidthlignedeniveau 4 def
-/solidgridOn {
- /solidgrid true def
-} def
-/solidgridOff {
- /solidgrid false def
-} def
+/solidgridOn { /solidgrid true def } def
+/solidgridOff { /solidgrid false def } def
%% syntaxe : solid i string solidputfcolor
%% syntaxe : solid str outputcolors
@@ -4852,7 +4851,7 @@
%% syntaxe : solid table (couleur) solidaddface -> -
%% on ne se preoccupe pas des faces internes
/solidaddface {
-6 dict begin
+8 dict begin
dup isstring {
/lac at uleur exch def
} {
@@ -5598,11 +5597,11 @@
%% syntaxe : solid array solidputoutcolors --> -
/solidputoutcolors {
-4 dict begin
+8 dict begin
/newcolorstable exch def
/solid exch def
solid issolid not {
- (Error : mauvais type d argument dans solidputoutcolors) ==
+ (Error : mauvais type d argument dans solidputoutcolors) ==
quit
} if
/n newcolorstable length def
@@ -5938,7 +5937,7 @@
%% array, le tableau des indices des faces a numeroter, est optionnel
%% si bool=true, on ne numerote que les faces visibles
/solidnumfaces {
-5 dict begin
+10 dict begin
dup isbool {
/bool exch def
} {
@@ -5954,13 +5953,12 @@
currentdict /option known not {
/option [0 1 n 1 sub {} for] def
} if
-
0 1 option length 1 sub {
/i exch def
/j option i get def
j ( ) cvs sol j bool cctextp3d
} for
-end
+ end
} def
%%%%% ### creusesolid ###
@@ -9239,7 +9237,7 @@
%% syntaxe : z0 r0 z1 [n1 n2] newcone -> solid
%% syntaxe : a b {f} {sommet} [n1 n2] newcone -> solid
/newcone {
-11 dict begin
+25 dict begin
[ [/n /N] [1 6] [1 8] [1 10] [3 12] [5 18] ] gestionsolidmode
dup xcheck {
%% cas general
@@ -9757,6 +9755,56 @@
solidfuz
end
} def
+%
+/newellipsoid {
+14 dict begin
+/CalcCoordinates{
+ a v cos mul u cos mul
+ b v cos mul u sin mul
+ c v sin mul
+ } def
+ ngrid aload pop
+ /nv exch def
+ /nu exch def
+ base aload pop
+ /vmax exch def
+ /vmin exch def
+ /umax exch def
+ /umin exch def
+1 setlinejoin
+/du umax umin sub nu div def
+/dv vmax vmin sub nv div def
+ /S [
+ 0 1 nu {
+ /i exch def
+ 0 1 nv {
+ /j exch def
+ /u umin i du mul add def
+ /v vmin j dv mul add def
+ CalcCoordinates
+ } for
+ } for
+ ] def
+%
+ /F [
+ 0 1 nu 1 sub {
+ /i exch def
+ 0 1 nv 1 sub {
+ /j exch def
+ [
+ j 1 add i nv 1 add mul add
+ j 0 ne {
+ j i nv 1 add mul add
+ } if
+ j nv 1 add add i nv 1 add mul add
+ j nv 2 add add i nv 1 add mul add
+ ]
+ } for
+ } for
+ ] def
+ S F generesolid
+end
+} def
%%%%% ### readsolidfile ###
%% syntaxe : str readsolidfile -> solid
@@ -10237,12 +10285,12 @@
%% syntaxe : str x y show_dim --> str x y llx lly wx wy
%% attention, doit laisser la pile intacte
/show_dim {
- 3 copy pop pop
- newpath
- 0 0 moveto
- true charpath flattenpath pathbbox
- closepath
- newpath
+ 3 copy pop pop
+ newpath
+ 0 0 moveto
+ true charpath flattenpath pathbbox
+ closepath
+ newpath
} def
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -10261,13 +10309,9 @@
end
} def
-/pstrickactionR2 {
- exec exch exec exch
-} def
+/pstrickactionR2 { exec exch exec exch } def
-/pstrickactionR {
- exec
-} def
+/pstrickactionR { exec } def
/gere_pst-deffunction {
counttomark
@@ -10987,13 +11031,13 @@
} ifelse
} def
/pst-plan- {pst-plan-plantype} def
-
+%
%x0 y0 z0 [normalvect] norm2plan
/pst-plan-plantype {
dup plan2eq /eqpl at n exch def
/plan- at k true def
} def
-
+%
/pst-plan {
% args definition
args (pst-plan-) definition append cvx exec
@@ -11048,14 +11092,13 @@
solidshowbase {l at pl@n projectionsifacevisible planshowbase} if
solidshowbase3d {l at pl@n projectionsifacevisible planshowbase3d} if
} def
-
-
+%
/pst-plan-normalpoint {
/plan- at k false def
norm2plan
dup plan2eq /eqpl at n exch def
} def
-
+%
/pst-plan-equation {
/plan- at k false def
dup isarray {
@@ -11130,7 +11173,18 @@
grestore
end
} def
+%
+/pst-ellipsoid {
+ 10 dict begin
+% [a b c] bubblesort /abc exch def
+% /c abc 0 get def /b abc 1 get def /a abc 2 get def newellipsoid
+ [a b c] /abc exch def
+ /c abc 2 get def /b abc 1 get def /a abc 0 get def newellipsoid
+ gere_pstricks_opt
+ end
+} def
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% procedures pour \psProjection %%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex 2023-11-02 19:53:50 UTC (rev 68728)
@@ -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 @@
\define at key[psset]{pst-solides3d}{solidname}{\def\pst at solides@solidname{#1}}
\psset[pst-solides3d]{solidname=}% pas de nom par defaut
%% nom du fichier externe
-\define at key[psset]{pst-solides3d}{file}{\def\pst at solides@file{#1}}
-\psset[pst-solides3d]{file=}% pas de fichier par defaut
+\define at key[psset]{pst-solides3d}{filename}{\def\pst at solides@filename{#1}}
+\psset[pst-solides3d]{filename=}% pas de fichier par defaut
%% nom de l'objet de type plan
\define at key[psset]{pst-solides3d}{planname}{\def\pst at solides@planname{#1}}
\psset[pst-solides3d]{planname=}% pas de nom par defaut
@@ -279,7 +279,7 @@
% nature de l'objet
\def\pst at solides@list at 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 @@
\def\gridIIID at i(#1,#2)(#3,#4){%
\@ifnextchar[{\gridIIID at ii(#1,#2)(#3,#4)}{\gridIIID at ii(#1,#2)(#3,#4)[2,2,3]}}
\def\gridIIID at ii(#1,#2)(#3,#4)[#5,#6,#7]{%
- \pst at killglue%
+ \pst at killglue
\addbefore at par{planmarks}%
- \begingroup%
- \use at par%
- \psSolid[object=parallelepiped,
+ \begingroup
+ \psset[pst-solides3d]{object=parallelepiped,
intersectiontype=-1,
a={#2 #1 sub},b={#4 #3 sub},
c={\pst at solides@@Zmax\space \pst at solides@@Zmin\space sub},
- action=draw](#1 #2 add 2 div,#3 #4 add 2 div,\pst at solides@@Zmax \pst at solides@@Zmin add 2 div )%
+ action=draw}
+ \use at par
+ \psSolid(#1 #2 add 2 div,#3 #4 add 2 div,\pst at solides@@Zmax \pst at solides@@Zmin add 2 div )%
\ifPst at planmarks
\ifnum#1<0 \pst at cnta=-#1 \def\pst at minus{-}\else\pst at cnta=#1 \def\pst at minus{}\fi
\divide\pst at cnta by \psk at solides@stepX
@@ -511,7 +512,7 @@
\ifx\pst at solides@plansepare\@empty\else/plansepare {\pst at solides@plansepare} def\fi
\ifx\pst at solides@transform\@empty \else/pst-transformoption { \pst at solides@transform} def\fi
\ifx\pst at solides@name\@empty \else/solidname (\pst at solides@name) def\fi
-\ifx\pst at solides@file\@empty \else/solidfilename (\pst at solides@file) def\fi
+\ifx\pst at solides@filename\@empty \else/solidfilename (\pst at solides@filename) def\fi
\ifx\pst at solides@planname\@empty \else/solidplanname (\pst at solides@planname) def\fi
\ifx\pst at solides@load\@empty \else/solidloadname {\pst at solides@load} def\fi
\ifx\pst at solides@fcolor\@empty \else/solidfcolor (\pst at solides@fcolor) def\fi
@@ -636,10 +637,11 @@
% \begin at SpecialObj
\pnode(!
\tx at optionssolides
- SolidesDict begin
+% SolidesDict begin
#1 #2 #3
3dto2d cm_1 exch cm_1 exch
- end){#4}%
+% end
+){#4}%
% \end at SpecialObj
}\ignorespaces%
}
@@ -740,7 +742,7 @@
\addto at pscode{
1 setlinejoin
\tx at optionssolides
- SolidesDict begin
+% SolidesDict begin
/CX 0 def /CY 0 def /CZ 0 def
/base [ #2 #4 #3 #5 ] def
\ifPst at algebraic
@@ -754,7 +756,7 @@
fonction end
} def
\if at star pst-Surface* \else pst-Surface \fi
- end
+% end
}% fin du code ps
\@starfalse
\ifPst at axesboxed\gridIIID(#2,#4)(#3,#5)\fi
@@ -848,29 +850,29 @@
%% transcription et inclusion des variables dans le fichier postscript
\pst at def{psProjection}<%
-/projectionsifacevisible \ifPst at visibility true \else false \fi def
-/isolatin \ifPst at isolatin true \else false \fi def
-/solidlinewidth {\pst at number\pslinewidth} def
-/PSfont {\pst at solides@PSfont} def
-/normale {\pst at solides@normal} bind def
-/fontsize {\pst at solides@fontsize\space \pst at number\psunit mul 28.45 div } def
-/origin {\pst at solides@origin} def
-/RotationAngleText {\pst at solides@RotationAngleText} def
-/range [ \pst at solides@range ] def
-/path { \pst at solides@path } def
-/function { \pst at solides@function } def
-/texte (\pst at solides@text) def
-/pos (\pst at solides@pos) def
-/proj-definition (\pst at solides@definition) def
-/proj-args { \pst at solides@args} def
-/proj-action (\pst at solides@action) def
-\ifx\pst at solides@name\@empty \else/solidname (\pst at solides@name) def\fi
-\ifx\pst at solides@name\@empty \else/projname (\pst at solides@name) def \fi
-\ifx\pst at solides@plan\@empty \else/planprojpst \pst at solides@plan \space def \fi
-\ifx\pst at solides@solidname\@empty\else/solidprojname {\pst at solides@solidname\space} def \fi
-/noface \pst at solides@no\space def % no de la face du solide
-%/resolution \pst at solides@resolution\space def % pour le nb de points par courbe
-\pst at solides@resolution setresolution % ------ hv 20110713
+ /projectionsifacevisible \ifPst at visibility true \else false \fi def
+ /isolatin \ifPst at isolatin true \else false \fi def
+ /solidlinewidth {\pst at number\pslinewidth} def
+ /PSfont {\pst at solides@PSfont} def
+ /normale {\pst at solides@normal} bind def
+ /fontsize {\pst at solides@fontsize\space \pst at number\psunit mul 28.45 div } def
+ /origin {\pst at solides@origin} def
+ /RotationAngleText {\pst at solides@RotationAngleText} def
+ /range [ \pst at solides@range ] def
+ /path { \pst at solides@path } def
+ /function { \pst at solides@function } def
+ /texte (\pst at solides@text) def
+ /pos (\pst at solides@pos) def
+ /proj-definition (\pst at solides@definition) def
+ /proj-args { \pst at solides@args} def
+ /proj-action (\pst at solides@action) def
+ \ifx\pst at solides@name\@empty \else/solidname (\pst at solides@name) def\fi
+ \ifx\pst at solides@name\@empty \else/projname (\pst at solides@name) def \fi
+ \ifx\pst at solides@plan\@empty \else/planprojpst \pst at solides@plan \space def \fi
+ \ifx\pst at solides@solidname\@empty\else/solidprojname {\pst at solides@solidname\space} def \fi
+ /noface \pst at solides@no\space def % no de la face du solide
+ %/resolution \pst at solides@resolution\space def % pour le nb de points par courbe
+ \pst at solides@resolution setresolution % ------ hv 20110713
>
%\makeatletter
@@ -885,7 +887,7 @@
\addto at pscode{%
\tx at optionssolides
\pst at prepscode
- SolidesDict begin
+% SolidesDict begin
\tx at psProjection
/CX 0 def
/CY 0 def
@@ -898,7 +900,7 @@
\fi
% nature du solide : texte, chemin, courbe
gsave proj-\psk at solides@object\space
- end
+% end
}%<- fin du code ps
\psk at fillstyle
\pst at stroke
@@ -929,7 +931,7 @@
\def\lineIIID at ii{%
\addto at pscode{%
\tx at optionssolides
- SolidesDict begin
+% SolidesDict begin
counttomark
/n exch def /n3 n 3 div cvi def
n3 {
@@ -938,7 +940,7 @@
xunit mul exch xunit mul exch
/n n 1 sub def
} repeat
- end
+% end
\pst at cp\space \psline at iii\space \tx at Line
}%
\end at OpenObj%
@@ -957,7 +959,7 @@
\def\polygonIIID at ii{%
\addto at pscode{%
\tx at optionssolides
- SolidesDict begin
+% SolidesDict begin
counttomark
/n exch def /n3 n 3 div cvi def
n3 {
@@ -966,7 +968,7 @@
xunit mul exch xunit mul exch
/n n 1 sub def
} repeat
- end
+% end
\pst at cp\space \psline at iii\space \tx at Polygon
}%
\end at ClosedObj%
@@ -1061,11 +1063,11 @@
/Atan { /atan load stopped { pop pop 0 } if } def
save
\tx at optionssolides
- SolidesDict begin
+% SolidesDict begin
/cm {\pst at number\psunit mul } bind def
/cm_1 {\pst at number\psunit div } bind def
/unit_image \psk at solides@unitPicture def
-/fichier (\pst at solides@file) def
+/fichier (\pst at solides@filename) def
/Normale {\pst at solides@normal\space unitaire3d } bind def
/ND \psk at solides@divisions def
/NDC {\psk at solides@divisions 3 mul} bind def
@@ -1106,7 +1108,7 @@
end
grestore
} if
-end
+%end
restore
}%
\ifPst at solidmemory\else\end at ClosedObj\fi}\ignorespaces%
@@ -1128,7 +1130,7 @@
\else
/ImplFunction { \pst at solides@ImplFunction } def
\fi
- SolidesDict begin
+% SolidesDict begin
MarchingCubes
/plagesXYZ [% min max dx
[\pst at solides@XMinMax][\pst at solides@YMinMax][\pst at solides@ZMinMax]
@@ -1147,7 +1149,7 @@
Sommets iP get aload pop
} for
} def
- end
+% end
}%
\psSolid[object=new,faces={Faces aload pop},sommets=lesPoints](#1)%
\end at SpecialObj
@@ -1179,7 +1181,7 @@
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,
Modified: trunk/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty 2023-11-02 19:53:36 UTC (rev 68727)
+++ trunk/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty 2023-11-02 19:53:50 UTC (rev 68728)
@@ -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]
More information about the tex-live-commits
mailing list.