summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-14 23:23:35 +0000
committerKarl Berry <karl@freefriends.org>2012-08-14 23:23:35 +0000
commitc2aec9146006572a51a8d425ee7e702cd35f3e03 (patch)
treed9632cec255b8e1f0c0a64f55574303917e8b8b3 /Master/texmf-dist/tex/generic/pstricks/pstricks.tex
parent9ef4d43a194168faca909a9261e94c3ba72e85af (diff)
pstricks (14aug12)
git-svn-id: svn://tug.org/texlive/trunk@27404 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks/pstricks.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex49
1 files changed, 40 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index f8db856d40f..cc03844a3ad 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -94,8 +94,8 @@
\catcode`\@=\PstAtCode\relax
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
-\def\fileversion{2.29}
-\def\filedate{2012/06/04}
+\def\fileversion{2.30}
+\def\filedate{2012/08/13}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -1027,6 +1027,9 @@
\psset[pstricks]{linewidth=.8pt}
\define@key[psset]{pstricks}{linecolor}[black]{\pst@getcolor{#1}\pslinecolor}
\psset[pstricks]{linecolor=black}
+\define@key[psset]{pstricks}{kitecolor}[red]{\pst@getcolor{#1}\ps@kitecolor}
+\define@key[psset]{pstricks}{dartcolor}[blue]{\pst@getcolor{#1}\ps@dartcolor}
+\psset[pstricks]{kitecolor,dartcolor}
%
\newif\ifPst@coloreddashed
\define@key[psset]{pstricks}{dashcolor}[white]{%
@@ -1155,6 +1158,7 @@
\def\tx@LineFill{LineFill }
\def\tx@DotFill{DotFill }
\def\tx@PenroseFill{PenroseFill }
+\def\tx@PenroseFillA{PenroseFillA }
\def\tx@TruchetFill{TruchetFill }
%
\def\psfs@none{}
@@ -1176,7 +1180,8 @@
\define@key[psset]{pstricks}{hatchwidthinc}[0pt]{\pst@getlength{#1}\psk@hatchwidthinc}
\psset[pstricks]{hatchwidthinc=0pt,hatchsepinc=0pt}
%
-\def\pst@linefill{%
+\def\pst@linefill#1{
+ /clipType { \ifx\relax#1\relax clip \else#1\fi} def
\psk@hatchangle rotate
\psk@hatchwidth SLW
\pst@usecolor\pshatchcolor
@@ -1185,19 +1190,25 @@
\psk@hatchwidthinc
\tx@LineFill }
%
-\def\psfs@vlines{\pst@fill\pst@linefill}
+\def\psfs@vlines{\pst@fill{\pst@linefill{}}}
+\def\psfs@eovlines{\pst@fill{\pst@linefill{eoclip}}}
\@namedef{psfs@vlines*}{\psfs@solid \psfs@vlines}
-\def\psfs@hlines{\pst@fill{90 rotate \pst@linefill}}
+\@namedef{psfs@eovlines*}{\psfs@eofill \psfs@eovlines}
+\def\psfs@hlines{\pst@fill{90 rotate \pst@linefill{}}}
+\def\psfs@eohlines{\pst@fill{90 rotate \pst@linefill{eoclip}}}
\@namedef{psfs@hlines*}{\psfs@solid \psfs@hlines}
+\@namedef{psfs@eohlines*}{\psfs@eofill \psfs@eohlines}
\def\psfs@crosshatch{\psfs@vlines \psfs@hlines}
\@namedef{psfs@crosshatch*}{\psfs@solid \psfs@vlines \psfs@hlines}
+\@namedef{psfs@eocrosshatch*}{\psfs@eofill \psfs@eovlines \psfs@eohlines}
%
\define@key[psset]{pstricks}{psscale}[1]{%
\def\psk@@psscale{#1}% for use with \psscalebox
\pst@checknum{#1}\psk@psscale}
\psset[pstricks]{psscale=1}
%
-\def\pst@dotFill{%
+\def\pst@dotFill#1{%
+ /clipType { \ifx\relax#1\relax clip \else#1\fi} def
gsave
\pst@number\pslinewidth SLW
\pst@usecolor\pshatchcolor
@@ -1205,11 +1216,14 @@
\psk@hatchsep
\psk@hatchwidth
\tx@DotFill }
+
\def\psfs@dots{\pst@fill{ /SolidDot false def \pst@dotFill }}
+\def\psfs@eodots{\pst@fill{ /SolidDot false def \pst@dotFill[eoclip] }}
\@namedef{psfs@dots*}{\pst@fill{ /SolidDot true def \pst@dotFill }}
+\@namedef{psfs@eodots*}{\pst@fill{ /SolidDot true def \pst@dotFill[eoclip] }}
%
\def\pst@penroseFill{%
- gsave % restore in PenroseFill
+% gsave % restore in PenroseFill
\pst@number\pslinewidth SLW
\pst@usecolor\pshatchcolor
\psk@psscale
@@ -1217,6 +1231,23 @@
\def\psfs@penrose{\pst@fill\pst@penroseFill}
\@namedef{psfs@penrose*}{\psfs@solid \psfs@penrose}
%
+\def\pst@penroseFillA{%
+% gsave % restore in PenroseFillA
+ \pst@number\pslinewidth SLW
+% \pst@usecolor\pshatchcolor
+% on stack: scaling factor, border color, kite color, dart color
+% dup dup scale
+% /border_colour ED %
+% /kite_colour ED %
+% /dart_colour
+ { \pst@usecolor\ps@dartcolor }
+ { \pst@usecolor\ps@kitecolor }
+ { \pst@usecolor\pshatchcolor }
+ \psk@psscale
+ \tx@PenroseFillA }
+\def\psfs@penroseA{\pst@fill\pst@penroseFillA}
+\@namedef{psfs@penroseA*}{\psfs@solid \psfs@penroseA}
+%
\def\pst@truchetFill{%
gsave % restore in PenroseFill
\pst@number\pslinewidth SLW
@@ -3394,9 +3425,9 @@ pop
/mtrx CM def
xOrig yOrig T
rx ry scale
- \if@star 0 0 moveto \fi % for filling
+% \if@star 0 0 moveto \fi % for filling
\if@psarcn arcn \else arc \fi
- \if@star 0 0 moveto \fi
+% \if@star 0 0 moveto \fi
mtrx setmatrix%
}
\def\psellipticarc@showpoints{%