From d065000138908e78e45f5e66e97ad1349866e0c3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 6 Jun 2017 21:54:33 +0000 Subject: pst-spinner (23may17) git-svn-id: svn://tug.org/texlive/trunk@44507 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-spinner/Changes | 13 +- .../pst-spinner/images/cercle-chromatique.eps | 42 +++---- .../generic/pst-spinner/images/spirales-hsb.eps | 132 ++++++++++----------- .../doc/generic/pst-spinner/pst-spinner-doc.pdf | Bin 1489145 -> 1491239 bytes .../doc/generic/pst-spinner/pst-spinner-doc.tex | 52 ++++---- .../texmf-dist/dvips/pst-spinner/pst-spinner.pro | 1 + .../tex/generic/pst-spinner/pst-spinner.tex | 29 +++-- 7 files changed, 138 insertions(+), 131 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pst-spinner/Changes b/Master/texmf-dist/doc/generic/pst-spinner/Changes index 9f98dbe65a7..510985f2afb 100644 --- a/Master/texmf-dist/doc/generic/pst-spinner/Changes +++ b/Master/texmf-dist/doc/generic/pst-spinner/Changes @@ -1,14 +1,15 @@ -%% $Id: Changes 449 2017-05-10 14:34:18Z herbert $ +%% $Id: Changes 469 2017-05-23 05:47:28Z herbert $ %% -pst-spinner.pro ----------- -0.01 2017-05-11 - first CTAN version - pst-spinner.sty ----------- -0.01 2017-05-11 - first CTAN version +0.01 2017-05-11 - first CTAN version pst-spinner.tex ----------- +1.02 2017-05-23 - added (x,y) as optional argument +1.01 2017-05-11 - first CTAN version -1.01 2017-05-11 - first CTAN version + +pst-spinner.pro ----------- +0.01 2017-05-11 - first CTAN version diff --git a/Master/texmf-dist/doc/generic/pst-spinner/images/cercle-chromatique.eps b/Master/texmf-dist/doc/generic/pst-spinner/images/cercle-chromatique.eps index b240fd79130..2c72599af4a 100644 --- a/Master/texmf-dist/doc/generic/pst-spinner/images/cercle-chromatique.eps +++ b/Master/texmf-dist/doc/generic/pst-spinner/images/cercle-chromatique.eps @@ -1,21 +1,21 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%BoundingBox: -150 -150 150 150 - - -/secteur {newpath - 0 0 moveto - Radius i 1 sub cos mul - 0 0 Radius i 1 sub i 1 add arc - closepath - } def -0 0 translate -/CM {28.45 mul} bind def -/Radius {radius CM} def -/radius 5 def - -0 1 360 {/i exch def /HUE i 360 div def - secteur - HUE 1 1 sethsbcolor fill} for -% manuel.luque27@gmail.com - - +%!PS-Adobe-3.0 EPSF-3.0 +%%BoundingBox: -150 -150 150 150 + + +/secteur {newpath + 0 0 moveto + Radius i 1 sub cos mul + 0 0 Radius i 1 sub i 1 add arc + closepath + } def +0 0 translate +/CM {28.45 mul} bind def +/Radius {radius CM} def +/radius 5 def + +0 1 360 {/i exch def /HUE i 360 div def + secteur + HUE 1 1 sethsbcolor fill} for +% manuel.luque27@gmail.com + + diff --git a/Master/texmf-dist/doc/generic/pst-spinner/images/spirales-hsb.eps b/Master/texmf-dist/doc/generic/pst-spinner/images/spirales-hsb.eps index 65b1aaa4aec..8b10dbd7d3d 100644 --- a/Master/texmf-dist/doc/generic/pst-spinner/images/spirales-hsb.eps +++ b/Master/texmf-dist/doc/generic/pst-spinner/images/spirales-hsb.eps @@ -1,66 +1,66 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%BoundingBox: -215 -215 215 215 -%%Title: C:\Fichiers_LaTeX\2017\spiralmosaic\spirales-hsb-2.ps -%%Creator: GSview from C:\Fichiers_LaTeX\2017\spiralmosaic\spirales-hsb-2.ps -%%CreationDate: Wed Apr 26 11:46:50 2017 -%%Pages: 1 -%%EndComments -%%Page: 1 1 -%%BeginDocument: C:\Fichiers_LaTeX\2017\spiralmosaic\spirales-hsb-2.ps -/cm {2.845 mul 5 mul} bind def -/Rmax 15 cm def -/k 4 def % nombre de tours -% ni pair !!! -/ni 8 def -gsave -newpath -Rmax 0 moveto -0 0 Rmax 0 360 arc -closepath -stroke -grestore -newpath -Rmax 0 moveto -0 0 Rmax 0 360 arc -closepath -clip -/t01 {r_0 360 mul ni div neg} def -/t02 {r_0 1 add 360 mul ni div neg} def -/RadiusA {ni 360 div t mul r_0 add } def -/RadiusB {ni 360 div t mul r_0 1 add add } def -/spiraleA { -RadiusA t cos mul cm RadiusA t sin mul cm moveto -t01 1 k 360 mul {/t exch def -RadiusA t cos mul cm RadiusA t sin mul cm lineto - } for -} def -% spirale suivante générée en partant de la fin -/spiraleB { -k 360 mul -1 t02 {/t exch def -RadiusB t cos mul cm RadiusB t sin mul cm lineto - } for -closepath -} def - -2 1 ni 1 add {/r_0 exch def -%gsave -% 2 spirales tournant a droite -newpath -/t t01 def -spiraleA -/t t02 def -spiraleB -closepath -r_0 2 sub ni 1 add div 1 1 sethsbcolor -%stroke % -fill -newpath -/t t01 def -spiraleA -1 setgray -% stroke -% -} for - -%%EndDocument -%%Trailer +%!PS-Adobe-3.0 EPSF-3.0 +%%BoundingBox: -215 -215 215 215 +%%Title: C:\Fichiers_LaTeX\2017\spiralmosaic\spirales-hsb-2.ps +%%Creator: GSview from C:\Fichiers_LaTeX\2017\spiralmosaic\spirales-hsb-2.ps +%%CreationDate: Wed Apr 26 11:46:50 2017 +%%Pages: 1 +%%EndComments +%%Page: 1 1 +%%BeginDocument: C:\Fichiers_LaTeX\2017\spiralmosaic\spirales-hsb-2.ps +/cm {2.845 mul 5 mul} bind def +/Rmax 15 cm def +/k 4 def % nombre de tours +% ni pair !!! +/ni 8 def +gsave +newpath +Rmax 0 moveto +0 0 Rmax 0 360 arc +closepath +stroke +grestore +newpath +Rmax 0 moveto +0 0 Rmax 0 360 arc +closepath +clip +/t01 {r_0 360 mul ni div neg} def +/t02 {r_0 1 add 360 mul ni div neg} def +/RadiusA {ni 360 div t mul r_0 add } def +/RadiusB {ni 360 div t mul r_0 1 add add } def +/spiraleA { +RadiusA t cos mul cm RadiusA t sin mul cm moveto +t01 1 k 360 mul {/t exch def +RadiusA t cos mul cm RadiusA t sin mul cm lineto + } for +} def +% spirale suivante générée en partant de la fin +/spiraleB { +k 360 mul -1 t02 {/t exch def +RadiusB t cos mul cm RadiusB t sin mul cm lineto + } for +closepath +} def + +2 1 ni 1 add {/r_0 exch def +%gsave +% 2 spirales tournant a droite +newpath +/t t01 def +spiraleA +/t t02 def +spiraleB +closepath +r_0 2 sub ni 1 add div 1 1 sethsbcolor +%stroke % +fill +newpath +/t t01 def +spiraleA +1 setgray +% stroke +% +} for + +%%EndDocument +%%Trailer diff --git a/Master/texmf-dist/doc/generic/pst-spinner/pst-spinner-doc.pdf b/Master/texmf-dist/doc/generic/pst-spinner/pst-spinner-doc.pdf index f228c943b86..47d65b2fd85 100644 Binary files a/Master/texmf-dist/doc/generic/pst-spinner/pst-spinner-doc.pdf and b/Master/texmf-dist/doc/generic/pst-spinner/pst-spinner-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pst-spinner/pst-spinner-doc.tex b/Master/texmf-dist/doc/generic/pst-spinner/pst-spinner-doc.tex index 7ee4b0122f5..b63926fe4a9 100644 --- a/Master/texmf-dist/doc/generic/pst-spinner/pst-spinner-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-spinner/pst-spinner-doc.tex @@ -1,4 +1,4 @@ -%% $Id: pst-spinner-doc.tex 453 2017-05-11 19:40:46Z herbert $ +%% $Id: pst-spinner-doc.tex 466 2017-05-23 05:41:09Z herbert $ % \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings, headexclude,footexclude,oneside]{pst-doc} @@ -8,7 +8,7 @@ \usepackage{biblatex} \addbibresource{\jobname.bib} \usepackage[utf8]{inputenc} -\usepackage{pst-spinner,animate} +\usepackage{pst-spinner,pst-tools,animate} \let\belowcaptionskip\abovecaptionskip % \def\textat{\char064}% @@ -153,14 +153,16 @@ a picture. The command is: \begin{BDef} -\Lcs{psFidgetSpinner}\OptArgs +\Lcs{psFidgetSpinner}\OptArgs\OptArg*{\Largr{$x_0,y_0$}} \end{BDef} +with two optional arguments. If the \Largr{$x_0,y_0$} is missing then \Largr{$0,0$} is assumed as +the origin of the spinner. \section{Optional arguments} -\subsection{The Radius \Lkeyword{R}} -The radius of the circle in which the triple Fidget spinenr is inscribed. It is preset to \nxLkeyword{R=3.9}. +\subsection{The Radius \nxLkeyword{R}} +The radius \Lkeyword{R} of the circle in which the triple Fidget spinner is inscribed. It is preset to \nxLkeyword{R=3.9}. \subsection{The colors} The colors with their default value. They are numbered in the order: central bearing, peripheral rings, @@ -177,14 +179,14 @@ and central cap. \subsection{Rotation} With the optional argument \Lkeyword{rotation} the output of the spinner can be rotated. -\subsection{\Lkeyword{mask}} -A boolean value to customize the object with an image in eps format. Preset to \false. +\subsection{\nxLkeyword{mask}} +\Lkeyword{mask} is a boolean value to customize the object with an image in eps format. Preset to \false. -\subsection{Lkeyword{customizeMask}} -A boolean value. When set to \true\ the image is also printed on the cap of the central ball roll. +\subsection{\nxLkeyword{customizeMask}} +\Lkeyword{customizeMask} is a boolean value. When set to \true\ the image is also printed on the cap of the central ball roll. -\subsection{\Lkeyword{image}} -Defines the name including the path of the image and is preset to empty. +\subsection{\nxLkeyword{image}} +The keyword \Lkeyword{image} defines the name including the path of the image and is preset to empty. @@ -198,28 +200,26 @@ the linecolor and linewidth with \Lkeyword{linecolor} and \Lkeyword{linewidth}. \begin{LTXexample}[width=0.6\linewidth,frame=,pos=r] \begin{pspicture}(-4,-4)(4,4) -\psgrid[subgriddiv=5, - gridlabels=0, - gridwidth=1pt, - gridcolor=orange, - subgridwidth=0.1pt, - subgridcolor=orange](-4,-4)(4,4) -\psFidgetSpinner[fillcolor=cyan!10, +\psgrid[style=mmpaper](-4,-4)(4,4) +\psFidgetSpinner[ + fillcolor=cyan!10, linewidth=0.05,mask] \end{pspicture} \end{LTXexample} \begin{LTXexample}[width=0.6\linewidth,frame=,pos=r] -\begin{pspicture}(-4,-4)(4,4) +\begin{pspicture}(-4,-4)(5,4) \psgrid[subgriddiv=5, - gridlabels=0, - gridwidth=1pt, - gridcolor=orange, - subgridwidth=0.1pt, - subgridcolor=orange](-4,-4)(4,4) -\psFidgetSpinner[fillcolor=cyan!10, - linewidth=0.05,mask=false] + gridlabels=0, + gridwidth=1pt, + gridcolor=orange, + subgridwidth=0.1pt, + subgridcolor=orange](-4,-4)(5,4) +\psFidgetSpinner[ + fillcolor=cyan!10, + linewidth=0.05, + mask=false](1,0) \end{pspicture} \end{LTXexample} diff --git a/Master/texmf-dist/dvips/pst-spinner/pst-spinner.pro b/Master/texmf-dist/dvips/pst-spinner/pst-spinner.pro index 2a4957b1e7d..ebe889c702e 100644 --- a/Master/texmf-dist/dvips/pst-spinner/pst-spinner.pro +++ b/Master/texmf-dist/dvips/pst-spinner/pst-spinner.pro @@ -1,3 +1,4 @@ +%% $Id: pst-spinner.pro 466 2017-05-23 05:41:09Z herbert $ %% Package `pst-spinner.pro' %% %% 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 -- cgit v1.2.3