From a21323486fc7b9e14cc562606e7e130d03fbba8e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 24 Aug 2017 21:59:54 +0000 Subject: pst-solides3d (24aug17) git-svn-id: svn://tug.org/texlive/trunk@45113 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pst-solides3d/pst-solides3d.tex | 22 +++++++++++----------- .../tex/latex/pst-solides3d/pst-solides3d.sty | 9 +++------ 2 files changed, 14 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex') 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 d047a65328f..b3db5f2148e 100644 --- a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex +++ b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex @@ -24,8 +24,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\MultidoLoaded\endinput\else \input multido.tex \fi % JPV & ML & AS & HV -\def\fileversion{4.33} -\def\filedate{2017/08/21} +\def\fileversion{4.34} +\def\filedate{2017/08/23} \message{`PSTSOLIDESIIID' v\fileversion, \filedate} % \pstheader{pst-solides3d.pro} @@ -273,9 +273,9 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp \psset[pst-solides3d]{action=draw**}% % % choix de la police et de la taille des caracteres en cm !! -\define@key[psset]{pst-solides3d}{PSfont}{\def\pst@solides@PSfont{/#1 }} +\define@key[psset]{pst-solides3d}{PSfont}[NimbusRomNo9L-Regu]{\def\pst@solides@PSfont{/#1 }} \define@key[psset]{pst-solides3d}{fontsize}{\def\pst@solides@fontsize{#1 }} -\psset[pst-solides3d]{PSfont=Times-Roman,fontsize=10} +\psset[pst-solides3d]{PSfont=NimbusRomNo9L-Regu,fontsize=10} % nature de l'objet \def\pst@solides@list@object{% @@ -432,7 +432,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% \pst@def{optionssolides}< - /PSfont {\pst@solides@PSfont} def + /PSfont \pst@solides@PSfont\space def /pst@fill { \psk@opacityalpha .setopacityalpha fill } def /strokeopacity \psk@opacityalpha def /fillopacity \psk@opacityalpha def @@ -570,14 +570,14 @@ 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{\def\pst@par{}\pst@object{psSolid}} +\def\psSolid{\def\pst@par{PSfont=NimbusSanL-Regu}\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{% \ifx\relax#2\relax\psSolid@iv{#1}\else\psSolid@iv{#1 #2 #3}\fi} \def\psSolid@iv#1{% - \pst@killglue% - \ifPst@solidmemory\begingroup\use@par\else\begin@ClosedObj\fi% + \pst@killglue + \ifPst@solidmemory\begingroup\use@par\else\begin@ClosedObj\fi \addto@pscode{ \pst@prepscode \tx@setTransparency @@ -593,7 +593,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d end \pst@postpscode }% fin du code ps - \ifPst@solidmemory\endgroup\else\end@ClosedObj\fi% + \ifPst@solidmemory\endgroup\else\end@ClosedObj\fi \ignorespaces} @@ -878,7 +878,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d \def\psProjection@i{\@ifnextchar({\psProjection@ii}{\psProjection@ii(0,0)}} \def\psProjection@ii(#1){\expandafter\psProjection@iii#1,,\@nil} \def\psProjection@iii#1,#2,#3\@nil{{% - \addbefore@par{pos=cc,range=0 360}% + \addbefore@par{PSfont=NimbusSanL-ReguCond,pos=cc,range=0 360}% \def\pst@tempA{#2}% \ifPst@solidmemory\use@par\else\begin@ClosedObj\fi% \addto@pscode{% @@ -1212,7 +1212,7 @@ plan=,% pas de plan par defaut plansection=,% pas de section par defaut plansepare=,% pas de separation par defaut pos=cc,% centre par defaut -PSfont=Times-Roman,fontsize=10, +PSfont=NimbusRomNo9L-Regu,fontsize=10, 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,% range=-5 5,% le range par defaut rm=,% pas de faces par defaut diff --git a/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty b/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty index 7bb6f2c8a5e..ac71c5435a3 100644 --- a/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty +++ b/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty @@ -1,15 +1,12 @@ \RequirePackage{pstricks} -\ProvidesPackage{pst-solides3d}[2017/03/03 package wrapper for - pst-solides3d] +\ProvidesPackage{pst-solides3d}[2017/03/03 package wrapper for pst-solides3d] \input{pst-solides3d.tex} \ProvidesFile{pst-solides3d.tex} [\filedate\space v\fileversion\space `PST-solides3D'] \IfFileExists{pst-solides3d.pro}{% - \ProvidesFile{pst-solides3d.pro} - [2017/03/05 v. 4.25, PostScript prologue file] + \ProvidesFile{pst-solides3d.pro}[2017/08/23 v. 4.26, PostScript prologue file] \@addtofilelist{pst-solides3d.pro}}{}% \IfFileExists{pst-implicitsurface.pro}{% - \ProvidesFile{pst-implicitsurface.pro} - [2016/12/10 v. 0.01, PostScript prologue file] + \ProvidesFile{pst-implicitsurface.pro}[2016/12/10 v. 0.01, PostScript prologue file] \@addtofilelist{pst-implicitsurface.pro}}{}% \endinput -- cgit v1.2.3