diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks/pstricks.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index c16e8f4d8e0..d4a80896378 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -110,8 +110,8 @@ \input pgffor.code.tex \let\pgfforeach\foreach % -\def\fileversion{2.49b} -\def\filedate{2013/12/21} +\def\fileversion{2.49c} +\def\filedate{2013/12/27} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -3641,18 +3641,25 @@ pop % \def\psRing{\def\pst@par{}\pst@object{psRing}}%% hv 20130405 \def\psRing@i{\@ifnextchar({\psRing@ii}{\psRing@ii(0,0)}} -\def\psRing@ii(#1)#2#3{% origin, inner radius, outer radius - \begin@ClosedObj +\def\psRing@ii(#1){% \pst@@getcoor{#1}% - \pssetlength\pst@dimc{#2}% - \pssetlength\pst@dimd{#3}% + \@ifnextchar[{\psRing@iii}{\psRing@iii[0,360]}} +\def\psRing@iii[#1,#2]#3#4{% origin, inner radius, outer radius + \begin@ClosedObj + \pssetlength\pst@dimc{#3}% + \pssetlength\pst@dimd{#4}% + \pst@getangle{#1}\pst@tempa + \pst@getangle{#2}\pst@tempb \def\pst@linetype{4}% \addto@pscode{ - \pst@coor translate newpath + \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 - 0 0 InnerRadius 0 360 arc OuterRadius 0 moveto - 0 0 OuterRadius 0 0.0001 arcn + InnerRadius 0 moveto newpath + 0 0 InnerRadius \pst@tempa\space \pst@tempb\space arc + OuterRadius \pst@tempb\space PtoC + \pst@tempb\space \pst@tempa\space sub abs 360 eq { moveto }{ lineto } ifelse % whole circle or not?? + 0 0 OuterRadius \pst@tempb\space \pst@tempa\space arcn closepath }% \showpointsfalse |