pstricks (6jan18)

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

1 files changed, 11 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 14d9d975188..8232b1a2872 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,8 +1,8 @@
-%% $Id: pstricks.tex 700 2018-01-01 14:21:06Z herbert $
+%% $Id: pstricks.tex 702 2018-01-06 08:43:54Z herbert $
 %% pstricks.tex
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
 %% COPYRIGHT 2000-2003 by Denis Girou.
-%% Copyright 2004-2017 Herbert Voss
+%% Copyright 2004-2018 Herbert Voss
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -78,8 +78,8 @@
 \fi
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.81}
-\def\filedate{2018/01/01}
+\def\fileversion{2.82}
+\def\filedate{2018/01/06}
 \pst@addfams{pstricks}
 %
 %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -179,7 +179,7 @@
 }
 \def\pshskip#1{\vrule \@width\z@\nobreak \hskip #1\hskip \z@skip}
 % end bugfix
-\typeout{`PSTricks' v\fileversion\space\space <\filedate> (tvz)}
+\typeout{`PSTricks' v\fileversion\space\space <\filedate> (tvz,hv)}
 \def\@pstrickserr#1#2{%
   \begingroup
   \newlinechar`\^^J
@@ -3784,14 +3784,18 @@ pop
 \def\psRing@iii[#1,#2]#3#4{%   origin, inner radius, outer radius
   \begin@ClosedObj
   \pssetlength\pst@dimc{#3}%
+  \edef\pst@tempA{\ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimc \fi}%
   \pssetlength\pst@dimd{#4}%
+  \edef\pst@tempB{\ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimd \fi}%
   \pst@getangle{#1}\pst@tempa
   \pst@getangle{#2}\pst@tempb
   \def\pst@linetype{4}%
   \addto@pscode{
     \pst@coor translate 
-    \pst@number\pst@dimc \psk@dimen CLW mul sub /InnerRadius ED
-    \pst@number\pst@dimd \psk@dimen CLW mul sub /OuterRadius ED
+%    \pst@number\pst@dimc \psk@dimen CLW mul sub /InnerRadius ED
+%    \pst@number\pst@dimd \psk@dimen CLW mul sub /OuterRadius ED
+    \pst@tempA\space \psk@dimen CLW mul sub /InnerRadius ED
+    \pst@tempB\space \psk@dimen CLW mul sub /OuterRadius ED
     InnerRadius 0 moveto newpath
     0 0 InnerRadius \pst@tempa\space \pst@tempb\space arc 
     OuterRadius \pst@tempb\space PtoC