diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks/pstricks.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 62 |
1 files changed, 50 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 57fbc03fa1b..5aa9d422c40 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -109,8 +109,8 @@ \input pgffor.code.tex \let\pgfforeach\foreach % -\def\fileversion{2.56} -\def\filedate{2014/07/31} +\def\fileversion{2.57} +\def\filedate{2014/08/27} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -2488,7 +2488,7 @@ \fi% \end@OpenObj% } -\def\psline@iii{ +\def\psline@iii{% \ifdim\pslinearc>\z@ /r \pst@number\pslinearc def /Lineto { \tx@Arcto } def @@ -2642,14 +2642,36 @@ \def\psframe@i(#1){% \@ifnextchar({\psframe@ii(#1)}{\psframe@ii(0,0)(#1)}} \def\psframe@ii(#1)(#2){% - \begin@ClosedObj% - \pst@getcoor{#1}\pst@tempa% + \begin@ClosedObj + \pst@getcoor{#1}\pst@tempa \pst@@getcoor{#2}% \addto@pscode{ \psk@cornersize \pst@tempa \pst@coor \psk@dimen \tx@Frame }% \def\pst@linetype{2}% - \showpointsfalse% - \end@ClosedObj% + \showpointsfalse + \end@ClosedObj +} + +\iffalse +\def\psSquare{\pst@object{psSquare}} +\def\psSquare@i(#1)(#2){% + \begin@ClosedObj + \pst@getcoor{#1}\pst@tempa + \pst@getcoor{#2}\pst@tempb + \addto@pscode{ \psk@cornersize + \pst@tempa /yA ED /xA ED + \pst@tempb /yB ED /xB ED + xA yA moveto xB yB L + xA xB sub yA yB sub atan /Angle ED + xA yA xB yB Pyth2 dup xA add exch yA add + \psk@dimen + \tx@Frame +% grestore + }% + \def\pst@linetype{2}% + \showpointsfalse + \end@ClosedObj } +\fi % \def\psTextFrame{\pst@object{psTextFrame}} \def\psTextFrame@i(#1)(#2)#3{% @@ -3470,7 +3492,7 @@ pop % I - Definition of \psellipticwedge, a generalization of \pswedge for wedges % of ellipses (from the code of \pswedge and \psellipse) % -\def\psellipticwedge{\def\pst@par{}\pst@object{psellipticwedge}} +\def\psellipticwedge{\pst@object{psellipticwedge}} \def\psellipticwedge@i(#1){% \@ifnextchar({\psellipticwedge@ii(#1)}{\psellipticwedge@ii(0,0)(#1)}} \def\psellipticwedge@ii(#1)(#2)#3#4{% @@ -3481,9 +3503,25 @@ pop \pst@@getcoor{#2}% \def\pst@linetype{1}% \addto@pscode{% + \pst@coor /ry ED /rx ED \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi - \pst@tempa \pst@tempb - \pst@coor + \pst@tempa + \ifPst@correctAngle + cvi 90 mod 0 eq { \pst@tempa } + { rx abs ry abs sub cvi 0 eq { \pst@tempa }{ rx ry + \tx@UserCoor exch \pst@tempa tan mul exch atan + \pst@tempa 180 div 0.5 add floor + 180 mul sub } ifelse } ifelse + \fi + \pst@tempb + \ifPst@correctAngle + cvi 90 mod 0 eq { \pst@tempb } + { rx abs ry abs sub cvi 0 eq { \pst@tempb }{ rx ry + \tx@UserCoor exch \pst@tempb tan mul exch atan + \pst@tempb 180 div 0.5 add floor + 180 mul sub } ifelse } ifelse + \fi + rx ry \pst@tempc moveto \ifdim\psk@dimen\p@=\z@\else \psk@dimen CLW mul dup 3 1 roll @@ -3499,10 +3537,10 @@ pop % % Code mainly from "pstricks.tex'' 0.94 beta (TvZ) % -\def\psellipticarcn{\def\pst@par{}\pst@object{psellipticarcn}} +\def\psellipticarcn{\pst@object{psellipticarcn}} \def\psellipticarcn@i{\let\if@psarcn\iftrue\psellipticarc@ii} % -\def\psellipticarc{\def\pst@par{}\pst@object{psellipticarc}} +\def\psellipticarc{\pst@object{psellipticarc}} \def\psellipticarc@i{\let\if@psarcn\iffalse\psellipticarc@ii} \define@boolkey[psset]{pstricks}[Pst@]{correctAngle}[true]{} \psset{correctAngle} |