From 46c968cdb2125472e0393519e086437993caa589 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 16 Nov 2012 23:23:31 +0000 Subject: pst-solides3d (16nov12) git-svn-id: svn://tug.org/texlive/trunk@28279 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/generic/pst-solides3d/Changes | 2 + .../doc/generic/pst-solides3d/doc-en/Letter.ist | 36 ++++++++++++++++++ .../pst-solides3d/doc-en/par-keywords-en.tex | 11 ++++-- .../doc-en/par-solidespredefinis-en.tex | 6 +-- .../pst-solides3d/doc-en/pst-solides3d-doc.brf | 0 .../generic/pst-solides3d/doc-en/tex-files-all.zip | Bin 116992 -> 0 bytes .../generic/pst-solides3d/pst-solides3d-doc.pdf | Bin 5007843 -> 5108518 bytes .../dvips/pst-solides3d/pst-solides3d.pro | 6 +-- .../tex/generic/pst-solides3d/pst-solides3d.tex | 41 +++++++++++---------- 9 files changed, 74 insertions(+), 28 deletions(-) create mode 100644 Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Letter.ist create mode 100644 Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.brf delete mode 100644 Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tex-files-all.zip diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/Changes b/Master/texmf-dist/doc/generic/pst-solides3d/Changes index b5d53376352..9cb612cdf74 100644 --- a/Master/texmf-dist/doc/generic/pst-solides3d/Changes +++ b/Master/texmf-dist/doc/generic/pst-solides3d/Changes @@ -1,4 +1,5 @@ pst-solides3d.tex --- +4.24 2011-07-13 - take value of resolution into account 4.23 2010-09-22 - add option axisemph to the axesboxed option 4.22 2010-08-06 - reset boolean solidmemory to false, when closing a pspicture environemnt. @@ -20,6 +21,7 @@ pst-solides3d.sty --- solides.pro --- +4.21 2011-07-13 - take value of resolution into account 4.16 2010-01-07 - fix bug with pst-surfaceparametre and function def 4.15 2009-07-03 - allow names for the origin coordidates for \psSolid (hv) 4.14 2009-02-27 - Ajout de la coloration en fonction de la hauteur z. (jpv) diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Letter.ist b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Letter.ist new file mode 100644 index 00000000000..a6da86bc349 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Letter.ist @@ -0,0 +1,36 @@ +%% +%% This is file `Letter.ist', +%% +%% The idea is from Ingo Kloeckl, Latex2e: +%% Herbert Voss 000726 +%% +%% This is a MAKEINDEX style file which should be used to +%% generate the formatted change history for use with the doc +%% package. The TeX commands used below are defined in +%% doc.sty. The commands for MAKEINDEX like `level' +%% `item_x1' are described in `` Makeindex, A General +%% Purpose, Formatter-Independent Index Processor'' by +%% Pehong Chen. +%% +headings_flag 1 % headings yes +heading_prefix "\\textbf{" % boldfont +heading_suffix "}\n" % newline +quote '"' +%%level '>' +preamble + "\\begin{theindex}\n" +item_1 + "\\par\\leavevmode\\hangindent10pt\\makebox[10pt][l]{--}" +item_01 + "\\par\\leavevmode\\hangindent10pt\\makebox[10pt][l]{--}" +item_x1 + "\\par\\leavevmode\\hangindent10pt\\makebox[10pt][l]{--}" +item_2 + "\\par\\leavevmode\\hangindent20pt\\makebox[20pt][l]{-- -- }" +item_12 + "\\par\\leavevmode\\hangindent20pt\\makebox[20pt][l]{-- -- }" +item_x2 + "\\par\\leavevmode\\hangindent20pt\\makebox[20pt][l]{-- -- }" +%% +%% +%% End of file `Letter.ist'. diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex index 5fb410422d6..90d4a8db49f 100644 --- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex +++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex @@ -484,17 +484,22 @@ RotX, RotY, RotZ& r& \textbackslash{}psSolid&&\\[.5em] - &object=courbe&length&2\\ + &object=anneau\|courbe&length&2\\ + \hline + +R& + \textbackslash{}psSolid&&\\[.5em] + &object=anneau&length&4\\ \hline r0& \textbackslash{}psSolid&&\\[.5em] - &object=anneau\|tore\|troncone\|troncconecreux&length&1.5\\ + &object=tore\|troncone\|troncconecreux&length&1.5\\ \hline r1& \textbackslash{}psSolid&&\\[.5em] - &object=anneau\|tore\|troncone\|troncconecreux&length&4\\ + &object=tore\|troncone\|troncconecreux&length&4\\ \hline range& diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex index a8374ed4d80..1d71e41486a 100644 --- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex +++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex @@ -407,7 +407,7 @@ base=-1 1 -1.5 1.5] \end{tabular} & \begin{tabular}{c} - \texttt{[r1=2.5,r0=1.5,}\\ + \texttt{[R=4,r=3}\\ inner and outer radius\\ \texttt{h=6,section=...]}\\ height\\ @@ -419,7 +419,7 @@ base=-1 1 -1.5 1.5] %\psset{unit=0.44cm} \psset{lightsrc=42 24 13,viewpoint=50 30 15 rtp2xyz} \psset{Decran=30} -\psSolid[object=anneau,fillcolor=yellow,h=1.5,r1=4,r0=3]% +\psSolid[object=anneau,fillcolor=yellow,h=1.5,R=4,r=3]% \axesIIID(4,4,0)(5,5,4) \end{pspicture} & @@ -428,7 +428,7 @@ base=-1 1 -1.5 1.5] \psSolid[ object=anneau, fillcolor=yellow, - h=1.5,r1=4,r0=3]% + h=1.5,R=4,r=3]% \end{verbatim} \end{minipage} \\\hline diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.brf b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.brf new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tex-files-all.zip b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tex-files-all.zip deleted file mode 100644 index 0a9eb3d1801..00000000000 Binary files a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tex-files-all.zip and /dev/null differ diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf index 51aa7bbe0dd..abab60936d8 100644 Binary files a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf and b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf differ diff --git a/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro b/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro index 456b984a364..17fb211bc71 100644 --- a/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro +++ b/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro @@ -1,6 +1,6 @@ %! % PostScript prologue for pst-solides3d.tex. -% Version 4.20, 2010/04/27 +% Version 4.21, 2011/07/13 % %% COPYRIGHT 2009/10 by Jean-Paul Vignault %% opacity changes by Herbert Voss @@ -2169,7 +2169,7 @@ end /setresolution { /resolution exch def } def -/resolution 200 def +%/resolution 200 def % ---- hv 20110713 /courbe_dic 2 dict def courbe_dic /X {} put @@ -4719,7 +4719,7 @@ end %% /couleurlignedeniveau {rouge} def %% /linewidthlignedeniveau 4 def -/solidgridOn { +/solidgridOn { /solidgrid true def } def /solidgridOff { 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 617dc7c0af1..ca4e4eae9da 100644 --- a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex +++ b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex @@ -33,8 +33,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\MultidoLoaded\endinput\else \input multido.tex \fi % JPV & ML & AS & HV -\def\fileversion{4.23} -\def\filedate{2010/09/22} +\def\fileversion{4.24} +\def\filedate{2011/07/13} \message{`PSTSOLIDESIIID' v\fileversion, \filedate} % \pstheader{pst-solides3d.pro} @@ -60,10 +60,10 @@ \define@key[psset]{pst-solides3d}{RotZ}{\def\psk@solides@RotZ{#1}}% rotation autour de Oz en degres \psset[pst-solides3d]{RotZ=0,RotX=0,RotY=0,Decran=50}% valeurs par defaut % parametres propres a chaque objet -\define@key[psset]{pst-solides3d}{resolution}{\def\pst@solides@resolution{#1}} % nb points par courbe -\define@key[psset]{pst-solides3d}{no}{\def\pst@solides@no{#1}} % numero face du solide -\define@key[psset]{pst-solides3d}{phi}{\def\pst@solides@phi{#1}} % angle calotte sphere -\define@key[psset]{pst-solides3d}{theta}{\def\pst@solides@theta{#1}} % angle calotte sphere +\define@key[psset]{pst-solides3d}{resolution}{\def\pst@solides@resolution{#1 }} % nb points par courbe +\define@key[psset]{pst-solides3d}{no}{\def\pst@solides@no{#1 }} % numero face du solide +\define@key[psset]{pst-solides3d}{phi}{\def\pst@solides@phi{#1 }} % angle calotte sphere +\define@key[psset]{pst-solides3d}{theta}{\def\pst@solides@theta{#1 }} % angle calotte sphere \define@key[psset]{pst-solides3d}{r0}{\def\pst@solides@rO{#1}} % rayon interieur tore \define@key[psset]{pst-solides3d}{r1}{\def\pst@solides@rI{#1}} % rayon moyen tore \define@key[psset]{pst-solides3d}{R}{\def\pst@solides@R{#1}} % rayon moyen tore @@ -79,7 +79,7 @@ \define@key[psset]{pst-solides3d}{intersectiontype}{\def\pst@solides@intersectiontype{#1}} % % %% les affectations par defaut -\psset[pst-solides3d]{R=4,r1=4,r0=1.5,r=2,no=0,a=4,b=a,c=a,h=6,phi=0,theta=90,resolution=36,% +\psset[pst-solides3d]{R=4,r1=4,r0=1.5,r=2,no=0,a=4,b=a,c=a,h=6,phi=0,theta=90,resolution=36, trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontype=-1} % %%%%%%%%%%%%%%%%% variables complexes %%%%%%%%%%%%%%%%% @@ -341,6 +341,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle} \@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% + \addbefore@par{planmarks}% \begingroup% \use@par% \psSolid[object=parallelepiped, @@ -434,7 +435,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle} %% code insere dans le .ps %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -\pst@def{optionssolides}<% +\pst@def{optionssolides}< /PSfont {\pst@solides@PSfont} def /pst@fill { \psk@opacityalpha .setopacityalpha fill } def /strokeopacity \psk@opacityalpha def @@ -443,21 +444,22 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle} %% /cm {\pst@number\psunit mul} def %% /cm_1 {\pst@number\psunit div} def /decal \pst@solides@decal\space def % decalage - /viewpointXYZ {\pst@solides@viewpoint} def + /viewpointXYZ { \pst@solides@viewpoint } def /Decran \pst@solides@Decran\space def % distance de l'ecran % -/RotX \psk@solides@RotX\space def -/RotY \psk@solides@RotY\space def -/RotZ \psk@solides@RotZ\space def + /RotX \psk@solides@RotX\space def + /RotY \psk@solides@RotY\space def + /RotZ \psk@solides@RotZ\space def % -/fontsize {\pst@solides@fontsize\space \pst@number\psunit mul 28.45 div } bind def + /fontsize \pst@solides@fontsize\space \pst@number\psunit mul 28.45 div def % -/projectionsifacevisible \ifPst@visibility true \else false \fi def + /projectionsifacevisible \ifPst@visibility true \else false \fi def % /R \pst@solides@R\space def % pour le tore /r1 \pst@solides@rI\space def % pour le tore /r0 \pst@solides@rO\space def % pour le tore -/resolution \pst@solides@resolution\space def % pour le nb de points par courbe +%/resolution \pst@solides@resolution\space def % pour le nb de points par courbe +\pst@solides@resolution setresolution % ------ hv 20110713 /phi \pst@solides@phi\space def % pour la calotte spherique /theta \pst@solides@theta\space def % pour la calotte spherique /r \pst@solides@r\space def % rayon sphere circonscrite @@ -567,7 +569,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d \let\endpspictureS@lid\endpspicture% redefine \endpspicture (hv) \def\endpspicture{\ifPst@solidmemory\use@pscode\fi\endpspictureS@lid\global\Pst@solidmemoryfalse} % -\def\psSolid{\pst@object{psSolid}} +\def\psSolid{\def\pst@par{}\pst@object{psSolid}} \def\psSolid@i{\@ifnextchar({\psSolid@ii}{\psSolid@iv{ 0. 0. 0. }}} \def\psSolid@ii(#1){\expandafter\psSolid@iii#1,,,\@nil} \def\psSolid@iii#1,#2,#3,#4\@nil{% @@ -578,7 +580,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d \addto@pscode{ \tx@setTransparency 1 setlinejoin - \tx@optionssolides + \tx@optionssolides SolidesDict begin #1 /CZ exch def @@ -848,7 +850,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d /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 } 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 @@ -863,7 +865,8 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d \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 +%/resolution \pst@solides@resolution\space def % pour le nb de points par courbe +\pst@solides@resolution setresolution % ------ hv 20110713 > %\makeatletter -- cgit v1.2.3