From 3c36091e77e72aa582c29594048a092b63eae83c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 15 Sep 2021 03:01:59 +0000 Subject: CTAN sync 202109150301 --- graphics/pstricks/contrib/pst-mirror/Changes | 1 + graphics/pstricks/contrib/pst-mirror/README | 8 +-- .../contrib/pst-mirror/doc/createEPS/make2.sh | 10 +++ .../contrib/pst-mirror/doc/pst-mirror-doc.pdf | Bin 6977233 -> 7092245 bytes .../contrib/pst-mirror/doc/pst-mirror-doc.tex | 73 +++++++++++---------- .../contrib/pst-mirror/dvips/pst-mirror.pro | 12 +++- .../contrib/pst-mirror/latex/pst-mirror.sty | 2 +- .../pstricks/contrib/pst-mirror/tex/pst-mirror.tex | 21 +++--- 8 files changed, 75 insertions(+), 52 deletions(-) create mode 100755 graphics/pstricks/contrib/pst-mirror/doc/createEPS/make2.sh (limited to 'graphics') diff --git a/graphics/pstricks/contrib/pst-mirror/Changes b/graphics/pstricks/contrib/pst-mirror/Changes index efe9aabd11..05f40ce5c6 100644 --- a/graphics/pstricks/contrib/pst-mirror/Changes +++ b/graphics/pstricks/contrib/pst-mirror/Changes @@ -1,4 +1,5 @@ ..... pst-mirror.tex +1.02 2021-09-14 - fix for fontname on PS level 1.01 2014-02-17 - small changes to the polygon macro - make \pstDie an object - make image run diff --git a/graphics/pstricks/contrib/pst-mirror/README b/graphics/pstricks/contrib/pst-mirror/README index 93abbf0e1f..44d352a8e4 100644 --- a/graphics/pstricks/contrib/pst-mirror/README +++ b/graphics/pstricks/contrib/pst-mirror/README @@ -4,9 +4,9 @@ Save the files pst-mirror.sty|tex|pro in a directory, which is part of your local TeX tree. The pro file should go into $TEXMF/dvips/pstricks/ Then do not forget to run texhash to update this tree. For more information see the documentation of your LATEX distribution -on installing packages into your local TeX system or read the -TeX Frequently Asked Questions: -(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages). +on installing packages into your local TeX system. PSTricks is PostScript Tricks, the documentation cannot be run -with pdftex, use the sequence latex->dvips->ps2pdf or xelatex. \ No newline at end of file +with pdftex, use the sequence latex->dvips->ps2pdf or xelatex. + +hvoss@tug.org \ No newline at end of file diff --git a/graphics/pstricks/contrib/pst-mirror/doc/createEPS/make2.sh b/graphics/pstricks/contrib/pst-mirror/doc/createEPS/make2.sh new file mode 100755 index 0000000000..496aeb3569 --- /dev/null +++ b/graphics/pstricks/contrib/pst-mirror/doc/createEPS/make2.sh @@ -0,0 +1,10 @@ +#latex xa.tex && rm -f xa.log xa.aux +#dvips -E xa.dvi -o xa.eps +#pstoedit -dt -xscale "-1" -xshift -150 -f ps xa.eps xb.eps +pstoedit -dt -xscale "-1" -xshift -150 -f ps $1.eps $1-b.eps +scripts/filtre.pl 1 $1-b.eps +pstoedit -f ps $1-b.eps $1-c.eps +scripts/filtre.pl 2 $1-c.eps +#./test.sh +#latex xxx && dvips xxx && ps2pdf xxx.ps +rm -f *.ps *.dvi \ No newline at end of file diff --git a/graphics/pstricks/contrib/pst-mirror/doc/pst-mirror-doc.pdf b/graphics/pstricks/contrib/pst-mirror/doc/pst-mirror-doc.pdf index 8a8a3fd32b..33980a133a 100644 Binary files a/graphics/pstricks/contrib/pst-mirror/doc/pst-mirror-doc.pdf and b/graphics/pstricks/contrib/pst-mirror/doc/pst-mirror-doc.pdf differ diff --git a/graphics/pstricks/contrib/pst-mirror/doc/pst-mirror-doc.tex b/graphics/pstricks/contrib/pst-mirror/doc/pst-mirror-doc.tex index 810bab27d0..9623d2230e 100644 --- a/graphics/pstricks/contrib/pst-mirror/doc/pst-mirror-doc.tex +++ b/graphics/pstricks/contrib/pst-mirror/doc/pst-mirror-doc.tex @@ -1,7 +1,11 @@ -%% $Id: pst-mirror-doc.tex 894 2014-02-18 09:46:21Z herbert $ -\documentclass[11pt,frenchb,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings - headexclude,footexclude,oneside]{pst-doc} -\usepackage[utf8]{inputenc} +%% $Id: pst-mirror-doc.tex 248 2021-09-14 08:57:11Z herbert $ +\errorcontextlines=100 +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{} +\listfiles +\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, + headinclude=false,footinclude=false,oneside]{pst-doc} + \usepackage{pst-mirror} \let\myFV\fileversion \usepackage{pst-grad} @@ -9,16 +13,15 @@ \usepackage{tabularx} \usepackage{longtable} +\addbibresource{\jobname.bib} + \def\UrlFont{\small\ttfamily} \makeatletter \def\verbatim@font{\small\normalfont\ttfamily} \makeatother -\let\myPart\part -\renewcommand{\part}[1]{\clearpage\myPart{#1}} \newcommand\verbI[1]{\small\texttt{#1}} \psset{subgriddiv=0,gridlabels=7pt,gridcolor=black!15} -\hypersetup{pdfauthor={Herbert Voss},pdftitle={Sphere mirror}} % \newcounter{boua} \newcommand\itemBoua{\addtocounter{boua}{1}\strut\indent\textit{\theboua}\textsuperscript{o} --- } @@ -68,26 +71,23 @@ \pstSphereFrame[fillstyle=solid,fillcolor=yellow](0,0)(-30,-60) \pstSphereGrid[linecolor=blue,linewidth=0.05mm,grille=10,Ymin=-60,Ymax=0,Xmin=-30,Xmax=0](40,-70,-10)}} -\def\bgImage{\psscalebox{0.7}{\begin{pspicture}(-7,-7)(7,7) +\def\bgImage{\psscalebox{0.5}{\begin{pspicture}(-7,-7)(7,7) \newpsstyle{GradWhiteYellow}{fillstyle=gradient,gradbegin=yellow,gradend=yellow!20, linecolor=yellow!50,GradientCircle=true,gradmidpoint=0,GradientPos={(1,1)}}% \pscircle[style=GradWhiteYellow]{7.07} \pstSphereGrid[linecolor=red,grille=10,Ymin=-50,Ymax=50,Xmax=80,Xmin=-80,normale=0 0](20,0,0) \pstSphereGrid[linecolor=blue,grille=10,Ymin=-40,Ymax=-20,Xmax=80,Xmin=-80,normale=0 90](40,0,-10)% - \pstSphereText[fillstyle=solid,fillcolor=red,normale=0 0,fontscale=40,PSfont=Time-Roman,yO=0](20,0,10){pst-mirror} - \pstSphereText[fillstyle=solid,fillcolor=black,normale=0 0,fontscale=20,PSfont=Helvetica,yO=0](20,0,35){PSTricks} - \pstSphereText[fillstyle=solid,fillcolor=blue,normale=0 90,fontscale=10,PSfont=Helvetica,yO=2.5](10,0,-10){A Spherical Mirror}% + \pstSphereText[fillstyle=solid,fillcolor=red,normale=0 0,fontscale=40,fontname=Times-Roman,yO=0](20,0,10){pst-mirror} + \pstSphereText[fillstyle=solid,fillcolor=black,normale=0 0,fontscale=20,fontname=Helvetica,yO=0](20,0,35){PSTricks} + \pstSphereText[fillstyle=solid,fillcolor=blue,normale=0 90,fontscale=10,fontname=Helvetica,yO=2.5](10,0,-10){A Spherical Mirror}% \end{pspicture}}} -\lstset{basicstyle=\ttfamily\footnotesize} - \begin{document} \author{Manuel Luque\\Herbert Vo\ss} \docauthor{} -\date{\today} \title{Images on a spherical mirror} \subtitle{A PSTricks package for drawing 3D objects on a sphere, v\myFV} -\maketitle% +\settitle \tableofcontents @@ -473,6 +473,8 @@ moins des sept dixiémes du diamétre. + + \begin{pspicture}(-8,-8)(8,8) %\psset{scale=2} \pstSphereFrame[Xorigine=20,Yorigine=0,Zorigine=0,fillstyle=solid,fillcolor=OrangePale](-70,-50)(70,10) @@ -775,6 +777,9 @@ On le fait tourner autour de O$z$ avec \Lkeyword{RotZ}=30 etc. \psset{CX=15,CZ=-5,CY=0,RotZ=30} \end{lstlisting} + + + \clearpage \subsection{Le dé} Le dé posséde une commande propre \Lcs{pstSphereDie}, qui en interne utilise celle @@ -887,11 +892,11 @@ autour des axes avec \Lkeyword{RotX}, \Lkeyword{RotY}, \Lkeyword{RotZ}. \begin{center} \begin{pspicture}(-5,-4)(5,5) \decor -% \pstSphereText[fillstyle=solid,fillcolor=red,fontscale=10,PSfont=Helvetica,normale=0 90](15,0,-10){l'aventure mathématique} +% \pstSphereText[fillstyle=solid,fillcolor=red,fontscale=10,fontname=Helvetica,normale=0 90](15,0,-10){l'aventure mathématique} \psset{fillstyle=gradient,gradbegin=white,gradend=red,gradmidpoint=0.2,linewidth=0.1mm} { \psset{CX=20,CY=20,CZ=-10} \pstSphereCylinder{5}{7.5} } { \psset{CX=15,CY=10,CZ=-7.5,RotY=90,RotX=-45} \pstSphereCylinder{2.5}{-10}} -% \pstSphereText[fillstyle=solid,fillcolor=red,fontscale=25,PSfont=Bookman-demibold, +% \pstSphereText[fillstyle=solid,fillcolor=red,fontscale=25,fontname=Bookman-Demi, % normale=0 0](40,0,10){Tangente} \end{pspicture} \end{center} @@ -972,7 +977,7 @@ souhaité avec les paramétres suivants : \item et son origine \texttt{(x,y,z)}. \end{compactitem} \item La taille des caractéres est fixée par \Lkeyword{fontscale}=1 : 1 cm par défaut. - \item Le type de fonte par \Lkeyset{PSfont=Times-Roman} par défaut. + \item Le type de fonte par \Lkeyset{fontname=Times-Roman} par défaut. \item Le booléen \Lkeyword{isolatin} qui est positionné é \texttt{true} par défaut, permet l'écriture des caractéres accentués. Si l'on souhaite utiliser la police \texttt{Symbol}, permettant d'écrire les caractéres grecs, il faut positionner ce booléen é \texttt{false}. @@ -985,24 +990,25 @@ souhaité avec les paramétres suivants : \pscircle[style=GradWhiteYellow]{7.07} \pstSphereGrid[linecolor=red,grille=10,Ymin=-50,Ymax=50,Xmax=80,Xmin=-80,normale=0 0](20,0,0) \pstSphereGrid[linecolor=blue,grille=10,Ymin=-40,Ymax=-20,Xmax=80,Xmin=-80,normale=0 90](40,0,-10)% -\pstSphereText[fillstyle=solid,fillcolor=red,normale=0 0,fontscale=30,PSfont=Bookman-demibold,yO=0](20,0,10){Tangente} +\pstSphereText[fillstyle=solid,fillcolor=red,normale=0 0,fontscale=30,fontname=Bookman-Demi,yO=0](20,0,10){Tangente} \pstSphereText[fillstyle=solid,fillcolor=blue,normale=0 90,fontscale=10, - PSfont=Helvetica,yO=2.5](10,0,-10){l'aventure math\'ematique}% + fontname=Helvetica,yO=2.5](10,0,-10){l'aventure math\'ematique}% \end{pspicture} \end{center} \begin{lstlisting} \begin{pspicture}(-8,-10)(8,10) %\psset{Rayon=8} -\newpsstyle{GradWhiteYellow}{fillstyle=gradient,gradbegin=yellow,gradend=yellow!20, - linecolor=yellow!50,GradientCircle=true,gradmidpoint=0,GradientPos={(1,1)}}% +\newpsstyle{GradWhiteYellow}{fillstyle=gradient,% + gradbegin=yellow,gradend=yellow!20,linecolor=yellow!50,GradientCircle=true,gradmidpoint=0,GradientPos={(1,1)}}% \pscircle[style=GradWhiteYellow]{7.07} \pstSphereGrid[linecolor=red,grille=10,Ymin=-50,Ymax=50,Xmax=80,Xmin=-80,normale=0 0](20,0,0) \pstSphereGrid[linecolor=blue,grille=10,Ymin=-40,Ymax=-20,Xmax=80,Xmin=-80,normale=0 90](40,0,-10)% \pstSphereText[fillstyle=solid,fillcolor=red,normale=0 0,fontscale=30, - PSfont=Bookman-demibold,yO=0](20,0,10){Tangente} + fontname=Bookman-Demi,yO=0](20,0,10){Tangente} +\pstSphereText[fillstyle=solid,fillcolor=red,normale=0 0,fontscale=30,PSfont=Bookman-Demi,yO=0](20,0,10){Tangente} \pstSphereText[fillstyle=solid,fillcolor=blue,normale=0 90,fontscale=10, - PSfont=Helvetica,yO=2.5](10,0,-10){l'aventure math\'ematique}% + fontname=Helvetica,yO=2.5](10,0,-10){l'aventure math\'ematique}% \end{pspicture} \end{lstlisting} @@ -1029,8 +1035,8 @@ un plan d\'{e}fini comme pour le texte. \pstSphereFrame[fillstyle=solid,fillcolor=black](-70,-50)(70,50) \pstSphereGrid[linecolor=white,linewidth=0.2mm,grille=10,Ymin=-50,Ymax=50,Xmax=70,Xmin=-70](15,0,0)}% \pstSphereImage[normale=0 0,scale=0.75](15,0,0){images/donaldNB.eps} -\pstSphereText[fillstyle=solid,fillcolor=white,linecolor=white,fontscale=17,PSfont=Symbol, - normale=0 0,isolatin=false](15,0,25){Donald Duck} +\pstSphereText[fillstyle=solid,fillcolor=white,linecolor=white,fontscale=17,fontname=Symbol, + normale=0 0,isolatin=false](15,0,25){Donald} \parametricplotSphere[plotpoints=3600,linecolor=white,linewidth=0.5mm,normale=0 0,Xorigine=15,% Yorigine=30,Zorigine=10]{0}{360}{% /Radius 10 t 4 mul cos mul def @@ -1051,8 +1057,8 @@ un plan d\'{e}fini comme pour le texte. \pstSphereFrame[fillstyle=solid,fillcolor=black](-70,-50)(70,50) \pstSphereGrid[linecolor=white,linewidth=0.2mm,grille=10,Ymin=-50,Ymax=50,Xmax=70,Xmin=-70](15,0,0)}% \pstSphereImage[normale=0 0,scale=0.75](15,0,0){images/donaldNB.eps} -\pstSphereText[fillstyle=solid,fillcolor=white,linecolor=white,fontscale=17,PSfont=Symbol, - normale=0 0,isolatin=false](15,0,25){Donald Duck} +\pstSphereText[fillstyle=solid,fillcolor=white,linecolor=white,fontscale=17,fontname=Symbol, + normale=0 0,isolatin=false](15,0,25){Donald} \parametricplotSphere[plotpoints=3600,linecolor=white,linewidth=0.5mm,normale=0 0,Xorigine=15,% Yorigine=30,Zorigine=10]{0}{360}{% /Radius 10 t 4 mul cos mul def @@ -1067,7 +1073,6 @@ un plan d\'{e}fini comme pour le texte. \end{pspicture} \end{lstlisting} - \section{Une remarque importante} Si le calcul des faces cach\'{e}es est pris en compte pour chaque objet pris individuellement, il en @@ -1079,7 +1084,7 @@ les plus \'{e}loign\'{e}s de boule, puis ceux qui sont de plus en plus proche de \psframe*[linecolor=black!15](-4,-4)(4,4) \pscircle*[linecolor=blue!50]{!5 2 sqrt div} \psset{Rayon=5} -\pstSphereImage[normale=0 0](5,0,0){images/asterixobelix.eps} +\pstSphereImage[normale=0 0](5,0,0){images/donaldNB.eps} %\pstSphereGrid[linecolor=gray,linewidth=0.01,grille=5,Ymin=-100,Ymax=100,Xmax=100,Xmin=-100](5,0,0)% \end{pspicture} @@ -1088,12 +1093,11 @@ les plus \'{e}loign\'{e}s de boule, puis ceux qui sont de plus en plus proche de \psframe*(-5,-5)(5,5) \pscircle*[linecolor=blue!50]{!5 2 sqrt div} \psset{Rayon=5} -\pstSphereImage[normale=0 0](5,0,0){images/asterixobelix.eps} +\pstSphereImage[normale=0 0](5,0,0){images/donaldNB.eps} %\pstSphereGrid[linecolor=gray,linewidth=0.01,grille=5,Ymin=-100,Ymax=100,Xmax=100,Xmin=-100](5,0,0)% \end{pspicture} \end{lstlisting} - \section{Conclusion} Nous pouvons maintenant nous atteler é la téche de construire des décors en 3D vus dans une boule qui soient intéressants et @@ -1116,12 +1120,11 @@ qui sont de plus en plus proche de la boule. \xkvview{family=pst-mirror,columns={key,type,default}} +\nocite{*} \bgroup -\nocite{*} \raggedright -\bibliographystyle{plain} -\bibliography{\jobname} +\printbibliography \egroup \printindex diff --git a/graphics/pstricks/contrib/pst-mirror/dvips/pst-mirror.pro b/graphics/pstricks/contrib/pst-mirror/dvips/pst-mirror.pro index 7b0155df77..781812613f 100644 --- a/graphics/pstricks/contrib/pst-mirror/dvips/pst-mirror.pro +++ b/graphics/pstricks/contrib/pst-mirror/dvips/pst-mirror.pro @@ -1,4 +1,4 @@ -%% $Id: pst-mirror.pro 894 2014-02-18 09:46:21Z herbert $ +%% $Id: pst-mirror.pro 248 2021-09-14 08:57:11Z herbert $ %% %% This is file `pst-mirror.pro', %% @@ -28,6 +28,7 @@ tx@Sphere3DImageDict begin /LINETO { systemdict /lineto get exec } def /MOVETO { systemdict /moveto get exec } def /CURVETO { systemdict /curveto get exec } def +/RCURVETO { systemdict /rcurveto get exec } def /CLOSEPATH { systemdict /closepath get exec } def /RLINETO { systemdict /rlineto get exec } def %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -106,6 +107,15 @@ tx@Sphere3DImageDict begin /rlineto { c@y add exch c@x add exch lineto } bind def +/rcurveto { + c@y add 6 1 roll + c@x add 6 1 roll + c@y add 6 1 roll + c@x add 6 1 roll + c@y add 6 1 roll + c@x add 6 1 roll + curveto +} bind def end % % diff --git a/graphics/pstricks/contrib/pst-mirror/latex/pst-mirror.sty b/graphics/pstricks/contrib/pst-mirror/latex/pst-mirror.sty index 9a2893afba..a04038a35e 100644 --- a/graphics/pstricks/contrib/pst-mirror/latex/pst-mirror.sty +++ b/graphics/pstricks/contrib/pst-mirror/latex/pst-mirror.sty @@ -1,4 +1,4 @@ -%% $Id: pst-mirror.sty 894 2014-02-18 09:46:21Z herbert $ +%% $Id: pst-mirror.sty 248 2021-09-14 08:57:11Z herbert $ \RequirePackage{pstricks} \ProvidesPackage{pst-mirror}[2014/02/17 package wrapper for pst-mirror.tex (hv)] diff --git a/graphics/pstricks/contrib/pst-mirror/tex/pst-mirror.tex b/graphics/pstricks/contrib/pst-mirror/tex/pst-mirror.tex index dcb63ab676..89917b065b 100644 --- a/graphics/pstricks/contrib/pst-mirror/tex/pst-mirror.tex +++ b/graphics/pstricks/contrib/pst-mirror/tex/pst-mirror.tex @@ -1,4 +1,4 @@ -%% $Id: pst-mirror.tex 894 2014-02-18 09:46:21Z herbert $ +%% $Id: pst-mirror.tex 248 2021-09-14 08:57:11Z herbert $ %% %% This is file `pst-mirror.tex', %% @@ -23,11 +23,11 @@ \ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi \ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi \ifx\PSTnodesLoaded\endinput\else\input pst-node \fi +\ifx\PSTtoolsLoaded\endinput\else\input pst-tools.tex \fi \ifx\MultidoLoaded\endinput \else\input multido.tex \fi % -%\def\fileversion{1.00} CTAN -\def\fileversion{1.01} -\def\filedate{2014/02/17}% +\def\fileversion{1.02} +\def\filedate{2021/09/14}% \message{`pst-mirror v\fileversion, \filedate\space (ml,hv)}% % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -85,14 +85,14 @@ \define@key[psset]{pst-mirror}{Hpyramide}[5]{\def\psk@Sphere@Hpyramide{#1}} % hauteur pyramide % choix de la police et de la taille des caractères en cm !! -\define@key[psset]{pst-mirror}{PSfont}[Times-Roman]{\def\psk@PSfont{/#1 }} +\define@key[psset]{pst-mirror}{fontname}[Times-Roman]{\def\psk@fontname{/#1 }} \define@key[psset]{pst-mirror}{fontscale}[1]{\def\psk@fontscale{#1 }} \define@key[psset]{pst-mirror}{xlabelsep}[-0.5]{\def\psk@xlabelsep{#1 }} \define@key[psset]{pst-mirror}{ylabelsep}[-0.5]{\def\psk@ylabelsep{#1 }} \define@key[psset]{pst-mirror}{xO}[0]{\def\pst@SphereMirror@xO{#1 }} % origine du texte \define@key[psset]{pst-mirror}{yO}[0]{\def\pst@SphereMirror@yO{#1 }} \define@key[psset]{pst-mirror}{translation}[0 0 0]{\def\psk@SphereMirror@translation{#1}} % vecteur translation -\psset[pst-mirror]{PSfont=Times-Roman,fontscale=1,xlabelsep=-0.5,ylabelsep=-0.5,xO=0,yO=0,translation=0 0 0} +\psset[pst-mirror]{fontname=Times-Roman,fontscale=1,xlabelsep=-0.5,ylabelsep=-0.5,xO=0,yO=0,translation=0 0 0} % \psset{Xmax=50,Ymax=50,Xmin=-50,Ymin=-50,pas=1,grille=10,distance=30,Rayon=10,scale=1, Xorigine=\psk@Sphere@Distance,Yorigine=0,Zorigine=0,RotX=0,RotY=0,RotZ=0, @@ -107,18 +107,17 @@ /unit_image {\pst@number\psunit div 10 mul} bind def %% Caracteres accentues /ReEncode { exch findfont - dup length dict begin { 1 index /FID eq {pop pop} {def} ifelse - }forall + dup length dict begin { 1 index /FID eq {pop pop} {def} ifelse }forall /Encoding ISOLatin1Encoding def currentdict end definefont pop } bind def \ifPst@isolatin - /Font \psk@PSfont\space /ISOfont ReEncode /ISOfont def + /Font \psk@fontname /ISOfont ReEncode /ISOfont def \else - /Font \psk@PSfont\space def + /Font \psk@fontname def \fi /SizeFont { \psk@fontscale\space cm } bind def - Font findfont SizeFont scalefont setfont + Font findfont SizeFont scalefont setfont /x0 \pst@SphereMirror@xO def % pour positionner le texte /y0 \pst@SphereMirror@yO def % /Xmax \psk@Sphere@Xmax\space def -- cgit v1.2.3