pst-pulley (16sep17)

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

2 files changed, 50 insertions, 41 deletions

diff --git a/Master/texmf-dist/tex/generic/pst-pulley/pst-pulley.tex b/Master/texmf-dist/tex/generic/pst-pulley/pst-pulley.tex
index 7b509772a63..f1f6d18d364 100644
--- a/Master/texmf-dist/tex/generic/pst-pulley/pst-pulley.tex
+++ b/Master/texmf-dist/tex/generic/pst-pulley/pst-pulley.tex
@@ -1,17 +1,25 @@
-%% COPYRIGHT 2011 by Thomas Söll
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-%   http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
-%
-% This work consists of the file pstricks.tex, PostScript macros 
-% for Generic TeX.
-% See the PSTricks User's Guide for description.
-%
+%%
+%% This is file `pst-pulley.tex',
+%%
+%% IMPORTANT NOTICE:
+%%
+%% Package `pst-pulley.tex'
+%%
+%% Thomas Söll
+%% with the collaboration of
+%% Herbert Voß
+%% Manuel Luque
+%%
+%% This program can redistributed and/or modified under %%
+%% the terms of the LaTeX Project Public License        %%
+%% Distributed from CTAN archives in directory          %%
+%% macros/latex/base/lppl.txt; either version 1.3 of   %%
+%% the License, or (at your option) any later version.  %%
+%%
+%% DESCRIPTION:
+%%   `pst-pulley' is a PSTricks package
+%%
+%%
 \csname PSTpulleyLoaded\endcsname
 \let\PSTpulleyLoaded\endinput
 \ifx\GradientLoaded\endinput   \else\input pst-grad     \fi
@@ -19,20 +27,20 @@
 \ifx\PSTEuclideLoaded\endinput \else\input pst-eucl     \fi
 \ifx\PSTricksAddLoaded\endinput\else\input pstricks-add \fi
 %
-\def\fileversion{0.01}
-\def\filedate{2012/01/17}
+\def\fileversion{0.02}
+\def\filedate{2017/09/16}
 \message{ v\fileversion, \filedate (ts)}
 \message{ v\fileversion, \filedate}
 \edef\TheAtCode{\the\catcode`\@}
 \catcode`\@=11
 
 \pst@addfams{pst-pulleys}
-\define@boolkey[psset]{pst-pulleys}[Pst@]{grid}[true]{} % show grid
+\define@boolkey[psset]{pst-pulleys}[Pst@]{pulleyGrid}[true]{} % show grid
 \define@key[psset]{pst-pulleys}{N}{\def\psk@pulleys@N{#1}} % nombre de poulies
 \define@key[psset]{pst-pulleys}{M}{\def\psk@pulleys@M{#1}} % charge en kg
 \define@key[psset]{pst-pulleys}{h}{\def\psk@pulleys@S{#1}} % déplacement du point d'action en cm %
 \define@key[psset]{pst-pulleys}{Dx}{\def\psk@pulleys@DX{#1}} % placement of the down-part  %
-\psset[pst-pulleys]{N=1,M=20,h=15,Dx=0,grid=false}
+\psset[pst-pulleys]{N=1,M=20,h=15,Dx=0,pulleyGrid=false}
 %
 \newpsstyle{pulley}{linewidth=0.7pt,fillstyle=radslope,slopeangle=70,slopeend=black!70,slopebegin=gray!30,dimen=outer}
 \newpsstyle{pulley-frame}{linewidth=1.0pt,framearc=.15,fillstyle=gradient,gradangle=0,gradend=cyan!30,gradbegin=black!70}
@@ -1200,30 +1208,30 @@
 \def\pst@@CommaVal#1.#2.#3\@nil{\ifx\relax#2\relax#1\else\pst@@@CommaVal#1.#2\@nil\fi}
 \def\pst@@@CommaVal#1.#2#3\@nil{#1{,}#2}
 %
+%$
 %
-%
+\newcount\Npulleys
 \def\pspulleys{\pst@object{pspulleys}}
 \def\pspulleys@i{%
-\begingroup%
-\pst@killglue
-\use@par
-\pstFPmul\ps@Seil{\psk@pulleys@S}{\psk@pulleys@N}
-\pstFPdiv\ps@ForceS{\psk@pulleys@M}{\psk@pulleys@N}
-\pstFPMul\ps@ForceS{10}{\ps@ForceS}
-\pstFPMul\ps@ForceG{\psk@pulleys@M}{10}
-\pstFPdiv\ps@HightH{\psk@pulleys@S}{10}
-\pstFPsub\ps@HightH{\ps@HightH}{3}
-\pstFPmul\ps@SeilEnd{\psk@pulleys@S}{\psk@pulleys@N}
-\pstFPdiv\ps@SeilEnd{\ps@SeilEnd}{10}
-\pstFPadd\ps@SeilEndH{\ps@SeilEnd}{3.37}
-\pstFPadd\ps@SeilEnd{\ps@SeilEnd}{3}
-
-%
-\newcount\Npulleys
-\Npulleys=\psk@pulleys@N
-\advance\Npulleys by -1
-\ifPst@grid\pspicture[showgrid](-4,-11.5)(4,7)\else\pspicture(-4,-11.5)(4,7)\fi%
-\ifcase\Npulleys
+ \begingroup
+ \pst@killglue
+ \use@par
+ \pstFPmul\ps@Seil{\psk@pulleys@S}{\psk@pulleys@N}
+ \pstFPdiv\ps@ForceS{\psk@pulleys@M}{\psk@pulleys@N}
+ \pstFPMul\ps@ForceS{10}{\ps@ForceS}
+ \pstFPMul\ps@ForceG{\psk@pulleys@M}{10}
+ \pstFPdiv\ps@HightH{\psk@pulleys@S}{10}
+ \pstFPsub\ps@HightH{\ps@HightH}{3}
+ \pstFPmul\ps@SeilEnd{\psk@pulleys@S}{\psk@pulleys@N}
+ \pstFPdiv\ps@SeilEnd{\ps@SeilEnd}{10}
+ \pstFPadd\ps@SeilEndH{\ps@SeilEnd}{3.37}
+ \pstFPadd\ps@SeilEnd{\ps@SeilEnd}{3}
+%
+ \Npulleys=\psk@pulleys@N
+ \advance\Npulleys by -1
+ \pspicture(-4,-11.5)(4,7)
+ \ifPst@pulleyGrid\psgrid[style=gridstyle]\fi
+  \ifcase\Npulleys
       % 1 poulie
       \poulieA
        \or
@@ -1246,7 +1254,7 @@
      \poulieD
     \fi
 \endpspicture
-\endgroup%
+\endgroup
 \ignorespaces}
 
 \catcode`\@=\TheAtCode\relax
diff --git a/Master/texmf-dist/tex/latex/pst-pulley/pst-pulley.sty b/Master/texmf-dist/tex/latex/pst-pulley/pst-pulley.sty
index c7df2fcbd0b..a609731966f 100644
--- a/Master/texmf-dist/tex/latex/pst-pulley/pst-pulley.sty
+++ b/Master/texmf-dist/tex/latex/pst-pulley/pst-pulley.sty
@@ -1,5 +1,6 @@
+\PassOptionsToPackage{dvipsnames}{pstricks}
 \RequirePackage{pstricks}
-\ProvidesPackage{pst-pulley}[2012/01/17 package wrapper for PSTricks pst-pulley.tex]
+\ProvidesPackage{pst-pulley}[2017/09/16 package wrapper for PSTricks pst-pulley.tex]
 \input{pst-pulley.tex}
 \ProvidesFile{pst-pulley.tex}
   [\filedate\space v\fileversion\space `PST-pulley' (ts)]