From 1e464deefd235880a2fac2390e896bfd2b523151 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 3 Nov 2023 03:02:40 +0000 Subject: CTAN sync 202311030302 --- .../pst-solides3d/doc/pst-solides3d-doc.pdf | Bin 6515897 -> 9245460 bytes .../pst-solides3d/doc/pst-solides3d-doc.tex | 44 ++++---- .../pst-solides3d/doc/text/chapter-2-en.tex | 22 ++-- .../pst-solides3d/doc/text/par-couleurs-en.tex | 2 +- .../pst-solides3d/doc/text/par-datfile-en.tex | 14 +-- .../doc/text/par-eclairageponctuel-en.tex | 5 +- .../pst-solides3d/doc/text/par-geode-en.tex | 2 +- .../pst-solides3d/doc/text/par-image2d-en.tex | 30 ++--- .../pst-solides3d/doc/text/par-ligne3D-en.tex | 2 +- .../pst-solides3d/doc/text/par-section-en.tex | 49 ++++---- .../pst-solides3d/doc/text/par-surfaces-en.tex | 17 +-- .../contrib/pst-solides3d/doc/text/par-tube-en.tex | 6 +- .../contrib/pst-solides3d/dvips/pst-solides3d.pro | 124 +++++++++++++++------ .../contrib/pst-solides3d/latex/pst-solides3d.sty | 2 +- .../contrib/pst-solides3d/tex/pst-solides3d.tex | 102 ++++++++--------- 15 files changed, 244 insertions(+), 177 deletions(-) (limited to 'graphics/pstricks') diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/pst-solides3d-doc.pdf b/graphics/pstricks/contrib/pst-solides3d/doc/pst-solides3d-doc.pdf index 1a88b4d305..d8189e48e3 100644 Binary files a/graphics/pstricks/contrib/pst-solides3d/doc/pst-solides3d-doc.pdf and b/graphics/pstricks/contrib/pst-solides3d/doc/pst-solides3d-doc.pdf differ diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/pst-solides3d-doc.tex b/graphics/pstricks/contrib/pst-solides3d/doc/pst-solides3d-doc.tex index d1be5cd6e9..3cd4f2c4d0 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/pst-solides3d-doc.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/pst-solides3d-doc.tex @@ -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 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu 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 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \chapter{Setting the layout of the scenery} \Input{chapter-2-en} \Input{par-eclairageponctuel-en} @@ -345,6 +337,8 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \chapter{More options of \textbackslash{}psSolid} \Input{par-commandestrace-en} \Input{par-solidescreux-en} @@ -365,6 +359,8 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu \Input{par-lignedeniveau-en} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \chapter{Usage of external files} \Input{par-datfile-en} @@ -396,6 +392,8 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu \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 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \chapter{Interaction with PSTricks} \Input{par-positionnerpointconnu-en} @@ -431,6 +430,9 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu \Input{par-projectiondroite-en} + + + %\newpage \Input{par-projectioncercle-en} \Input{par-projectionpolygone-en} diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/text/chapter-2-en.tex b/graphics/pstricks/contrib/pst-solides3d/doc/text/chapter-2-en.tex index 8cce87485e..1d101d2977 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/text/chapter-2-en.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/text/chapter-2-en.tex @@ -137,19 +137,25 @@ See some examples: 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) diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-couleurs-en.tex b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-couleurs-en.tex index ee33402a18..8a379787f2 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-couleurs-en.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-couleurs-en.tex @@ -22,7 +22,7 @@ $66$~colours below. \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, diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-datfile-en.tex b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-datfile-en.tex index 112592b460..21f34cf8d1 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-datfile-en.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-datfile-en.tex @@ -50,7 +50,7 @@ uses the option \Lkeyword{file} to specify the name of the file. 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 @@ We use the object \Lkeyword{datfile} of \Lcs{psSolid}, with the argument \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 @@ the option \Lkeyword{file} to specify the name of the file. 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 @@ One uses the option \Lkeyword{objfile} of \Lcs{psSolid}, with the argument \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 @@ described in the previous paragraph. \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 @@ We use the action \Lkeyword{writeobj} in \Lcs{psSolid}, and we use the option 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 @@ We use the option \Lkeyword{offfile} of \Lcs{psSolid}, with the argument \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. diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-eclairageponctuel-en.tex b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-eclairageponctuel-en.tex index 2a7423a412..1654a311ed 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-eclairageponctuel-en.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-eclairageponctuel-en.tex @@ -64,7 +64,8 @@ As you can see, the intersecting \Index{plane} (section of the sphere with the c 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 @@ is not specified, the object is uniformly illuminated. \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} diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-geode-en.tex b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-geode-en.tex index 34e6104d6f..a5ee3f05bc 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-geode-en.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-geode-en.tex @@ -182,7 +182,7 @@ To deactivate that security option, more or less temporarily, here the two corre %% \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} diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-image2d-en.tex b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-image2d-en.tex index 72b5067426..fbd5ad4cfa 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-image2d-en.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-image2d-en.tex @@ -8,7 +8,7 @@ described in the documentation for The macro includes various options: \begin{verbatim} - \psImage[file=, + \psImage[filename=, divisions=10, normale=nx ny nz, origine=xO yO zO, @@ -42,15 +42,15 @@ If you want to place the image on the front of an object, it will follow the fol \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 @@ image with the \verb+visibility+. \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 @@ image with the \verb+visibility+. 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 @@ image with the \verb+visibility+. 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 @@ image with the \verb+visibility+. 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 @@ image with the \verb+visibility+. \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} diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-ligne3D-en.tex b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-ligne3D-en.tex index 5c287e4cc8..257d34e404 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-ligne3D-en.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-ligne3D-en.tex @@ -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: diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-section-en.tex b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-section-en.tex index 82e1765bbc..bee4b2479a 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-section-en.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-section-en.tex @@ -27,7 +27,8 @@ The hidden parts, drawn with dashed lines, will be shown with \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 @@ thanks to the command \Lkeyword{action}=\Lkeyval{writesolid}: [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 @@ would recall the data with the command: \begin{verbatim} \psSolid[object=datfile, - file=data/Pyramid] + filename=data/Pyramid] \end{verbatim} \begin{center} @@ -337,7 +338,7 @@ frame model of the pyramid: \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 @@ frame model of the pyramid: 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 @@ frame model of the pyramid: % [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 @@ frame model of the pyramid: % 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 @@ frame model of the pyramid: 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 @@ transformations, down on its cut face. fillcolor={[rgb]{0.7 1 0.7}}, name=C1, action=none, - file=data/cubeHexagone] + filename=data/cubeHexagone] \end{verbatim} @@ -682,7 +683,7 @@ transformations, down on its cut face. \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 @@ transformations, down on its cut face. \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 @@ transformations, down on its cut face. \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 @@ transformations, down on its cut face. 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 @@ drawsolid** 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 @@ drawsolid** 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 @@ drawsolid*} %\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 @@ drawsolid*} \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 @@ drawsolid*} \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] diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-surfaces-en.tex b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-surfaces-en.tex index 3e11275406..6f3be17583 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-surfaces-en.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-surfaces-en.tex @@ -139,7 +139,7 @@ The grid lines are suppressed, when using in the option: \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 @@ algebraic](-1,-1)(1,1){ e^(x*y) } \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 @@ algebraic](-1,-1)(1,1){ e^(x*y) } \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 @@ algebraic](-1,-1)(1,1){ e^(x*y) } \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,9 +208,9 @@ algebraic](-1,-1)(1,1){ e^(x*y) } \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] @@ -268,7 +269,7 @@ respectively, of two values. \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, diff --git a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-tube-en.tex b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-tube-en.tex index e75b9c8242..bef8d9cc65 100644 --- a/graphics/pstricks/contrib/pst-solides3d/doc/text/par-tube-en.tex +++ b/graphics/pstricks/contrib/pst-solides3d/doc/text/par-tube-en.tex @@ -147,7 +147,7 @@ the last command \texttt{\Lkeyword{action}=\Lkeyval{writesolid}}: \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 @@ The following sequence \Cadre{LaTeX fichier.tex->dvips->GSview \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 @@ To deactivate that security option, more or less temporarily, here the two corre \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} diff --git a/graphics/pstricks/contrib/pst-solides3d/dvips/pst-solides3d.pro b/graphics/pstricks/contrib/pst-solides3d/dvips/pst-solides3d.pro index d65e081716..b797130a8d 100644 --- a/graphics/pstricks/contrib/pst-solides3d/dvips/pst-solides3d.pro +++ b/graphics/pstricks/contrib/pst-solides3d/dvips/pst-solides3d.pro @@ -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 @@ SolidesDict begin %% /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 @@ end %% /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 @@ end %% syntaxe : solid table (couleur) solidaddface -> - %% on ne se preoccupe pas des faces internes /solidaddface { -6 dict begin +8 dict begin dup isstring { /lac@uleur exch def } { @@ -5598,11 +5597,11 @@ end %% 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 @@ end %% 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 @@ end 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 @@ end %% 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 @@ end 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 @@ end %% 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 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 @@ grestore } ifelse } def /pst-plan- {pst-plan-plantype} def - +% %x0 y0 z0 [normalvect] norm2plan /pst-plan-plantype { dup plan2eq /eqpl@n exch def /plan-@k true def } def - +% /pst-plan { % args definition args (pst-plan-) definition append cvx exec @@ -11048,14 +11092,13 @@ grestore solidshowbase {l@pl@n projectionsifacevisible planshowbase} if solidshowbase3d {l@pl@n projectionsifacevisible planshowbase3d} if } def - - +% /pst-plan-normalpoint { /plan-@k false def norm2plan dup plan2eq /eqpl@n exch def } def - +% /pst-plan-equation { /plan-@k false def dup isarray { @@ -11130,7 +11173,18 @@ gsave 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 %%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/graphics/pstricks/contrib/pst-solides3d/latex/pst-solides3d.sty b/graphics/pstricks/contrib/pst-solides3d/latex/pst-solides3d.sty index 8c04f96597..0827f9fe95 100644 --- a/graphics/pstricks/contrib/pst-solides3d/latex/pst-solides3d.sty +++ b/graphics/pstricks/contrib/pst-solides3d/latex/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] diff --git a/graphics/pstricks/contrib/pst-solides3d/tex/pst-solides3d.tex b/graphics/pstricks/contrib/pst-solides3d/tex/pst-solides3d.tex index 9620eefed1..d9adf6525e 100644 --- a/graphics/pstricks/contrib/pst-solides3d/tex/pst-solides3d.tex +++ b/graphics/pstricks/contrib/pst-solides3d/tex/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, -- cgit v1.2.3