From 9ea4f698ce68c7ab6720c2b097588e8fe75b80bb Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 16 Jan 2014 23:09:52 +0000
Subject: pstricks (16jan14)

git-svn-id: svn://tug.org/texlive/trunk@32691 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/generic/pstricks/pstricks.tex   | 33 ++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 'Master/texmf-dist/tex/generic/pstricks/pstricks.tex')

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index d4a80896378..b8bb470cd83 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -81,7 +81,6 @@
 %  \in@{,#2,}{,#3,}%
 \begingroup\edef\x{\endgroup\noexpand\in@{,#2,}}\x{,#3,}%
 %\expandafter\in@\expandafter{\expandafter,#2,}{,#3,}% --- hv 2012-04-27
-%\typeout{=====>foo<=====}%
   \ifin@
     \ifXKV@pl
       \XKV@addtomacro@n\XKV@tempa\@firstoftwo
@@ -110,8 +109,8 @@
 \input pgffor.code.tex
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.49c}
-\def\filedate{2013/12/27}
+\def\fileversion{2.50}
+\def\filedate{2014/01/16}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -522,24 +521,32 @@
   \ifx\ps@next\@empty\let\pst@num\z@%
   \else\expandafter\pst@@checknum\ps@next..\@nil%
   \fi%
-  \ifnum\pst@num=\z@
+  \ifcase\pst@num%  0
     \@pstrickserr{Bad number: `#1'. 0 substituted.}\@ehpa%
     \def#2{0 }%
-  \else%
+  \or%              1
+    \edef#2{\ifnum\pst@num=\tw@-\fi\the\pst@cntg.%
+      \expandafter\@gobble\the\pst@cnth\space}%
+  \or%              2
     \edef#2{\ifnum\pst@num=\tw@-\fi\the\pst@cntg.%
       \expandafter\@gobble\the\pst@cnth\space}%
+  \or%              3
+    \edef#2{\pst@tempA\space}%
   \fi}
 \def\pst@@checknum{%
   \@ifnextchar-%
   {\let\pst@num\tw@\expandafter\pst@@@checknum\@gobble}%
-  {\let\pst@num\@ne\pst@@@checknum}%
+  {\@ifnextchar!%
+    {\def\pst@num{3}\pst@@@@@checknum}
+    {\let\pst@num\@ne\pst@@@checknum}}%
 }
-%
 \def\pst@@@checknum#1.#2.#3\@nil{%
 \afterassignment\pst@@@@checknum\pst@cntg=0#1\relax\@nil%
 \afterassignment\pst@@@@checknum\pst@cnth=1#2\relax\@nil}
 \def\pst@@@@checknum#1\relax\@nil{\ifx\@nil#1\@nil\else\let\pst@num\z@\fi}
 %
+\def\pst@@@@@checknum#1#2.#3\@nil{\def\pst@tempA{#2}}% PostScript Notation with !<code>
+%
 \def\pst@getnumii#1 #2 #3\@nil{%
   \pst@checknum{#1}\pst@tempg%
   \ifx\relax#2\relax\let\pst@temph\pst@tempg\else\pst@checknum{#2}\pst@temph\fi}
@@ -1214,7 +1221,15 @@
 %--------------------------------- hv 2007-09-09 begin ---------------------
 % transparency needs a run through latex -> dvips -> ps2pdf14(!) 
 %
-\define@key[psset]{pstricks}{fillcolor}[white]{\pst@getcolor{#1}\psfillcolor}
+\def\e@fill@inverse{oefill}
+\define@key[psset]{pstricks}{fillcolor}[white]{%
+  \ifx\psk@fillstylename\e@fill@inverse
+    \pst@getcolor{#1}\psk@oefillcolor
+    \pst@getcolor{white}\psfillcolor
+  \else \pst@getcolor{white}\psk@oefillcolor
+        \pst@getcolor{#1}\psfillcolor
+  \fi}
+
 \psset[pstricks]{fillcolor=white}
 \define@key[psset]{pstricks}{strokeopacity}[1]{\pst@checknum{#1}\psk@strokeopacityalpha }% for lines
 \psset[pstricks]{strokeopacity=1}
@@ -1243,6 +1258,7 @@
 \def\psfs@none{}
 \def\psfs@solid{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency fill }}
 \def\psfs@eofill{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency eofill}}
+\def\psfs@oefill{\pst@fill{\pst@usecolor\psk@oefillcolor  \tx@setTransparency fill } \psfs@eofill}
 \def\psfs@shape{\pst@fill{\pst@usecolor\psfillcolor \tx@setBlendmode fill }}
 \def\psfs@spiral{\pst@fill{\pst@fsOrigin \pst@usecolor\psfillcolor clip newpath
     0 .1 500 { dup dup sqrt 4 div 0 360 arc fill \pst@fsAngle rotate } for }}
@@ -1337,6 +1353,7 @@
 \@namedef{psfs@truchet*}{\psfs@solid \psfs@truchet}
 %
 \define@key[psset]{pstricks}{fillstyle}[none]{%
+  \def\psk@fillstylename{#1}%  needed for inverse eofill
   \edef\pst@tempg{#1}\def\pst@temph{none}%
   \ifx\pst@tempg\pst@temph
      \let\psk@fillstyle\relax
-- 
cgit v1.2.3

