diff options
author | Karl Berry <karl@freefriends.org> | 2019-01-07 22:12:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-01-07 22:12:24 +0000 |
commit | 3b440d44096a31f17207f6fffb3b1ddd6d722b60 (patch) | |
tree | 403e5cc7e8306b01aa05c07e318442f741c67d0c /Master/texmf-dist/tex | |
parent | fa3720c40955f139e3846475ff94698d483128b4 (diff) |
pstricks (7jan19)
git-svn-id: svn://tug.org/texlive/trunk@49632 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 4d74e68c9b5..141dc02db4d 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks.tex 881 2018-12-27 09:56:29Z herbert $ +%% $Id: pstricks.tex 887 2018-12-29 13:17:59Z herbert $ %% pstricks.tex %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu. %% COPYRIGHT 2000-2003 by Denis Girou. @@ -71,7 +71,7 @@ } % \def\ProvidesPackageRCS{\@ifnextchar[\ProvidesPackageRCS@i{\ProvidesPackageRCS@i[] }}%$ -\def\ProvidesPackageRCS@i[#1] $#2${} %$ +\def\ProvidesPackageRCS@i[#1]#2{} \ifx\pgfkeysloaded\endinput\else \input pgfutil-common.tex @@ -80,8 +80,8 @@ \fi \let\pgfforeach\foreach % -\def\fileversion{2.92} -\def\filedate{2018/12/27} +\def\fileversion{2.94} +\def\filedate{2019/01/07} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -3569,6 +3569,7 @@ pop % \def\psellipticarc{\pst@object{psellipticarc}} \def\psellipticarc@i{\let\if@psarcn\iffalse\psellipticarc@ii} + \define@boolkey[psset]{pstricks}[Pst@]{correctAngle}[true]{} \psset{correctAngle} @@ -3581,7 +3582,7 @@ pop % \addbefore@par{correctAngle=false} \pst@getangle{#3}\pst@tempc % start angle \pst@getangle{#4}\pst@tempd % end angle - \ifdim\pst@tempc pt=\pst@tempd pt + \ifx\pst@tempc\pst@tempd \else % same angles? then do nothing \begin@OpenObj \pst@getcoor{#1}\pst@tempa % origin @@ -3589,38 +3590,37 @@ pop \addto@pscode{ \psellipticarc@definearg \psellipticarc@draw \ifPst@variableLW \pst@flattenpath \fi - }% - \ifshowpoints - \addto@pscode{ - gsave - xOrig yOrig T % set origin to ellipse origin - \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi - rx ry scale % now we draw a circle :-) - 1 \pst@tempc % start angle - \ifPst@correctAngle - cvi 90 mod 0 eq { \pst@tempc } - { rx abs ry abs sub cvi 0 eq { \pst@tempc }{ rx ry - \tx@UserCoor exch \pst@tempc tan mul exch atan - \pst@tempc 180 div 0.5 add floor - 180 mul sub } ifelse } ifelse - \fi - PtoC moveto - 0 0 lineto - 1 \pst@tempd % end angle - \ifPst@correctAngle - cvi 90 mod 0 eq { \pst@tempd } - { rx ry \tx@UserCoor exch \pst@tempd tan mul exch atan - \pst@tempd 180 div .5 add floor 180 mul sub } ifelse - \fi - PtoC lineto + \ifshowpoints{} + gsave + xOrig yOrig T % set origin to ellipse origin + \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi + rx ry scale % now we draw a circle :-) + 1 \pst@tempc % start angle + \ifPst@correctAngle + cvi 90 mod 0 eq { \pst@tempc } + { rx abs ry abs sub cvi 0 eq { \pst@tempc }{ rx ry + \tx@UserCoor exch \pst@tempc tan mul exch atan + \pst@tempc 180 div 0.5 add floor + 180 mul sub } ifelse } ifelse + \fi + PtoC moveto + 0 0 lineto + 1 \pst@tempd % end angle + \ifPst@correctAngle + cvi 90 mod 0 eq { \pst@tempd } + { rx ry \tx@UserCoor exch \pst@tempd tan mul exch atan + \pst@tempd 180 div .5 add floor 180 mul sub } ifelse + \fi + PtoC lineto 0 0 lineto + closepath % \ifcase\psarc@type arc \or arcn \fi - CLW 2 div SLW - [ 1 1 \tx@UserCoor ] 0 setdash - stroke - grestore - } - \showpointsfalse - \fi + CLW 3 div \pst@number\psunit div SLW + [ 1 1 \tx@UserCoor 2 mul ] 0 setdash + stroke + grestore + \fi + }% + \showpointsfalse \end@OpenObj \fi } |