pst-spinner (23may17)

git-svn-id: svn://tug.org/texlive/trunk@44507 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 17 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/generic/pst-spinner/pst-spinner.tex b/Master/texmf-dist/tex/generic/pst-spinner/pst-spinner.tex
index da149b90273..bd49b270711 100644
--- a/Master/texmf-dist/tex/generic/pst-spinner/pst-spinner.tex
+++ b/Master/texmf-dist/tex/generic/pst-spinner/pst-spinner.tex
@@ -1,3 +1,4 @@
+%% $Id: pst-spinner.tex 469 2017-05-23 05:47:28Z herbert $
 %% Package `pst-spinner.tex'
 %%
 %%
@@ -14,9 +15,9 @@
 \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
 \ifx\PSTnodeLoaded\endinput\else\input pst-node.tex\fi
 %
-\def\fileversion{1.01}
+\def\fileversion{1.02}
 \let\pstspinnerFV\fileversion
-\def\filedate{2017/05/11}
+\def\filedate{2017/05/23}
 \message{`PST' v\fileversion, \filedate}
 
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -24,28 +25,32 @@
 %% prologue for postcript
 \pstheader{pst-spinner.pro}%
 %
-\define@key[psset]{pst-spinner}{R}{\def\pst@spinner@R{#1 }} % rayon de cercle circonscrit au spinner
-\define@key[psset]{pst-spinner}{rotation}{\def\pst@spinner@rotation{#1 }} % angle de rotation
+\define@key[psset]{pst-spinner}{R}[3.9]{\def\pst@spinner@R{#1 }} % rayon de cercle circonscrit au spinner
+\define@key[psset]{pst-spinner}{rotation}[0]{\def\pst@spinner@rotation{#1 }} % angle de rotation
 %% couleurs definies par l'utilisateur
 \definecolor{honeydew}{rgb}{0.94 1 0.94}
-\define@key[psset]{pst-spinner}{color0}{\pst@getcolor{#1}\pscolor}
-\define@key[psset]{pst-spinner}{color1}{\pst@getcolor{#1}\pscolora}
-\define@key[psset]{pst-spinner}{color2}{\pst@getcolor{#1}\pscolorb}
-\define@key[psset]{pst-spinner}{color3}{\pst@getcolor{#1}\pscolorc}
-\define@key[psset]{pst-spinner}{colorMask}{\pst@getcolor{#1}\pscolorMask}
+\define@key[psset]{pst-spinner}{color0}[honeydew]{\pst@getcolor{#1}\pscolor}
+\define@key[psset]{pst-spinner}{color1}[red]{\pst@getcolor{#1}\pscolora}
+\define@key[psset]{pst-spinner}{color2}[green]{\pst@getcolor{#1}\pscolorb}
+\define@key[psset]{pst-spinner}{color3}[blue]{\pst@getcolor{#1}\pscolorc}
+\define@key[psset]{pst-spinner}{colorMask}[honeydew]{\pst@getcolor{#1}\pscolorMask}
 \define@boolkey[psset]{pst-spinner}[Pst@]{mask}[true]{} % cache du roulement à billes du centre
 \define@boolkey[psset]{pst-spinner}[Pst@]{customize}[true]{} % personnaliser le fidget
 \define@boolkey[psset]{pst-spinner}[Pst@]{customizeMask}[true]{} % personnaliser le capuchon de roulement central
-\define@key[psset]{pst-spinner}{image}{\edef\psk@spinner@image{#1}} % chemin des dessins
+\define@key[psset]{pst-spinner}{image}[]{\edef\psk@spinner@image{#1}} % chemin des dessins
 %
 \psset[pst-spinner]{R=3.9,rotation=0,color0=honeydew,color1=red,color2=green,
-  color3=blue!75,colorMask=honeydew,mask=true,customize=false,customizeMask=false,
+  color3=blue!75,colorMask=honeydew,mask,customize=false,customizeMask=false,
   image={}}
+%
 \def\psFidgetSpinner{\def\pst@par{}\pst@object{psFidgetSpinner}}
-\def\psFidgetSpinner@i{%
+\def\psFidgetSpinner@i{\@ifnextchar(\psFidgetSpinner@ii{\psFidgetSpinner@ii(0,0)}}
+\def\psFidgetSpinner@ii(#1){%
+  \pst@getcoor{#1}\pst@tempA
   \begin@SpecialObj
   \addto@pscode{
     tx@spinnerDict begin 
+    \pst@tempA translate
     /cm  {\pst@number\psunit mul} bind def
     /R1 \pst@spinner@R\space cm def
     /color0 {\pst@usecolor\pscolor } def