diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks/pstricks.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 86 |
1 files changed, 47 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 84d7b33278b..1844d583585 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -27,9 +27,9 @@ \catcode`\@=11\relax % \expandafter\ifx\csname @latexerr\endcsname\relax% do we have LaTeX? - \def\typeout#1{\immediate\write\@unused{#1}} + \def\typeout#1{\immediate\write\@unused{#1}}% \alloc@7\write\chardef\sixt@@n\@unused - \typeout{we are running tex and have to define some LaTeX commands ...} + \typeout{we are running tex and have to define some LaTeX commands ...}% \long\def\@ifundefined#1#2#3{\expandafter\ifx\csname #1\endcsname\relax#2\else#3\fi} \def\@namedef#1{\expandafter\def\csname #1\endcsname} @@ -109,8 +109,8 @@ \input pgffor.code.tex \let\pgfforeach\foreach % -\def\fileversion{2.53a} -\def\filedate{2014/03/30} +\def\fileversion{2.54} +\def\filedate{2014/05/19} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -536,7 +536,7 @@ \def\pst@@checknum{% \@ifnextchar-% {\let\pst@num\tw@\expandafter\pst@@@checknum\@gobble}% - {\@ifnextchar!% + {\@ifnextchar !% {\def\pst@num{3}\pst@@@@@checknum} {\let\pst@num\@ne\pst@@@checknum}}% } @@ -975,7 +975,7 @@ \edef\pst@coor{\pst@number\pst@dimb \pst@angle \tx@PtoC }% } % -\def\raw@coor{\@ifnextchar!\raw@@coor\raw@@@coor} +\def\raw@coor{\@ifnextchar !\raw@@coor\raw@@@coor} \def\raw@@coor!#1;#2\@nil{% PostScript code without using \tx@ScreenCoor \edef\pst@coor{#1 }} \def\raw@@@coor#1;#2\@nil{% PostScript code @@ -1015,7 +1015,7 @@ \def\Node@coor{\node@coor} % \def\special@angle#1#2)#3\@nil{% - \ifx!#1\relax + \ifx !#1\relax \edef\pst@angle{#2\space \pst@angleunit}% \else\ifx(#1\relax \pst@@getcoor{#2}% @@ -1027,7 +1027,7 @@ % \def\special@length#1#2\@nil#3{% \psDEBUG[special@length]{ #1|#2|#3 }% - \ifx!#1\relax + \ifx !#1\relax \edef\pst@SpecialLength{ #2 \pst@number\psunit mul }% \Pst@SpecialLengthtrue% \psDEBUG[special@length]{ Special length: \pst@SpecialLength}% @@ -3507,43 +3507,45 @@ pop \pst@getcoor{#2}\pst@tempb% a b \pst@getangle{#3}\pst@tempc% start angle \pst@getangle{#4}\pst@tempd% end angle - \addto@pscode{ \psellipticarc@definearg \psellipticarc@draw + \addto@pscode{ + \psellipticarc@definearg \psellipticarc@draw \ifPst@variableLW \pst@flattenpath \fi }% \ifshowpoints - \addto@pscode{ - gsave - xOrig yOrig T % set origin to ellipse origin - 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 -% \ifcase\psarc@type arc \or arcn \fi - CLW 2 div SLW - [ 1 1 \tx@UserCoor ] 0 setdash - stroke - grestore + \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 + % \ifcase\psarc@type arc \or arcn \fi + CLW 2 div SLW + [ 1 1 \tx@UserCoor ] 0 setdash + stroke + grestore } - \showpointsfalse% + \showpointsfalse% \fi \end@OpenObj% } \def\psellipticarc@definearg{% - \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi +% \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi \pst@tempa /yOrig ED /xOrig ED % Origin \pst@tempb % radii. Now adjust: \ifdim\psk@dimen\p@=\z@\else @@ -3600,7 +3602,12 @@ pop \fi /mtrx CM def xOrig yOrig T + \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi rx ry scale + 0 0 moveto + exch dup dup % end start start start + cos exch sin moveto % end start + exch % start end % \if@star 0 0 moveto \fi % for filling \if@psarcn arcn \else arc \fi % \if@star 0 0 moveto \fi @@ -3647,9 +3654,10 @@ pop \pssetlength\pst@dimc{#2}% \def\pst@linetype{4}% \addto@pscode{ - \pst@coor - \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimc \fi + \pst@coor 2 copy moveto + \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimc \fi \psk@dimen CLW mul sub + dup 0 rmoveto 0 360 arc \ifPst@variableLW \pst@flattenpath \fi closepath |