summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pstricks
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-07 23:28:42 +0000
committerKarl Berry <karl@freefriends.org>2011-09-07 23:28:42 +0000
commitc76b8f9c98a91aa1c2df880181f5812621fde162 (patch)
treef3673eeab52c4b93271989dacfb287a2df9c2875 /Master/texmf-dist/tex/generic/pstricks
parent04715721fccfb5ac8a8cf97eeb15bc0052fd3b78 (diff)
pstricks (6sep11)
git-svn-id: svn://tug.org/texlive/trunk@23858 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex46
1 files changed, 35 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 157db5fb99a..9330cc4bab0 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -59,15 +59,17 @@
\endgroup
\def\endtabular{\crcr\egroup\egroup $\egroup}
\fi
+\catcode`\@=\PstAtCode\relax
%
% now we have all commands defined, for TeX and LaTeX
%
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi
-\pst@addfams{pstricks}
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
-\def\fileversion{2.21}
-\def\filedate{2011/06/07}
+\def\fileversion{2.23}
+\def\filedate{2011/09/04}
+\catcode`\@=11\relax
+\pst@addfams{pstricks}
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
@@ -1121,6 +1123,7 @@
\psset[pstricks]{fsOrigin={0,0},fsAngle=137.50775}
%
\def\tx@LineFill{LineFill }
+\def\tx@DotFill{DotFill }
\def\tx@PenroseFill{PenroseFill }
\def\tx@TruchetFill{TruchetFill }
%
@@ -1164,6 +1167,17 @@
\pst@checknum{#1}\psk@psscale}
\psset[pstricks]{psscale=1}
%
+\def\pst@dotFill{%
+ gsave
+ \pst@number\pslinewidth SLW
+ \pst@usecolor\pshatchcolor
+% /DotLineColor { \pst@usecolor\pslinecolor } def
+ \psk@hatchsep
+ \psk@hatchwidth
+ \tx@DotFill }
+\def\psfs@dots{\pst@fill{ /SolidDot false def \pst@dotFill }}
+\@namedef{psfs@dots*}{\pst@fill{ /SolidDot true def \pst@dotFill }}
+%
\def\pst@penroseFill{%
gsave % restore in PenroseFill
\pst@number\pslinewidth SLW
@@ -3282,7 +3296,7 @@ pop
% the angle in the parameter equation is not proportional to the real angle!
% phi=atan(b*tan(angle)/a)+floor(angle/180+0.5)*180
\pst@tempc
- \ifPst@correctAngle
+ \ifPst@correctAngle
cvi 90 mod 0 eq { \pst@tempc }
{ rx ry \tx@UserCoor exch \pst@tempc tan mul exch atan
\pst@tempc 180 div .5 add floor 180 mul sub } ifelse
@@ -3338,17 +3352,21 @@ pop
rx ry scale
0 0 moveto
0 0 1
- \pst@tempc
+ \pst@tempc % start angle
\ifPst@correctAngle
cvi 90 mod 0 eq { \pst@tempc }
- { rx ry \tx@UserCoor exch \pst@tempc tan mul exch atan
- \pst@tempc 180 div .5 add floor 180 mul sub } ifelse
+ { 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
- \pst@tempd
+ \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
+ { rx abs ry abs sub cvi 0 eq { \pst@tempd } { rx ry
+ \tx@UserCoor exch \pst@tempd tan mul exch atan
+ \pst@tempd 180 div 0.5 add floor
+ 180 mul sub } ifelse } ifelse
\fi
\ifcase\psarc@type arc \or arcn \fi
closepath
@@ -3768,8 +3786,14 @@ pop
\def\Cput{\def\pst@par{}\pst@object{Cput}}
\def\Cput@i{\@fixedradiustrue\cput@ii}
\newdimen\pslabelsep
-\define@key[psset]{pstricks}{labelsep}[5pt]{\pssetlength\pslabelsep{#1}}
+\define@key[psset]{pstricks}{labelsep}[5pt]{%
+ \pssetlength\pslabelsep{#1}%
+ \ifx\PSTplotLoaded\endinput% Set labels for pst-plot, if laoded
+ \let\psxlabelsep\pslabelsep%
+ \let\psylabelsep\pslabelsep%
+ \fi}
\psset[pstricks]{labelsep=5pt}
+%
\define@key[psset]{pstricks}{refangle}[0]{\pst@expandafter\psset@@refangle{#1}\@nil}
\def\psset@@refangle#1\@nil{%
\def\next##1@#1=##2"##3@##4\@nil{%